[PATCH] simplify permission application

[elogind.git] / udev_add.c

diff --git a/udev_add.c b/udev_add.c
index c139bd38bf0ac1bbde2f4686ddfc81b622ec8554..c9b30bad90b93eae8e6aead51a6113914c7c95b8 100644 (file)
--- a/udev_add.c
+++ b/udev_add.c
@@ -38,11 +38,11 @@
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "udev_version.h"
 #include "logging.h"
 #include "namedev.h"
-#include "udevdb.h"
+#include "udev_db.h"
 
 #include "selinux.h"
 
@@ -189,7 +189,7 @@ static int create_node(struct udevice *udev)
        } else {
                info("creating device node '%s', major = '%d', minor = '%d', "
                     "mode = '%#o', uid = '%d', gid = '%d'", filename,
-                    udev->major, udev->minor, (mode_t)udev->mode, uid, gid);
+                    udev->major, udev->minor, udev->mode, uid, gid);
        }
 
        /* create all_partitions if requested */
@@ -303,8 +303,8 @@ int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
                if (retval != 0)
                        goto exit;
 
-               if (udevdb_add_dev(udev) != 0)
-                       dbg("udevdb_add_dev failed, but we create the node anyway, "
+               if (udev_db_add_device(udev) != 0)
+                       dbg("udev_db_add_dev failed, but we create the node anyway, "
                            "remove might not work for custom names");
 
                /* use full path to the environment */