chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libudev: fix check for too long packet
[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..fb4c6e2940af511710ba1f023f39ed00047ab39e 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;
@@
-103,7
+102,6
@@
static bool device_has_info(struct udev_device *udev_device)
int udev_device_update_db(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];
bool has_info;
const char *id;
char filename[UTIL_PATH_SIZE];
@@
-116,7
+114,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,13
+125,11
@@
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");
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
/*
* set 'sticky' bit to indicate that we should not clean the
@@
-155,7
+151,7
@@
int udev_device_update_db(struct udev_device *udev_device)
}
if (udev_device_get_usec_initialized(udev_device) > 0)
}
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))
udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(udev_device)) {
if (!udev_list_entry_get_num(list_entry))
@@
-173,7
+169,7
@@
int udev_device_update_db(struct udev_device *udev_device)
r = rename(filename_tmp, filename);
if (r < 0)
return -1;
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;
}
filename, udev_device_get_devpath(udev_device));
return 0;
}
@@
-186,7
+182,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;
}