FIX GCC warnings and enable debug for old distros

5 files changed, 14 insertions, 12 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1605819b..1612ae95 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,11 +15,6 @@ set(DISTRO "" CACHE STRING "Distro build version eg. 1.el(rpm) or 1(deb)")
 SET(CMAKE_MODULE_PATH  "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 include(GNUInstallDirs)
 
-if(${CMAKE_BUILD_TYPE} MATCHES [Dd]ebug)
-	set(HARDINFO2_DEBUG 1)
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address")
-endif()
-
 if(${CMAKE_HOST_SYSTEM_NAME} MATCHES "Linux")
 	set(HARDINFO2_OS "linux")
 else()
@@ -78,7 +73,7 @@ message(STATUS "Building HardInfo2 for architecture: ${HARDINFO2_OS}-${HARDINFO2
 
 add_definitions("-std=gnu89")
 #add_definitions("-Wno-deprecated-declarations")
-#add_definitions("-Wextra")
+add_definitions("-Wextra")
 add_definitions("-Wno-missing-field-initializers")
 add_definitions("-Wformat")
 add_definitions("-Wformat-security")
@@ -177,6 +172,13 @@ if(${distro}${disversion} MATCHES "FedoraLinux39")
 endif()
 
 ################################################################################
+if(${CMAKE_BUILD_TYPE} MATCHES [Dd]ebug)
+	set(HARDINFO2_DEBUG 1)
+        if(${distro}${disversion} MATCHES "DebianGNULinux7")
+        else()
+	   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address")
+        endif()
+endif()
 add_subdirectory(po)
 
 
@@ -333,7 +335,7 @@ set_source_files_properties(
 	hardinfo2/problem_marker.c
 	hardinfo2/hinote_util.c
 	PROPERTIES
-	COMPILE_FLAGS "-std=c99 -Wall -Wextra -Wno-unused-function -Wno-deprecated-declarations -Wno-switch"
+	COMPILE_FLAGS "-std=c99 -Wall -Wextra -Wno-unused-function -Wno-switch"
 )
 
 foreach (_module ${HARDINFO2_MODULES})
diff --git a/modules/benchmark/guibench.c b/modules/benchmark/guibench.c
index 2b4f3b11..e0f8351e 100644
--- a/modules/benchmark/guibench.c
+++ b/modules/benchmark/guibench.c
@@ -68,7 +68,7 @@ static gchar *phrase = NULL;
 static gboolean keypress_event(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
 {
   const int magic[] = { 0x1b, 0x33, 0x3a, 0x35, 0x51 };
-  const int states[] = { 0xff52, 0xff52, 0xff54, 0xff54,
+  const unsigned int states[] = { 0xff52, 0xff52, 0xff54, 0xff54,
                          0xff51, 0xff53, 0xff51, 0xff53,
                          0x62, 0x61 };
   static int state = 0;
@@ -80,7 +80,7 @@ static gboolean keypress_event(GtkWidget *widget, GdkEventKey *event, gpointer u
   }
   
   if (state == G_N_ELEMENTS(states)) {
-    int i;
+    unsigned int i;
     
     for (i = 0; i < G_N_ELEMENTS(magic); i++) {
       phrase[i + 6] = magic[i] ^ (states[i] & (states[i] >> 8));
diff --git a/modules/devices/printers.c b/modules/devices/printers.c
index d880e691..0ed9dcda 100644
--- a/modules/devices/printers.c
+++ b/modules/devices/printers.c
@@ -43,7 +43,7 @@ struct _CUPSDest {
 static int (*cups_dests_get) (CUPSDest **dests) = NULL;
 static int (*cups_dests_free) (int num_dests, CUPSDest *dests) = NULL;
 static void (*cups_set_server)(const char *server) = NULL;
-volatile static gboolean cups_init = FALSE;
+static volatile gboolean cups_init = FALSE;
 
 GModule *cups;
 
diff --git a/modules/devices/spd-decode.c b/modules/devices/spd-decode.c
index 511504b2..cf4c89d7 100644
--- a/modules/devices/spd-decode.c
+++ b/modules/devices/spd-decode.c
@@ -1160,7 +1160,7 @@ static GSList *decode_dimms2(GSList *eeprom_list, const gchar *driver, gboolean
         }
 
         if (s) {
-            strncpy(s->dev, g_basename(spd_path), 31);
+            strncpy(s->dev, g_path_get_basename(spd_path), 31);
             s->spd_driver = driver;
             s->spd_size = spd_size;
             s->type = ram_type;
diff --git a/shell/shell.c b/shell/shell.c
index 22b1003f..e74486f2 100644
--- a/shell/shell.c
+++ b/shell/shell.c
@@ -1065,7 +1065,7 @@ static void set_view_type(ShellViewType viewtype, gboolean reload)
     if (viewtype != shell->view_type)
         type_changed = TRUE;
 
-    if (viewtype < SHELL_VIEW_NORMAL || viewtype >= SHELL_VIEW_N_VIEWS)
+    if (viewtype >= SHELL_VIEW_N_VIEWS)
         viewtype = SHELL_VIEW_NORMAL;
 
     shell->normalize_percentage = TRUE;