chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dhcp: Process DHCP Ack/Nak message
[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 c123057907d20819b21dfc205aea9adb68cca3b8..cb4947ff3b358e90db1c34571ba0fdf69692a919 100644
(file)
--- a/
src/libudev/libudev-device-private.c
+++ b/
src/libudev/libudev-device-private.c
@@
-24,7
+24,6
@@
#include <stdbool.h>
#include <unistd.h>
#include <fcntl.h>
#include <stdbool.h>
#include <unistd.h>
#include <fcntl.h>
-#include <string.h>
#include <sys/stat.h>
#include "libudev.h"
#include <sys/stat.h>
#include "libudev.h"
@@
-38,7
+37,7
@@
static void udev_device_tag(struct udev_device *dev, const char *tag, bool add)
id = udev_device_get_id_filename(dev);
if (id == NULL)
return;
id = udev_device_get_id_filename(dev);
if (id == NULL)
return;
-
util_
strscpyl(filename, sizeof(filename), "/run/udev/tags/", tag, "/", id, NULL);
+ strscpyl(filename, sizeof(filename), "/run/udev/tags/", tag, "/", id, NULL);
if (add) {
int fd;
if (add) {
int fd;
@@
-116,7
+115,7
@@
int udev_device_update_db(struct udev_device *udev_device)
return -1;
has_info = device_has_info(udev_device);
return -1;
has_info = device_has_info(udev_device);
-
util_
strscpyl(filename, sizeof(filename), "/run/udev/data/", id, NULL);
+ strscpyl(filename, sizeof(filename), "/run/udev/data/", id, NULL);
/* do not store anything for otherwise empty devices */
if (!has_info &&
/* do not store anything for otherwise empty devices */
if (!has_info &&
@@
-127,7
+126,7
@@
int udev_device_update_db(struct udev_device *udev_device)
}
/* write a database file */
}
/* write a database file */
-
util_
strscpyl(filename_tmp, sizeof(filename_tmp), filename, ".tmp", NULL);
+ strscpyl(filename_tmp, sizeof(filename_tmp), filename, ".tmp", NULL);
mkdir_parents(filename_tmp, 0755);
f = fopen(filename_tmp, "we");
if (f == NULL) {
mkdir_parents(filename_tmp, 0755);
f = fopen(filename_tmp, "we");
if (f == NULL) {
@@
-186,7
+185,7
@@
int udev_device_delete_db(struct udev_device *udev_device)
id = udev_device_get_id_filename(udev_device);
if (id == NULL)
return -1;
id = udev_device_get_id_filename(udev_device);
if (id == NULL)
return -1;
-
util_
strscpyl(filename, sizeof(filename), "/run/udev/data/", id, NULL);
+ strscpyl(filename, sizeof(filename), "/run/udev/data/", id, NULL);
unlink(filename);
return 0;
}
unlink(filename);
return 0;
}