[PATCH] change call_foreach_file to return a list

[elogind.git] / udev_utils.c

diff --git a/udev_utils.c b/udev_utils.c
index afa9790fdc6aa17fc0e85bb0b02cf230745dbf97..2b5683fda65b5801207fb8a878cac167fe32a758 100644 (file)
--- a/udev_utils.c
+++ b/udev_utils.c
@@ -53,13 +53,13 @@ int udev_init_device(struct udevice *udev, const char* devpath, const char *subs
                no_trailing_slash(udev->devpath);
 
                if (strncmp(udev->devpath, "/block/", 7) == 0)
-                       udev->type = BLOCK;
+                       udev->type = DEV_BLOCK;
                else if (strncmp(udev->devpath, "/class/net/", 11) == 0)
-                       udev->type = NET;
+                       udev->type = DEV_NET;
                else if (strncmp(udev->devpath, "/class/", 7) == 0)
-                       udev->type = CLASS;
+                       udev->type = DEV_CLASS;
                else if (strncmp(udev->devpath, "/devices/", 9) == 0)
-                       udev->type = PHYSDEV;
+                       udev->type = DEV_DEVICE;
 
                /* get kernel name */
                pos = strrchr(udev->devpath, '/');
@@ -177,41 +177,6 @@ int unlink_secure(const char *filename)
        return retval;
 }
 
-int parse_get_pair(char **orig_string, char **left, char **right)
-{
-       char *temp;
-       char *string = *orig_string;
-
-       if (!string)
-               return -ENODEV;
-
-       /* eat any whitespace */
-       while (isspace(*string) || *string == ',')
-               ++string;
-
-       /* split based on '=' */
-       temp = strsep(&string, "=");
-       *left = temp;
-       if (!string)
-               return -ENODEV;
-
-       /* take the right side and strip off the '"' */
-       while (isspace(string[0]))
-               ++string;
-       if (string[0] == '"')
-               ++string;
-       else
-               return -ENODEV;
-
-       temp = strsep(&string, "\"");
-       if (!string || temp[0] == '\0')
-               return -ENODEV;
-       *right = temp;
-       *orig_string = string;
-
-       return 0;
-}
-
 int file_map(const char *filename, char **buf, size_t *bufsize)
 {
        struct stat stats;
@@ -300,15 +265,12 @@ int name_list_add(struct list_head *name_list, const char *name, int sort)
 }
 
 /* calls function for every file found in specified directory */
-int call_foreach_file(int (*handler_function)(struct udevice *udev, const char *string),
-                     struct udevice *udev, const char *dirname, const char *suffix)
+int add_matching_files(struct list_head *name_list, const char *dirname, const char *suffix)
 {
        struct dirent *ent;
        DIR *dir;
        char *ext;
-       struct name_entry *loop_file;
-       struct name_entry *tmp_file;
-       LIST_HEAD(file_list);
+       char filename[PATH_SIZE];
 
        dbg("open directory '%s'", dirname);
        dir = opendir(dirname);
@@ -325,7 +287,7 @@ int call_foreach_file(int (*handler_function)(struct udevice *udev, const char *
                if ((ent->d_name[0] == '.') || (ent->d_name[0] == COMMENT_CHARACTER))
                        continue;
 
-               /* look for file with specified suffix */
+               /* look for file matching with specified suffix */
                ext = strrchr(ent->d_name, '.');
                if (ext == NULL)
                        continue;
@@ -334,20 +296,10 @@ int call_foreach_file(int (*handler_function)(struct udevice *udev, const char *
                        continue;
 
                dbg("put file '%s/%s' in list", dirname, ent->d_name);
-               name_list_add(&file_list, ent->d_name, 1);
-       }
-
-       /* call function for every file in the list */
-       list_for_each_entry_safe(loop_file, tmp_file, &file_list, node) {
-               char filename[PATH_SIZE];
 
-               snprintf(filename, sizeof(filename), "%s/%s", dirname, loop_file->name);
+               snprintf(filename, sizeof(filename), "%s/%s", dirname, ent->d_name);
                filename[sizeof(filename)-1] = '\0';
-
-               handler_function(udev, filename);
-
-               list_del(&loop_file->node);
-               free(loop_file);
+               name_list_add(name_list, filename, 1);
        }
 
        closedir(dir);