Resolve merge conflicts, merge #298 "Macro cleanup" from @BenBE

3 files changed, 50 insertions, 49 deletions

diff --git a/unsupported/Platform.c b/unsupported/Platform.c
index 4208b73c..80df7395 100644
--- a/unsupported/Platform.c
+++ b/unsupported/Platform.c
@@ -157,10 +157,10 @@ bool Platform_getDiskIO(DiskIOData* data) {
    return false;
 }
 
-bool Platform_getNetworkIO(unsigned long int *bytesReceived,
-                           unsigned long int *packetsReceived,
-                           unsigned long int *bytesTransmitted,
-                           unsigned long int *packetsTransmitted) {
+bool Platform_getNetworkIO(unsigned long int* bytesReceived,
+                           unsigned long int* packetsReceived,
+                           unsigned long int* bytesTransmitted,
+                           unsigned long int* packetsTransmitted) {
    *bytesReceived = 0;
    *packetsReceived = 0;
    *bytesTransmitted = 0;
diff --git a/unsupported/Platform.h b/unsupported/Platform.h
index 8ca201c1..a00f644e 100644
--- a/unsupported/Platform.h
+++ b/unsupported/Platform.h
@@ -55,9 +55,9 @@ FileLocks_ProcessData* Platform_getProcessLocks(pid_t pid);
 
 bool Platform_getDiskIO(DiskIOData* data);
 
-bool Platform_getNetworkIO(unsigned long int *bytesReceived,
-                           unsigned long int *packetsReceived,
-                           unsigned long int *bytesTransmitted,
-                           unsigned long int *packetsTransmitted);
+bool Platform_getNetworkIO(unsigned long int* bytesReceived,
+                           unsigned long int* packetsReceived,
+                           unsigned long int* bytesTransmitted,
+                           unsigned long int* packetsTransmitted);
 
 #endif
diff --git a/unsupported/UnsupportedProcessList.c b/unsupported/UnsupportedProcessList.c
index 33dd9fe8..6c0e0229 100644
--- a/unsupported/UnsupportedProcessList.c
+++ b/unsupported/UnsupportedProcessList.c
@@ -27,46 +27,47 @@ void ProcessList_delete(ProcessList* this) {
 void ProcessList_goThroughEntries(ProcessList* super, bool pauseProcessUpdate) {
 
    // in pause mode only gather global data for meters (CPU/memory/...)
-   if (pauseProcessUpdate)
+   if (pauseProcessUpdate) {
       return;
-
-    bool preExisting = true;
-    Process *proc;
-
-    proc = ProcessList_getProcess(super, 1, &preExisting, UnsupportedProcess_new);
-
-    /* Empty values */
-    proc->time = proc->time + 10;
-    proc->pid  = 1;
-    proc->ppid = 1;
-    proc->tgid = 0;
-    proc->comm = "<unsupported architecture>";
-    proc->basenameOffset = 0;
-    proc->updated = true;
-
-    proc->state = 'R';
-    proc->show = true; /* Reflected in proc->settings-> "hideXXX" really */
-    proc->pgrp = 0;
-    proc->session = 0;
-    proc->tty_nr = 0;
-    proc->tpgid = 0;
-    proc->st_uid = 0;
-    proc->flags = 0;
-    proc->processor = 0;
-
-    proc->percent_cpu = 2.5;
-    proc->percent_mem = 2.5;
-    proc->user = "nobody";
-
-    proc->priority = 0;
-    proc->nice = 0;
-    proc->nlwp = 1;
-    proc->starttime_ctime = 1433116800; // Jun 01, 2015
-    Process_fillStarttimeBuffer(proc);
-
-    proc->m_size = 100;
-    proc->m_resident = 100;
-
-    proc->minflt = 20;
-    proc->majflt = 20;
+   }
+
+   bool preExisting = true;
+   Process* proc;
+
+   proc = ProcessList_getProcess(super, 1, &preExisting, UnsupportedProcess_new);
+
+   /* Empty values */
+   proc->time = proc->time + 10;
+   proc->pid  = 1;
+   proc->ppid = 1;
+   proc->tgid = 0;
+   proc->comm = "<unsupported architecture>";
+   proc->basenameOffset = 0;
+   proc->updated = true;
+
+   proc->state = 'R';
+   proc->show = true; /* Reflected in proc->settings-> "hideXXX" really */
+   proc->pgrp = 0;
+   proc->session = 0;
+   proc->tty_nr = 0;
+   proc->tpgid = 0;
+   proc->st_uid = 0;
+   proc->flags = 0;
+   proc->processor = 0;
+
+   proc->percent_cpu = 2.5;
+   proc->percent_mem = 2.5;
+   proc->user = "nobody";
+
+   proc->priority = 0;
+   proc->nice = 0;
+   proc->nlwp = 1;
+   proc->starttime_ctime = 1433116800; // Jun 01, 2015
+   Process_fillStarttimeBuffer(proc);
+
+   proc->m_size = 100;
+   proc->m_resident = 100;
+
+   proc->minflt = 20;
+   proc->majflt = 20;
 }