Also fixed some false positives.
Signed-off-by: Zane Bitter zbitter@redhat.com --- src/CMakeLists.txt | 4 ++-- src/lib/host.c | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 28a3ef3..7db1449 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -20,8 +20,8 @@ else(WIN32) endif(WIN32) option(WITH-QMF "Build the QMF daemon" ON)
-set(CMAKE_C_FLAGS "-Wall") -set(CMAKE_CXX_FLAGS "-Wall") +set(CMAKE_C_FLAGS "-Wall -Wshadow") +set(CMAKE_CXX_FLAGS "-Wall -Wshadow")
include(FindPkgConfig) include_directories("${CMAKE_CURRENT_BINARY_DIR}") diff --git a/src/lib/host.c b/src/lib/host.c index 311149f..c390e2b 100644 --- a/src/lib/host.c +++ b/src/lib/host.c @@ -96,11 +96,11 @@ mh_host_get_operating_system(void) init();
if (operating_system == NULL) { - sigar_sys_info_t sysinfo; + sigar_sys_info_t sys_info;
- sigar_sys_info_get(host_init.sigar, &sysinfo); - operating_system = g_strdup_printf("%s (%s)", sysinfo.vendor_name, - sysinfo.version); + sigar_sys_info_get(host_init.sigar, &sys_info); + operating_system = g_strdup_printf("%s (%s)", sys_info.vendor_name, + sys_info.version); }
return operating_system; @@ -120,10 +120,10 @@ mh_host_get_architecture(void) init();
if (arch == NULL) { - sigar_sys_info_t sysinfo; + sigar_sys_info_t sys_info;
- sigar_sys_info_get(host_init.sigar, &sysinfo); - arch = g_strdup(sysinfo.arch); + sigar_sys_info_get(host_init.sigar, &sys_info); + arch = g_strdup(sys_info.arch); }
return arch; @@ -198,12 +198,12 @@ uint64_t mh_host_get_mem_free(void) { sigar_mem_t mem; - uint64_t free; + uint64_t free_mem; init();
sigar_mem_get(host_init.sigar, &mem); - free = mem.free / 1024; - return free; + free_mem = mem.free / 1024; + return free_mem; }
uint64_t @@ -222,12 +222,12 @@ uint64_t mh_host_get_swap_free(void) { sigar_swap_t swap; - uint64_t free; + uint64_t free_mem; init();
sigar_swap_get(host_init.sigar, &swap); - free = swap.free / 1024; - return free; + free_mem = swap.free / 1024; + return free_mem; }
static void