picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

libudev: we do not log errors from libraries

Browse source
This commit is contained in:
Kay Sievers 2014-11-13 11:42:24 +01:00
parent 281e05b6cb
commit a974cacd9a
4 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libudev/libudev-device-private.c
View file

@ -130,8 +130,8 @@ int udev_device_update_db(struct udev_device *udev_device)
mkdir_parents(filename_tmp, 0755); mkdir_parents(filename_tmp, 0755);
f = fopen(filename_tmp, "we"); f = fopen(filename_tmp, "we");
if (f == NULL) { if (f == NULL) {
udev_err(udev, "unable to create temporary db file '%s': %m\n", filename_tmp); udev_dbg(udev, "unable to create temporary db file '%s': %m\n", filename_tmp);
return -1; return -errno;
} }
/* /*

10
src/libudev/libudev-monitor.c
View file

@ -121,7 +121,7 @@ static bool udev_has_devtmpfs(struct udev *udev) {
r = name_to_handle_at(AT_FDCWD, "/dev", &h.handle, &mount_id, 0); r = name_to_handle_at(AT_FDCWD, "/dev", &h.handle, &mount_id, 0);
if (r < 0) { if (r < 0) {
if (errno != EOPNOTSUPP) if (errno != EOPNOTSUPP)
udev_err(udev, "name_to_handle_at on /dev: %m\n"); udev_dbg(udev, "name_to_handle_at on /dev: %m\n");
return false; return false;
} }
@ -190,7 +190,7 @@ struct udev_monitor *udev_monitor_new_from_netlink_fd(struct udev *udev, const c
if (fd < 0) { if (fd < 0) {
udev_monitor->sock = socket(PF_NETLINK, SOCK_RAW|SOCK_CLOEXEC|SOCK_NONBLOCK, NETLINK_KOBJECT_UEVENT); udev_monitor->sock = socket(PF_NETLINK, SOCK_RAW|SOCK_CLOEXEC|SOCK_NONBLOCK, NETLINK_KOBJECT_UEVENT);
if (udev_monitor->sock == -1) { if (udev_monitor->sock == -1) {
udev_err(udev, "error getting socket: %m\n"); udev_dbg(udev, "error getting socket: %m\n");
free(udev_monitor); free(udev_monitor);
return NULL; return NULL;
} }
@ -407,14 +407,14 @@ _public_ int udev_monitor_enable_receiving(struct udev_monitor *udev_monitor)
if (err == 0) if (err == 0)
udev_monitor->snl.nl.nl_pid = snl.nl.nl_pid; udev_monitor->snl.nl.nl_pid = snl.nl.nl_pid;
} else { } else {
udev_err(udev_monitor->udev, "bind failed: %m\n"); udev_dbg(udev_monitor->udev, "bind failed: %m\n");
return -errno; return -errno;
} }
/* enable receiving of sender credentials */ /* enable receiving of sender credentials */
err = setsockopt(udev_monitor->sock, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on)); err = setsockopt(udev_monitor->sock, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on));
if (err < 0) if (err < 0)
udev_err(udev_monitor->udev, "setting SO_PASSCRED failed: %m\n"); udev_dbg(udev_monitor->udev, "setting SO_PASSCRED failed: %m\n");
return 0; return 0;
} }
@ -648,7 +648,7 @@ retry:
/* udev message needs proper version magic */ /* udev message needs proper version magic */
nlh = (struct udev_monitor_netlink_header *) buf; nlh = (struct udev_monitor_netlink_header *) buf;
if (nlh->magic != htonl(UDEV_MONITOR_MAGIC)) { if (nlh->magic != htonl(UDEV_MONITOR_MAGIC)) {
udev_err(udev_monitor->udev, "unrecognized message signature (%x != %x)\n", udev_dbg(udev_monitor->udev, "unrecognized message signature (%x != %x)\n",
nlh->magic, htonl(UDEV_MONITOR_MAGIC)); nlh->magic, htonl(UDEV_MONITOR_MAGIC));
udev_device_unref(udev_device); udev_device_unref(udev_device);
return NULL; return NULL;

1
src/libudev/libudev-private.h
View file

@ -41,7 +41,6 @@
} while (0) } while (0)
#define udev_dbg(udev, arg...) udev_log_cond(udev, LOG_DEBUG, ## arg) #define udev_dbg(udev, arg...) udev_log_cond(udev, LOG_DEBUG, ## arg)
#define udev_err(udev, arg...) udev_log_cond(udev, LOG_ERR, ## arg)
/* libudev.c */ /* libudev.c */
void udev_log(struct udev *udev, void udev_log(struct udev *udev,

8
src/libudev/libudev.c
View file

@ -153,7 +153,7 @@ _public_ struct udev *udev_new(void)
/* split key/value */ /* split key/value */
val = strchr(key, '='); val = strchr(key, '=');
if (val == NULL) { if (val == NULL) {
udev_err(udev, "/etc/udev/udev.conf:%u: missing assignment, skipping line.\n", line_nr); udev_dbg(udev, "/etc/udev/udev.conf:%u: missing assignment, skipping line.\n", line_nr);
continue; continue;
} }
val[0] = '\0'; val[0] = '\0';
@ -185,7 +185,7 @@ _public_ struct udev *udev_new(void)
/* unquote */ /* unquote */
if (val[0] == '"' || val[0] == '\'') { if (val[0] == '"' || val[0] == '\'') {
if (val[len-1] != val[0]) { if (val[len-1] != val[0]) {
udev_err(udev, "/etc/udev/udev.conf:%u: inconsistent quoting, skipping line.\n", line_nr); udev_dbg(udev, "/etc/udev/udev.conf:%u: inconsistent quoting, skipping line.\n", line_nr);
continue; continue;
} }
val[len-1] = '\0'; val[len-1] = '\0';
@ -197,7 +197,7 @@ _public_ struct udev *udev_new(void)
prio = util_log_priority(val); prio = util_log_priority(val);
if (prio < 0) if (prio < 0)
udev_err(udev, "/etc/udev/udev.conf:%u: invalid log level '%s', ignoring.\n", line_nr, val); udev_dbg(udev, "/etc/udev/udev.conf:%u: invalid log level '%s', ignoring.\n", line_nr, val);
else else
udev_set_log_priority(udev, prio); udev_set_log_priority(udev, prio);
continue; continue;
@ -212,7 +212,7 @@ _public_ struct udev *udev_new(void)
prio = util_log_priority(env); prio = util_log_priority(env);
if (prio < 0) if (prio < 0)
udev_err(udev, "$UDEV_LOG specifies invalid log level '%s', ignoring.\n", env); udev_dbg(udev, "$UDEV_LOG specifies invalid log level '%s', ignoring.\n", env);
else else
udev_set_log_priority(udev, prio); udev_set_log_priority(udev, prio);
} }