Add more debug

Signed-off-by: Philippe De Swert <philippe.deswert@jollamobile.com>
sailfishos · Jun 19, 2013 · 6b61d8a · 6b61d8a
1 parent 83477c3
commit 6b61d8a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/usb_moded-config.c b/src/usb_moded-config.c
@@ -436,13 +436,15 @@ int conf_file_merge(void)
 	if(!test)
 	{
 		log_debug("%d failed loading config file %s\n", test, filename_full);
-		g_free(filename_full);
+		goto next;
 	}
-	g_free(filename_full);
         log_debug("file data = %s\n", g_key_file_to_data(settingsfile, NULL, NULL));
 	keyfile_string = g_string_append(keyfile_string, g_key_file_to_data(settingsfile, NULL, NULL));
 	log_debug("keyfile_string = %s\n", keyfile_string->str);
   	g_key_file_free(settingsfile);
+
+next:	
+	g_free(filename_full);
   }
 
   if(keyfile_string)

diff --git a/src/usb_moded-dyn-config.c b/src/usb_moded-dyn-config.c
@@ -83,7 +83,9 @@ static struct mode_list_elem *read_mode_file(const gchar *filename)
   list_item->network = g_key_file_get_integer(settingsfile, MODE_ENTRY, MODE_NETWORK_KEY, NULL);
   list_item->network_interface = g_key_file_get_string(settingsfile, MODE_ENTRY, MODE_NETWORK_INTERFACE_KEY, NULL);
   list_item->sysfs_path = g_key_file_get_string(settingsfile, MODE_OPTIONS_ENTRY, MODE_SYSFS_PATH, NULL);
+  log_debug("Dynamic mode sysfs path = %s\n", list_item->sysfs_path);
   list_item->sysfs_value = g_key_file_get_string(settingsfile, MODE_OPTIONS_ENTRY, MODE_SYSFS_VALUE, NULL);
+  log_debug("Dynamic mode sysfs value = %s\n", list_item->sysfs_value);
   list_item->sysfs_reset_value = g_key_file_get_string(settingsfile, MODE_OPTIONS_ENTRY, MODE_SYSFS_RESET_VALUE, NULL);
   list_item->softconnect = g_key_file_get_string(settingsfile, MODE_OPTIONS_ENTRY, MODE_SOFTCONNECT, NULL);
   list_item->softconnect_disconnect = g_key_file_get_string(settingsfile, MODE_OPTIONS_ENTRY, MODE_SOFTCONNECT_DISCONNECT, NULL);

diff --git a/src/usb_moded.c b/src/usb_moded.c
@@ -249,6 +249,8 @@ void set_usb_mode(const char *mode)
 {
   /* set return to 1 to be sure to error out if no matching mode is found either */
   int ret=1, net=0;
+
+  log_debug("Setting %s\n", mode);
 
   if(!strcmp(mode, MODE_CHARGING))
   {
@@ -275,6 +277,7 @@ void set_usb_mode(const char *mode)
       struct mode_list_elem *data = iter->data;
       if(!strcmp(mode, data->mode_name))
       {
+	log_debug("Matching mode %s found.\n", mode);
   	check_module_state(data->mode_module);
 	set_usb_module(data->mode_module);
 	ret = usb_moded_load_module(data->mode_module);