From a68524ee4a7cbf120382a7b678a7820f07b10bf5 Mon Sep 17 00:00:00 2001 From: Orestis Floros Date: Fri, 1 May 2020 00:36:38 +0200 Subject: Fix various warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - unused variable ‘walk’ [-Wunused-variable] - implicit declaration of built-in function ‘free’ [-Wimplicit-function-declaration] - initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers] - variable 'ram_used' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized]. This is actually easily reproducible by specifying `memory_used_method = "XXX"`. - comparison of integers of different signs: 'int' and 'unsigned long' [-Wsign-compare] (for `exponent`) --- src/print_mem.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/print_mem.c') diff --git a/src/print_mem.c b/src/print_mem.c index cbe42a9..941c9d9 100644 --- a/src/print_mem.c +++ b/src/print_mem.c @@ -23,7 +23,7 @@ static const char *const iec_symbols[] = {"B", "KiB", "MiB", "GiB", "TiB"}; */ static int print_bytes_human(char *outwalk, unsigned long bytes, const char *unit, const int decimals) { double base = bytes; - int exponent = 0; + size_t exponent = 0; while (base >= BINARY_BASE && exponent < MAX_EXPONENT) { if (strcasecmp(unit, iec_symbols[exponent]) == 0) { break; @@ -86,7 +86,6 @@ void print_memory(yajl_gen json_gen, char *buffer, const char *format, const cha #if defined(linux) const char *selected_format = format; - const char *walk; const char *output_color = NULL; int unread_fields = 6; @@ -140,6 +139,8 @@ void print_memory(yajl_gen json_gen, char *buffer, const char *format, const cha ram_used = ram_total - ram_available; } else if (BEGINS_WITH(memory_used_method, "classical")) { ram_used = ram_total - ram_free - ram_buffers - ram_cached; + } else { + die("Unexpected value: memory_used_method = %s", memory_used_method); } if (threshold_degraded) { -- cgit v1.2.3