From 402e46bb82964366746b86d77eb5afa69c279539 Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Sun, 10 Feb 2019 12:32:47 +0100 Subject: [PATCH] Linting changes as reported by lgtm.com --- linux/LinuxProcessList.c | 20 ++++++++++---------- scripts/MakeHeader.py | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c index 62bc0967..5f38540c 100644 --- a/linux/LinuxProcessList.c +++ b/linux/LinuxProcessList.c @@ -927,30 +927,30 @@ static inline void LinuxProcessList_scanMemoryInfo(ProcessList* this) { char buffer[128]; while (fgets(buffer, 128, file)) { - #define tryRead(label, variable) (String_startsWith(buffer, label) && sscanf(buffer + strlen(label), " %32llu kB", variable)) + #define tryRead(label, variable) do { if (String_startsWith(buffer, label) && sscanf(buffer + strlen(label), " %32llu kB", variable)) { break; } } while(0) switch (buffer[0]) { case 'M': - if (tryRead("MemTotal:", &this->totalMem)) {} - else if (tryRead("MemFree:", &this->freeMem)) {} - else if (tryRead("MemShared:", &this->sharedMem)) {} + tryRead("MemTotal:", &this->totalMem); + tryRead("MemFree:", &this->freeMem); + tryRead("MemShared:", &this->sharedMem); break; case 'B': - if (tryRead("Buffers:", &this->buffersMem)) {} + tryRead("Buffers:", &this->buffersMem); break; case 'C': - if (tryRead("Cached:", &this->cachedMem)) {} + tryRead("Cached:", &this->cachedMem); break; case 'S': switch (buffer[1]) { case 'w': - if (tryRead("SwapTotal:", &this->totalSwap)) {} - else if (tryRead("SwapFree:", &swapFree)) {} + tryRead("SwapTotal:", &this->totalSwap); + tryRead("SwapFree:", &swapFree); break; case 'h': - if (tryRead("Shmem:", &shmem)) {} + tryRead("Shmem:", &shmem); break; case 'R': - if (tryRead("SReclaimable:", &sreclaimable)) {} + tryRead("SReclaimable:", &sreclaimable); break; } break; diff --git a/scripts/MakeHeader.py b/scripts/MakeHeader.py index 7c48fddb..349531b8 100755 --- a/scripts/MakeHeader.py +++ b/scripts/MakeHeader.py @@ -3,7 +3,7 @@ import os, sys, string, io try: from StringIO import StringIO except ImportError: - from io import StringIO + StringIO = io.StringIO ANY=1 COPY=2