diff options
author | Hisham Muhammad <hisham@gobolinux.org> | 2015-02-23 03:53:36 -0300 |
---|---|---|
committer | Hisham Muhammad <hisham@gobolinux.org> | 2015-02-23 03:53:36 -0300 |
commit | 0a184b769f239700273b163deedb5bc5e5b777e9 (patch) | |
tree | 80ace094fa63f108604d8bc65924a6835c1e33f1 | |
parent | 8b5b73825e2978df308f520dfc38d30d5dbebdb1 (diff) |
Merge fixes
-rw-r--r-- | Process.c | 4 | ||||
-rw-r--r-- | Process.h | 4 | ||||
-rw-r--r-- | Settings.c | 4 | ||||
-rw-r--r-- | Settings.h | 4 | ||||
-rw-r--r-- | linux/LinuxProcess.c | 6 | ||||
-rw-r--r-- | linux/LinuxProcess.h | 2 | ||||
-rw-r--r-- | linux/LinuxProcessList.c | 2 |
7 files changed, 11 insertions, 15 deletions
@@ -45,8 +45,6 @@ in the source distribution for its full text. #include <sys/types.h> -typedef struct Settings_ Settings; - #define PROCESS_FLAG_IO 1 #define PROCESS_FLAG_IOPRIO 2 #define PROCESS_FLAG_OPENVZ 4 @@ -660,7 +658,7 @@ ObjectClass Process_class = { .compare = Process_compare }; -void Process_init(Process* this, struct Settings_* settings, struct ProcessList_* pl) { +void Process_init(Process* this, struct ProcessList_* pl) { this->pid = 0; this->pl = pl; this->tag = false; @@ -24,8 +24,6 @@ in the source distribution for its full text. #include <sys/types.h> -typedef struct Settings_ Settings; - #define PROCESS_FLAG_IO 1 #define PROCESS_FLAG_IOPRIO 2 #define PROCESS_FLAG_OPENVZ 4 @@ -195,7 +193,7 @@ void Process_done(Process* this); extern ObjectClass Process_class; -void Process_init(Process* this, struct Settings_* settings, struct ProcessList_* pl); +void Process_init(Process* this, struct ProcessList_* pl); void Process_toggleTag(Process* this); @@ -22,14 +22,14 @@ in the source distribution for its full text. #include "Header.h" #include <stdbool.h> -struct Settings_ { +typedef struct Settings_ { char* userSettings; ProcessList* pl; Header* header; int colorScheme; int delay; bool changed; -}; +} Settings; }*/ @@ -15,14 +15,14 @@ in the source distribution for its full text. #include "Header.h" #include <stdbool.h> -struct Settings_ { +typedef struct Settings_ { char* userSettings; ProcessList* pl; Header* header; int colorScheme; int delay; bool changed; -}; +} Settings; void Settings_delete(Settings* this); diff --git a/linux/LinuxProcess.c b/linux/LinuxProcess.c index 9c26018d..efc9fc69 100644 --- a/linux/LinuxProcess.c +++ b/linux/LinuxProcess.c @@ -27,15 +27,15 @@ typedef struct LinuxProcess_ { }*/ -LinuxProcess* LinuxProcess_new(Settings* settings, ProcessList* pl) { +LinuxProcess* LinuxProcess_new(ProcessList* pl) { LinuxProcess* this = calloc(sizeof(LinuxProcess), 1); - Process_init(&this->super, settings, pl); + Object_setClass(this, Class(Process)); + Process_init(&this->super, pl); return this; } void LinuxProcess_delete(Object* cast) { LinuxProcess* this = (LinuxProcess*) this; - Object_setClass(this, Class(Process)); Process_done((Process*)cast); free(this); } diff --git a/linux/LinuxProcess.h b/linux/LinuxProcess.h index ec2740e9..a162c5eb 100644 --- a/linux/LinuxProcess.h +++ b/linux/LinuxProcess.h @@ -20,7 +20,7 @@ typedef struct LinuxProcess_ { #define Process_delete LinuxProcess_delete -LinuxProcess* LinuxProcess_new(Settings* settings); +LinuxProcess* LinuxProcess_new(ProcessList* pl); void LinuxProcess_delete(Object* cast); diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c index 2bce78e5..54d20708 100644 --- a/linux/LinuxProcessList.c +++ b/linux/LinuxProcessList.c @@ -465,7 +465,7 @@ static bool LinuxProcessList_processEntries(ProcessList* this, const char* dirna process = existingProcess; assert(process->pid == pid); } else { - process = (Process*) LinuxProcess_new(settings, this); + process = (Process*) LinuxProcess_new(this); assert(process->comm == NULL); process->pid = pid; process->tgid = parent ? parent->pid : pid; |