[EGIT] [core/enlightenment] enlightenment-0.18 04/04: bugfix: unify temp module temperature_get_bus_files() functions

[Mike Blumenkrantz]

discomfitor pushed a commit to branch enlightenment-0.18.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=750cb40ed7b5592880602a0b74c9b6f9c1cde93b

commit 750cb40ed7b5592880602a0b74c9b6f9c1cde93b
Author: Mike Blumenkrantz <zm...@samsung.com>
Date:   Fri Apr 4 14:51:21 2014 -0400

    bugfix: unify temp module temperature_get_bus_files() functions
    
    CID 1039874
---
 src/modules/temperature/e_mod_main.c | 68 +++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 36 deletions(-)

diff --git a/src/modules/temperature/e_mod_main.c 
b/src/modules/temperature/e_mod_main.c
index a309b2c..170d723 100644
--- a/src/modules/temperature/e_mod_main.c
+++ b/src/modules/temperature/e_mod_main.c
@@ -363,48 +363,44 @@ temperature_face_update_config(Config_Face *inst)
 }
 
 Eina_List *
-temperature_get_bus_files(const char* bus)
+temperature_get_bus_files(const char *bus)
 {
-   Eina_List *result, *therms;
+   Eina_List *result;
+   Eina_List *therms;
    char path[PATH_MAX];
    char busdir[PATH_MAX];
+   char *name;
 
    result = NULL;
-   if (result)
+
+   snprintf(busdir, sizeof(busdir), "/sys/bus/%s/devices", bus);
+   /* Look through all the devices for the given bus. */
+   therms = ecore_file_ls(busdir);
+
+   EINA_LIST_FREE(therms, name)
      {
-       snprintf(busdir, sizeof(busdir), "/sys/bus/%s/devices", bus);
-       /* Look through all the devices for the given bus. */
-       therms = ecore_file_ls(busdir);
-       if (therms)
-         {
-            char *name;
-
-            EINA_LIST_FREE(therms, name)
-              {
-                 Eina_List *files;
-                 char *file;
-
-                 /* Search each device for temp*_input, these should be 
-                  * temperature devices. */
-                 snprintf(path, sizeof(path), "%s/%s", busdir, name);
-                 files = ecore_file_ls(path);
-                 EINA_LIST_FREE(files, file)
-                   {
-                      if ((!strncmp("temp", file, 4)) && 
-                          (!strcmp("_input", &file[strlen(file) - 6])))
-                        {
-                           char *f;
-
-                           snprintf(path, sizeof(path),
-                                    "%s/%s/%s", busdir, name, file);
-                           f = strdup(path);
-                           if (f) result = eina_list_append(result, f);
-                        }
-                      free(file);
-                   }
-                 free(name);
-              }
-         }
+        Eina_List *files;
+        char *file;
+
+        /* Search each device for temp*_input, these should be
+         * temperature devices. */
+        snprintf(path, sizeof(path), "%s/%s", busdir, name);
+        files = ecore_file_ls(path);
+        EINA_LIST_FREE(files, file)
+          {
+             if ((!strncmp("temp", file, 4)) &&
+                 (!strcmp("_input", &file[strlen(file) - 6])))
+               {
+                  char *f;
+
+                  snprintf(path, sizeof(path),
+                           "%s/%s/%s", busdir, name, file);
+                  f = strdup(path);
+                  if (f) result = eina_list_append(result, f);
+               }
+             free(file);
+          }
+        free(name);
      }
    return result;
 }

--