volume_id: rename subdirectory

[elogind.git] / udev_utils.c

diff --git a/udev_utils.c b/udev_utils.c
index c7292d0f045765a24241ca3044e2157e2b993278..a37c4dfe7492f2927b0f7d1660e791ec32ba5533 100644 (file)
--- a/udev_utils.c
+++ b/udev_utils.c
@@ -30,11 +30,7 @@
 #include <syslog.h>
 #include <sys/utsname.h>
 
-#include "udev_libc_wrapper.h"
 #include "udev.h"
-#include "logging.h"
-#include "udev_utils.h"
-#include "list.h"
 
 
 int log_priority(const char *priority)
@@ -57,29 +53,6 @@ int log_priority(const char *priority)
        return 0;
 }
 
-int kernel_release_satisfactory(unsigned int version, unsigned int patchlevel, unsigned int sublevel)
-{
-       static unsigned int kversion = 0;
-       static unsigned int kpatchlevel;
-       static unsigned int ksublevel;
-
-       if (kversion == 0) {
-               struct utsname uts;
-               if (uname(&uts) != 0)
-                       return -1;
-
-               if (sscanf (uts.release, "%u.%u.%u", &kversion, &kpatchlevel, &ksublevel) != 3) {
-                       kversion = 0;
-                       return -1;
-               }
-       }
-
-       if (kversion >= version && kpatchlevel >= patchlevel && ksublevel >= sublevel)
-               return 1;
-       else
-               return 0;
-}
-
 int name_list_add(struct list_head *name_list, const char *name, int sort)
 {
        struct name_entry *loop_name;
@@ -162,7 +135,7 @@ int add_matching_files(struct list_head *name_list, const char *dirname, const c
        dbg("open directory '%s'", dirname);
        dir = opendir(dirname);
        if (dir == NULL) {
-               dbg("unable to open '%s'", dirname);
+               err("unable to open '%s': %s", dirname, strerror(errno));
                return -1;
        }