udevd: event - make db loading lazy in REMOVE event handling

[elogind.git] / src / libudev / libudev-device-private.c

diff --git a/src/libudev/libudev-device-private.c b/src/libudev/libudev-device-private.c
index cb4947ff3b358e90db1c34571ba0fdf69692a919..e5902887482c458d2aaf778055362e9e5d24680b 100644 (file)
--- a/src/libudev/libudev-device-private.c
+++ b/src/libudev/libudev-device-private.c
@@ -17,7 +17,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <stddef.h>
@@ -102,7 +101,6 @@ static bool device_has_info(struct udev_device *udev_device)
 
 int udev_device_update_db(struct udev_device *udev_device)
 {
-        struct udev *udev = udev_device_get_udev(udev_device);
         bool has_info;
         const char *id;
         char filename[UTIL_PATH_SIZE];
@@ -129,10 +127,8 @@ int udev_device_update_db(struct udev_device *udev_device)
         strscpyl(filename_tmp, sizeof(filename_tmp), filename, ".tmp", NULL);
         mkdir_parents(filename_tmp, 0755);
         f = fopen(filename_tmp, "we");
-        if (f == NULL) {
-                udev_err(udev, "unable to create temporary db file '%s': %m\n", filename_tmp);
-                return -1;
-        }
+        if (f == NULL)
+                return log_debug_errno(errno, "unable to create temporary db file '%s': %m", filename_tmp);
 
         /*
          * set 'sticky' bit to indicate that we should not clean the
@@ -154,7 +150,7 @@ int udev_device_update_db(struct udev_device *udev_device)
                 }
 
                 if (udev_device_get_usec_initialized(udev_device) > 0)
-                        fprintf(f, "I:%llu\n", (unsigned long long)udev_device_get_usec_initialized(udev_device));
+                        fprintf(f, "I:"USEC_FMT"\n", udev_device_get_usec_initialized(udev_device));
 
                 udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(udev_device)) {
                         if (!udev_list_entry_get_num(list_entry))
@@ -172,7 +168,7 @@ int udev_device_update_db(struct udev_device *udev_device)
         r = rename(filename_tmp, filename);
         if (r < 0)
                 return -1;
-        udev_dbg(udev, "created %s file '%s' for '%s'\n", has_info ? "db" : "empty",
+        log_debug("created %s file '%s' for '%s'", has_info ? "db" : "empty",
              filename, udev_device_get_devpath(udev_device));
         return 0;
 }
@@ -186,6 +182,7 @@ int udev_device_delete_db(struct udev_device *udev_device)
         if (id == NULL)
                 return -1;
         strscpyl(filename, sizeof(filename), "/run/udev/data/", id, NULL);
+
         unlink(filename);
         return 0;
 }