X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibudev%2Flibudev-device-private.c;h=e5902887482c458d2aaf778055362e9e5d24680b;hb=a2360a467b50a62902eb612ff747df87bace81c5;hp=df1fc0c9bff97182cf661e3c4798649bc7113cc7;hpb=25e773eeb4f853804e1bf0dbd9a184f23e9b2a97;p=elogind.git
diff --git a/src/libudev/libudev-device-private.c b/src/libudev/libudev-device-private.c
index df1fc0c9b..e59028874 100644
--- a/src/libudev/libudev-device-private.c
+++ b/src/libudev/libudev-device-private.c
@@ -17,7 +17,6 @@
along with systemd; If not, see .
***/
-#include
#include
#include
#include
@@ -128,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) {
- log_debug("unable to create temporary db file '%s': %m\n", filename_tmp);
- return -errno;
- }
+ 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
@@ -171,7 +168,7 @@ int udev_device_update_db(struct udev_device *udev_device)
r = rename(filename_tmp, filename);
if (r < 0)
return -1;
- log_debug("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;
}
@@ -185,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;
}