[PATCH] make the udev object available to more processing stages

[elogind.git] / udev_lib.c

diff --git a/udev_lib.c b/udev_lib.c
index 951d36b1d7fb50c746a78d048c27d649c74763fb..012d60b0ea3138baa3082724a5308d90e27657db 100644 (file)
--- a/udev_lib.c
+++ b/udev_lib.c
@@ -178,12 +178,12 @@ static int file_list_insert(char *filename, struct list_head *file_list)
 }
 
 /* calls function for every file found in specified directory */
-int call_foreach_file(int fnct(char *f) , char *dirname, char *suffix)
+int call_foreach_file(file_fnct_t fnct, const char *dirname,
+                     const char *suffix, void *data)
 {
        struct dirent *ent;
        DIR *dir;
        char *ext;
-       char file[NAME_SIZE];
        struct files *loop_file;
        struct files *tmp_file;
        LIST_HEAD(file_list);
@@ -217,10 +217,12 @@ int call_foreach_file(int fnct(char *f) , char *dirname, char *suffix)
 
        /* call function for every file in the list */
        list_for_each_entry_safe(loop_file, tmp_file, &file_list, list) {
-               snprintf(file, NAME_SIZE-1, "%s/%s", dirname, loop_file->name);
-               file[NAME_SIZE-1] = '\0';
+               char filename[NAME_SIZE];
 
-               fnct(file);
+               snprintf(filename, NAME_SIZE-1, "%s/%s", dirname, loop_file->name);
+               filename[NAME_SIZE-1] = '\0';
+
+               fnct(filename, data);
 
                list_del(&loop_file->list);
                free(loop_file);
@@ -229,22 +231,3 @@ int call_foreach_file(int fnct(char *f) , char *dirname, char *suffix)
        closedir(dir);
        return 0;
 }
-
-/* Set the FD_CLOEXEC  flag of desc if value is nonzero,
-   or clear the flag if value is 0.
-   Return 0 on success, or -1 on error with errno  set. */ 
-       
-int set_cloexec_flag (int desc, int value)
-{
-       int oldflags = fcntl (desc, F_GETFD, 0);
-       /* If reading the flags failed, return error indication now. */
-       if (oldflags < 0)
-               return oldflags;
-       /* Set just the flag we want to set. */
-       if (value != 0)
-               oldflags |= FD_CLOEXEC;
-       else
-               oldflags &= ~FD_CLOEXEC;
-       /* Store modified flag word in the descriptor. */
-       return fcntl (desc, F_SETFD, oldflags);
-}