From 69efa94f9f44e00cea3e2d68a83717c0632d68fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= Date: Wed, 27 Jan 2021 15:12:06 +0100 Subject: [PATCH] Use String_eq wrapper instead of raw strcmp --- dragonflybsd/DragonFlyBSDProcessList.c | 2 +- linux/SystemdMeter.c | 2 +- openbsd/Platform.c | 2 +- solaris/Platform.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dragonflybsd/DragonFlyBSDProcessList.c b/dragonflybsd/DragonFlyBSDProcessList.c index edf2c863..976dbea0 100644 --- a/dragonflybsd/DragonFlyBSDProcessList.c +++ b/dragonflybsd/DragonFlyBSDProcessList.c @@ -434,7 +434,7 @@ void ProcessList_goThroughEntries(ProcessList* super, bool pauseProcessUpdate) { if (proc->percent_cpu > 0.1) { // system idle process should own all CPU time left regardless of CPU count - if ( strcmp("idle", kproc->kp_comm) == 0 ) { + if (String_eq("idle", kproc->kp_comm)) { isIdleProcess = true; } } diff --git a/linux/SystemdMeter.c b/linux/SystemdMeter.c index f6dcb3fb..54abbe50 100644 --- a/linux/SystemdMeter.c +++ b/linux/SystemdMeter.c @@ -303,7 +303,7 @@ static int valueDigitColor(unsigned int value) { static void SystemdMeter_display(ATTR_UNUSED const Object* cast, RichString* out) { char buffer[16]; - int color = (systemState && 0 == strcmp(systemState, "running")) ? METER_VALUE_OK : METER_VALUE_ERROR; + int color = (systemState && String_eq(systemState, "running")) ? METER_VALUE_OK : METER_VALUE_ERROR; RichString_writeAscii(out, CRT_colors[color], systemState ? systemState : "N/A"); RichString_appendAscii(out, CRT_colors[METER_TEXT], " ("); diff --git a/openbsd/Platform.c b/openbsd/Platform.c index e3a14894..84a5e3d0 100644 --- a/openbsd/Platform.c +++ b/openbsd/Platform.c @@ -302,7 +302,7 @@ static bool findDevice(const char* name, int* mib, struct sensordev* snsrdev, si if (errno == ENOENT) return false; } - if (strcmp(name, snsrdev->xname) == 0) { + if (String_eq(name, snsrdev->xname)) { return true; } } diff --git a/solaris/Platform.c b/solaris/Platform.c index 45f16238..b3c83312 100644 --- a/solaris/Platform.c +++ b/solaris/Platform.c @@ -138,7 +138,7 @@ int Platform_getUptime() { struct utmpx* ent; while (( ent = getutxent() )) { - if ( !strcmp("system boot", ent->ut_line )) { + if ( String_eq("system boot", ent->ut_line )) { boot_time = ent->ut_tv.tv_sec; } }