Merge pull request #47 from saukko/master

[compiling] Build with -Wshadow and fix errors from that.
sailfishos · Jan 7, 2014 · 0388720 · 0388720
2 parents 5d56804 + 0c44baf
commit 0388720
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 50 deletions.
diff --git a/configure.ac b/configure.ac
@@ -174,7 +174,7 @@ fi
 # FIXME: DSME_LOG_ENABLE should be proper&working configure option
 #AC_DEFINE([DSME_LOG_ENABLE], [1])
 
-AC_SUBST(C_GENFLAGS, ["-pthread -g -std=c99 -Wall -Wwrite-strings -Wmissing-prototypes -Werror"])
+AC_SUBST(C_GENFLAGS, ["-pthread -g -std=c99 -Wall -Wwrite-strings -Wmissing-prototypes -Werror -Wshadow"])
 AC_SUBST(C_OPTFLAGS, ["-O2"])
 AC_SUBST(C_DBGFLAGS, ["-g -DDEBUG -DDSME_LOG_ENABLE"])
 AC_SUBST(CPP_GENFLAGS, '-I$(top_srcdir) -I$(top_srcdir)/include')

diff --git a/modules/state.c b/modules/state.c
@@ -160,12 +160,12 @@ static const struct {
 
 static const char* state_name(dsme_state_t state)
 {
-    int         index;
+    int         index_sn;
     const char* name = "*** UNKNOWN STATE ***";;
 
-    for (index = 0; index < sizeof states / sizeof states[0]; ++index) {
-        if (states[index].value == state) {
-            name = states[index].name;
+    for (index_sn = 0; index_sn < sizeof states / sizeof states[0]; ++index_sn) {
+        if (states[index_sn].value == state) {
+            name = states[index_sn].name;
             break;
         }
     }
@@ -175,12 +175,12 @@ static const char* state_name(dsme_state_t state)
 
 static const dsme_state_t state_value(const char* name)
 {
-    int          index;
+    int          index_sv;
     dsme_state_t state = DSME_STATE_NOT_SET;
 
-    for (index = 0; index < sizeof states / sizeof states[0]; ++index) {
-        if (strcasecmp(states[index].name, name) == 0) {
-            state = states[index].value;
+    for (index_sv = 0; index_sv < sizeof states / sizeof states[0]; ++index_sv) {
+        if (strcasecmp(states[index_sv].name, name) == 0) {
+            state = states[index_sv].value;
             break;
         }
     }
@@ -693,12 +693,12 @@ static telinit_handler_fn_t* telinit_handler(dsme_state_t state)
 #undef  DSME_STATE
     };
 
-    int index;
+    int index_th;
     telinit_handler_fn_t* handler = handle_telinit_NOT_SET;
 
-    for (index = 0; index < sizeof states / sizeof states[0]; ++index) {
-        if (handlers[index].state == state) {
-            handler = handlers[index].handler;
+    for (index_th = 0; index_th < sizeof states / sizeof states[0]; ++index_th) {
+        if (handlers[index_th].state == state) {
+            handler = handlers[index_th].handler;
             break;
         }
     }

diff --git a/modules/usbtracker.c b/modules/usbtracker.c
@@ -45,11 +45,11 @@
 static bool mounted_to_pc = false; 
 static bool charger_connected = false;
 
-static void send_usb_status(bool mounted_to_pc)
+static void send_usb_status(bool mounted_to_pc_input)
 {
     DSM_MSGTYPE_SET_USB_STATE msg = DSME_MSG_INIT(DSM_MSGTYPE_SET_USB_STATE);
 
-    msg.mounted_to_pc = mounted_to_pc;
+    msg.mounted_to_pc = mounted_to_pc_input;
 
     dsme_log(LOG_DEBUG,
              "usbtracker: broadcasting usb state:%s mounted to PC",

diff --git a/test/dsmetest.c b/test/dsmetest.c
@@ -123,7 +123,7 @@ int main(int argc, char *argv[])
 	int new_state = -1;
 	int powerup = -1;
 	int reboot = -1;
-	int alarm = -1;
+	int alarm_tmp = -1;
         int malf = -1;
 	const char *short_options = "UBshRMa:";
 	const struct option long_options[] = {
@@ -155,7 +155,7 @@ int main(int argc, char *argv[])
 			new_state = 1;
 			break;
 		case 'a':
-			alarm = atoi(optarg);
+			alarm_tmp = atoi(optarg);
 			break;
 		case 'M':
 			malf = 1;
@@ -193,8 +193,8 @@ int main(int argc, char *argv[])
 	if (new_state != -1)
 		send_shutdown_req(new_state);
 
-	if (alarm != -1)
-		send_alarm_state(alarm != 0);
+	if (alarm_tmp != -1)
+		send_alarm_state(alarm_tmp != 0);
 
         if (malf != -1)
                 send_malf_req();

diff --git a/test/stub_dsme_dbus.h b/test/stub_dsme_dbus.h
@@ -47,15 +47,15 @@ void dsme_dbus_unbind_signals(bool* really_bound,
       const dsme_dbus_signal_binding_t* binding = bindings;
 
       while (binding && binding->handler) {
-          GSList* signal;
+          GSList* signal_list;
 
-          for (signal = dbus_signal_bindings; signal; signal = signal->next) {
-              dsme_dbus_signal_binding_t* stored = signal->data;
+          for (signal_list = dbus_signal_bindings; signal_list; signal_list = signal_list->next) {
+              dsme_dbus_signal_binding_t* stored = signal_list->data;
 
               if (stored->handler == binding->handler &&
                   (strcmp(stored->interface, binding->interface) == 0) &&
                   (strcmp(stored->name, binding->name) == 0) ) {
-                  dbus_signal_bindings = g_slist_delete_link(dbus_signal_bindings, signal);
+                  dbus_signal_bindings = g_slist_delete_link(dbus_signal_bindings, signal_list);
               }
           }
           ++binding;
@@ -114,21 +114,21 @@ const char* dsme_dbus_message_get_string(const DsmeDbusMessage* msg)
   return s;
 }
 
-static inline void dsme_dbus_stub_send_signal(DBusMessage* signal)
+static inline void dsme_dbus_stub_send_signal(DBusMessage* signal_msg)
 {
   GSList* item;
   DsmeDbusMessage* dsmesig = g_new(DsmeDbusMessage, 1);
   dsmesig->connection = 0;
-  dsmesig->msg = signal;
-  dbus_message_iter_init(signal, &dsmesig->iter);
+  dsmesig->msg = signal_msg;
+  dbus_message_iter_init(signal_msg, &dsmesig->iter);
 
   for (item = dbus_signal_bindings; item; item = item->next) {
       const dsme_dbus_signal_binding_t* binding = (const dsme_dbus_signal_binding_t*)item->data;
 
       printf("bin: %s - %s\n", binding->interface, binding->name);
       if (
-          (strcmp(binding->interface, dbus_message_get_interface(signal)) == 0) &&
-          (strcmp(binding->name, dbus_message_get_member(signal)) == 0) ) {
+          (strcmp(binding->interface, dbus_message_get_interface(signal_msg)) == 0) &&
+          (strcmp(binding->name, dbus_message_get_member(signal_msg)) == 0) ) {
           binding->handler(dsmesig);
       }
   }

diff --git a/test/testmod_alarmtracker.c b/test/testmod_alarmtracker.c
@@ -232,12 +232,12 @@ static module_t* alarmtracker_module = NULL;
 static void load_alarmtracker(long int alarmtime)
 {
   set_alarm_queue(alarmtime);
-  gchar* module_name = g_strconcat(dsme_module_path, "alarmtracker.so", NULL);
-  alarmtracker_module = load_module_under_test(module_name);
+  gchar* module_name_tmp = g_strconcat(dsme_module_path, "alarmtracker.so", NULL);
+  alarmtracker_module = load_module_under_test(module_name_tmp);
 
   DSM_MSGTYPE_DBUS_CONNECT msg = TEST_MSG_INIT(DSM_MSGTYPE_DBUS_CONNECT);
   send_message(alarmtracker_module, &msg);
-  g_free(module_name);
+  g_free(module_name_tmp);
 }
 
 static void unload_alarmtracker(void)

diff --git a/test/testmod_emergencycalltracker.c b/test/testmod_emergencycalltracker.c
@@ -82,12 +82,12 @@ static module_t* emergencycalltracker_module = 0;
 
 static void load_emergencycalltracker(void)
 {
-  gchar* module_name = g_strconcat(dsme_module_path, "emergencycalltracker.so", NULL);
-  emergencycalltracker_module = load_module_under_test(module_name);
+  gchar* module_name_tmp = g_strconcat(dsme_module_path, "emergencycalltracker.so", NULL);
+  emergencycalltracker_module = load_module_under_test(module_name_tmp);
 
   DSM_MSGTYPE_DBUS_CONNECT msg = TEST_MSG_INIT(DSM_MSGTYPE_DBUS_CONNECT);
   send_message(emergencycalltracker_module, &msg);
-  g_free(module_name);
+  g_free(module_name_tmp);
 }
 
 static void unload_emergencycalltracker(void)

diff --git a/test/testmod_state.c b/test/testmod_state.c
@@ -97,12 +97,12 @@ static module_t* load_state_module(const char*  bootstate,
                                    dsme_state_t expected_state)
 {
   module_t* module;
-  gchar* module_name = g_strconcat(dsme_module_path, "state.so", NULL);
+  gchar* module_name_tmp = g_strconcat(dsme_module_path, "state.so", NULL);
 
   setenv("BOOTSTATE", bootstate, true);
-  module = load_module_under_test(module_name);
+  module = load_module_under_test(module_name_tmp);
   unsetenv("BOOTSTATE");
-  g_free(module_name);
+  g_free(module_name_tmp);
 
   DSM_MSGTYPE_STATE_CHANGE_IND* ind;
   assert((ind = queued(DSM_MSGTYPE_STATE_CHANGE_IND)));
@@ -758,10 +758,10 @@ static void testcase19(void)
 static void testcase20(void)
 {
   /* weird $BOOTSTATE cases */
-  gchar* module_name = g_strconcat(dsme_module_path, "state.so", NULL);
+  gchar* module_name_tmp = g_strconcat(dsme_module_path, "state.so", NULL);
 
   // do not specify $BOOTSTATE
-  module_t* state = load_module_under_test(module_name);
+  module_t* state = load_module_under_test(module_name_tmp);
   DSM_MSGTYPE_STATE_CHANGE_IND* ind;
   assert(ind = queued(DSM_MSGTYPE_STATE_CHANGE_IND));
   assert(ind->state == DSME_STATE_USER);
@@ -782,39 +782,39 @@ static void testcase20(void)
 
   // specify SHUTDOWN
   setenv("BOOTSTATE", "SHUTDOWN", true);
-  state = load_module_under_test(module_name);
+  state = load_module_under_test(module_name_tmp);
   unsetenv("BOOTSTATE");
   expect_shutdown(state);
   unload_module_under_test(state);
 
   // specify SHUTDOWN
   setenv("BOOTSTATE", "SHUTDOWN", true);
-  state = load_module_under_test(module_name);
+  state = load_module_under_test(module_name_tmp);
   unsetenv("BOOTSTATE");
   expect_shutdown(state);
   unload_module_under_test(state);
 
   // specify BOOT
   setenv("BOOTSTATE", "BOOT", true);
-  state = load_module_under_test(module_name);
+  state = load_module_under_test(module_name_tmp);
   unsetenv("BOOTSTATE");
   expect_reboot(state);
   unload_module_under_test(state);
 
-  g_free(module_name);
+  g_free(module_name_tmp);
 }
 
 static void testcase21(void)
 {
   /* non-rd_mode cases and cal problems */
 
-  gchar* module_name = g_strconcat(dsme_module_path, "state.so", NULL);
+  gchar* module_name_tmp = g_strconcat(dsme_module_path, "state.so", NULL);
 
   // non-rd_mode
   rd_mode = "";
   unsetenv("DSME_RD_FLAGS_ENV");
   setenv("BOOTSTATE", "DIIBADAABA", true);
-  module_t* state = load_module_under_test(module_name);
+  module_t* state = load_module_under_test(module_name_tmp);
   unsetenv("BOOTSTATE");
   DSM_MSGTYPE_STATE_CHANGE_IND* ind;
   assert(ind = queued(DSM_MSGTYPE_STATE_CHANGE_IND));
@@ -832,7 +832,7 @@ static void testcase21(void)
   // cal problem
   rd_mode = 0;
   setenv("BOOTSTATE", "DIIBADAABA", true);
-  state = load_module_under_test(module_name);
+  state = load_module_under_test(module_name_tmp);
   unsetenv("BOOTSTATE");
   assert(ind = queued(DSM_MSGTYPE_STATE_CHANGE_IND));
   assert(ind->state == DSME_STATE_USER);
@@ -845,7 +845,7 @@ static void testcase21(void)
   assert(!timer_exists());
   unload_module_under_test(state);
 
-  g_free(module_name);
+  g_free(module_name_tmp);
 }
 
 static void testcase22(void)

diff --git a/test/testmod_usbtracker.c b/test/testmod_usbtracker.c
@@ -82,12 +82,12 @@ static module_t* usbtracker_module = 0;
 
 static void load_usbtracker(void)
 {
-  gchar* module_name = g_strconcat(dsme_module_path, "usbtracker.so", NULL);
-  usbtracker_module = load_module_under_test(module_name);
+  gchar* module_name_tmp = g_strconcat(dsme_module_path, "usbtracker.so", NULL);
+  usbtracker_module = load_module_under_test(module_name_tmp);
 
   DSM_MSGTYPE_DBUS_CONNECT msg = TEST_MSG_INIT(DSM_MSGTYPE_DBUS_CONNECT);
   send_message(usbtracker_module, &msg);
-  g_free(module_name);
+  g_free(module_name_tmp);
 }
 
 static void unload_usbtracker(void)