zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #82 from yardenac/processlist 

pass processlist flags to readOpenVZData (fixes build error)
This commit is contained in:
Hisham Muhammad 2014-05-04 18:52:11 -03:00
parent ff6cddfd16 730ab0c9a8
commit f0e2a0e771
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ProcessList.c
View File

@ -584,7 +584,7 @@ static bool ProcessList_readStatmFile(Process* process, const char* dirname, con
#ifdef HAVE_OPENVZ #ifdef HAVE_OPENVZ
static void ProcessList_readOpenVZData(Process* process, const char* dirname, const char* name) { static void ProcessList_readOpenVZData(ProcessList* this, Process* process, const char* dirname, const char* name) {
if ( (!(this->flags & PROCESS_FLAG_OPENVZ)) || (access("/proc/vz", R_OK) != 0)) { if ( (!(this->flags & PROCESS_FLAG_OPENVZ)) || (access("/proc/vz", R_OK) != 0)) {
process->vpid = process->pid; process->vpid = process->pid;
process->ctid = 0; process->ctid = 0;
@ -812,7 +812,7 @@ static bool ProcessList_processEntries(ProcessList* this, const char* dirname, P
process->user = UsersTable_getRef(this->usersTable, process->st_uid); process->user = UsersTable_getRef(this->usersTable, process->st_uid);
#ifdef HAVE_OPENVZ #ifdef HAVE_OPENVZ
ProcessList_readOpenVZData(process, dirname, name); ProcessList_readOpenVZData(this, process, dirname, name);
#endif #endif
#ifdef HAVE_VSERVER #ifdef HAVE_VSERVER