* doxygen tag fix

* More careful use of online/present for udev monitor
* Be more careful reading config file to avoid crashes
Signed-off-by: Philippe De Swert <phdeswer@lumi.maa>

src/usb_moded-config.c

@@ -48,6 +48,8 @@ const char *find_mounts(void)
       return(ret);
   }
   keys = g_key_file_get_keys (settingsfile, FS_MOUNT_ENTRY, NULL, NULL);
+  if(keys == NULL)
+	return ret;
   while (*keys != NULL)
   {
   	if(!strcmp(*keys, FS_MOUNT_KEY))
@@ -81,6 +83,8 @@ int find_sync(void)
       return(ret);
   }
   keys = g_key_file_get_keys (settingsfile, FS_SYNC_ENTRY, NULL, NULL);
+  if(keys == NULL)
+	return ret;
   while (*keys != NULL)
   {
   	if(!strcmp(*keys, FS_SYNC_KEY))
@@ -110,6 +114,8 @@ const char * find_alt_mount(void)
       return(ret);
   }
   keys = g_key_file_get_keys (settingsfile, ALT_MOUNT_ENTRY, NULL, NULL);
+  if(keys == NULL)
+	return ret;
   while (*keys != NULL)
   {
         if(!strcmp(*keys, ALT_MOUNT_KEY))
@@ -144,6 +150,8 @@ const char * find_udev_path(void)
       return(ret);
   }
   keys = g_key_file_get_keys (settingsfile, UDEV_PATH_ENTRY, NULL, NULL);
+  if(keys == NULL)
+	return ret;
   while (*keys != NULL)
   {
   	if(!strcmp(*keys, UDEV_PATH_KEY))
@@ -179,6 +187,8 @@ const char * find_cdrom_path(void)
       return(ret);
   }
   keys = g_key_file_get_keys (settingsfile, CDROM_PATH_ENTRY, NULL, NULL);
+  if(keys == NULL)
+	return ret;
   while (*keys != NULL)
   {
   	if(!strcmp(*keys, CDROM_PATH_KEY))

src/usb_moded-dbus.c

@@ -231,7 +231,7 @@ void usb_moded_dbus_cleanup(void)
  * Send regular usb_moded state signal
  *
  * @return 1 on success, 0 on failure
- * @args the signal name
+ * @param state_ind the signal name
  *
 */
 int usb_moded_send_signal(const char *state_ind)

src/usb_moded-udev.c

@@ -67,15 +67,24 @@ gboolean hwal_init(void)
 
 gpointer monitor_udev(gpointer data)
 {
+  const char *tmp;
+
   while(1)
   {
     dev = udev_monitor_receive_device (mon);
     if (dev) 
     {
       if(!strcmp(udev_device_get_action(dev), "change"))
       {
-        if(!strcmp(udev_device_get_property_value(dev, "POWER_SUPPLY_PRESENT"), "1") ||
-           !strcmp(udev_device_get_property_value(dev, "POWER_SUPPLY_ONLINE"), "1"))
+        tmp = udev_device_get_property_value(dev, "POWER_SUPPLY_PRESENT");
+        if(!tmp)
+           tmp = udev_device_get_property_value(dev, "POWER_SUPPLY_ONLINE");
+	if(!tmp)
+	{
+	   log_err("No usable power supply indicator\n");
+	   exit(1);
+	}
+	if(!strcmp(tmp, "1"))
         {
 	  log_debug("UDEV:power supply present\n");
 	  /* POWER_SUPPLY_TYPE is USB if usb cable is connected, or USB_DCP for charger */