diff options
| author | Mats <d912e3@gmail.com> | 2014-03-11 20:15:36 +0100 |
|---|---|---|
| committer | Michael Stapelberg <michael@stapelberg.de> | 2014-03-12 08:28:16 +0100 |
| commit | 4f7da73885934a052425fc71861b0c9922c2122f (patch) | |
| tree | f3872ee680309fa8955318f4d3a586cb08846a9d /src/print_battery_info.c | |
| parent | 52814295a0b3a0785631256e9e2dc6b8139e2be8 (diff) | |
Unify use of string comparisons
* strncmp(s1, s2, strlen(s2)) → BEGINS_WITH(s1, s2)
* strncmp(s1, s2, strlen(s1)) → strcmp(s1, s2)
* Prefer case-insensitive comparison for options
Diffstat (limited to 'src/print_battery_info.c')
| -rw-r--r-- | src/print_battery_info.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/print_battery_info.c b/src/print_battery_info.c index aaef46e..72d291e 100644 --- a/src/print_battery_info.c +++ b/src/print_battery_info.c @@ -153,11 +153,11 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char seconds -= (minutes * 60); if (status == CS_DISCHARGING && low_threshold > 0) { - if (strncmp(threshold_type, "percentage", strlen(threshold_type)) == 0 + if (strcasecmp(threshold_type, "percentage") == 0 && percentage_remaining < low_threshold) { START_COLOR("color_bad"); colorful_output = true; - } else if (strncmp(threshold_type, "time", strlen(threshold_type)) == 0 + } else if (strcasecmp(threshold_type, "time") == 0 && seconds_remaining < 60 * low_threshold) { START_COLOR("color_bad"); colorful_output = true; @@ -191,7 +191,7 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char * we colorize the output if threshold_type is set to percentage * (since we don't have any information on remaining time). */ if (status == CS_DISCHARGING && low_threshold > 0) { - if (strncmp(threshold_type, "percentage", strlen(threshold_type)) == 0 + if (strcasecmp(threshold_type, "percentage") == 0 && percentage_remaining < low_threshold) { START_COLOR("color_bad"); colorful_output = true; @@ -242,11 +242,11 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char minutes -= (hours * 60); (void)snprintf(remainingbuf, sizeof(remainingbuf), "%02dh%02d", max(hours, 0), max(minutes, 0)); - if (strncmp(threshold_type, "percentage", strlen(threshold_type)) == 0 + if (strcasecmp(threshold_type, "percentage") == 0 && present_rate < low_threshold) { START_COLOR("color_bad"); colorful_output = true; - } else if (strncmp(threshold_type, "time", strlen(threshold_type)) == 0 + } else if (strcasecmp(threshold_type, "time") == 0 && remaining < (u_int) low_threshold) { START_COLOR("color_bad"); colorful_output = true; @@ -296,11 +296,11 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char (void)snprintf(percentagebuf, sizeof(percentagebuf), "%.00d%%", apm_info.battery_life); if (status == CS_DISCHARGING && low_threshold > 0) { - if (strncmp(threshold_type, "percentage", strlen(threshold_type)) == 0 + if (strcasecmp(threshold_type, "percentage") == 0 && apm_info.battery_life < low_threshold) { START_COLOR("color_bad"); colorful_output = true; - } else if (strncmp(threshold_type, "time", strlen(threshold_type)) == 0 + } else if (strcasecmp(threshold_type, "time") == 0 && apm_info.minutes_left < (u_int) low_threshold) { START_COLOR("color_bad"); colorful_output = true; @@ -334,21 +334,21 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char continue; } - if (strncmp(walk+1, "status", strlen("status")) == 0) { + if (BEGINS_WITH(walk+1, "status")) { outwalk += sprintf(outwalk, "%s", statusbuf); walk += strlen("status"); - } else if (strncmp(walk+1, "percentage", strlen("percentage")) == 0) { + } else if (BEGINS_WITH(walk+1, "percentage")) { outwalk += sprintf(outwalk, "%s", percentagebuf); walk += strlen("percentage"); - } else if (strncmp(walk+1, "remaining", strlen("remaining")) == 0) { + } else if (BEGINS_WITH(walk+1, "remaining")) { outwalk += sprintf(outwalk, "%s", remainingbuf); walk += strlen("remaining"); EAT_SPACE_FROM_OUTPUT_IF_EMPTY(remainingbuf); - } else if (strncmp(walk+1, "emptytime", strlen("emptytime")) == 0) { + } else if (BEGINS_WITH(walk+1, "emptytime")) { outwalk += sprintf(outwalk, "%s", emptytimebuf); walk += strlen("emptytime"); EAT_SPACE_FROM_OUTPUT_IF_EMPTY(emptytimebuf); - } else if (strncmp(walk+1, "consumption", strlen("consumption")) == 0) { + } else if (BEGINS_WITH(walk+1, "consumption")) { outwalk += sprintf(outwalk, "%s", consumptionbuf); walk += strlen("consumption"); EAT_SPACE_FROM_OUTPUT_IF_EMPTY(consumptionbuf); |