update SUSE rules

[elogind.git] / udev_db.c

diff --git a/udev_db.c b/udev_db.c
index e2b7b4d9214e6a40b53f27eca451b41e71e56ea0..6b9d5e8426ccd2bb36be409d2a891bd151771b3d 100644 (file)
--- a/udev_db.c
+++ b/udev_db.c
@@ -43,8 +43,7 @@ static int devpath_to_db_path(const char *devpath, char *filename, size_t len)
 
        /* add location of db files */
        strlcpy(filename, udev_root, len);
-       strlcat(filename, "/", len);
-       start = strlcat(filename, DB_DIR, len);
+       start = strlcat(filename, "/"DB_DIR, len);
        end = strlcat(filename, devpath, len);
        if (end > len)
                end = len;
@@ -210,11 +209,10 @@ int udev_db_lookup_name(const char *name, char *devpath, size_t len)
        int found = 0;
 
        strlcpy(dbpath, udev_root, sizeof(dbpath));
-       strlcat(dbpath, "/", sizeof(dbpath));
-       strlcat(dbpath, DB_DIR, sizeof(dbpath));
+       strlcat(dbpath, "/"DB_DIR, sizeof(dbpath));
        dir = opendir(dbpath);
        if (dir == NULL) {
-               err("unable to open udev_db '%s': %s", dbpath, strerror(errno));
+               info("no udev_db available '%s': %s", dbpath, strerror(errno));
                return -1;
        }
 
@@ -282,11 +280,10 @@ int udev_db_get_all_entries(struct list_head *name_list)
        DIR *dir;
 
        strlcpy(dbpath, udev_root, sizeof(dbpath));
-       strlcat(dbpath, "/", sizeof(dbpath));
-       strlcat(dbpath, DB_DIR, sizeof(dbpath));
+       strlcat(dbpath, "/"DB_DIR, sizeof(dbpath));
        dir = opendir(dbpath);
        if (dir == NULL) {
-               err("unable to open udev_db '%s': %s", dbpath, strerror(errno));
+               info("no udev_db available '%s': %s", dbpath, strerror(errno));
                return -1;
        }