SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

udev: use the systemd logging functions in udev tools

Browse Source
This commit is contained in:
Kay Sievers
2014-11-12 18:35:18 +01:00
parent e9730b7690
commit b12b78712e
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libudev/libudev-private.h
-1
View File
@@ -41,7 +41,6 @@
} while (0)
#define udev_dbg(udev, arg...) udev_log_cond(udev, LOG_DEBUG, ## arg)
#define udev_info(udev, arg...) udev_log_cond(udev, LOG_INFO, ## arg)
#define udev_err(udev, arg...) udev_log_cond(udev, LOG_ERR, ## arg)
/* libudev.c */
src/udev/udev-rules.c
+8 -8
View File
@@ -474,9 +474,9 @@ static uid_t add_uid(struct udev_rules *rules, const char *owner) {
r = get_user_creds(&owner, &uid, NULL, NULL, NULL);
if (r < 0) {
if (r == -ENOENT || r == -ESRCH)
udev_err(rules->udev, "specified user '%s' unknown\n", owner);
log_error("specified user '%s' unknown\n", owner);
else
udev_err(rules->udev, "error resolving user '%s': %s\n", owner, strerror(-r));
log_error("error resolving user '%s': %s\n", owner, strerror(-r));
}
/* grow buffer if needed */
@@ -521,9 +521,9 @@ static gid_t add_gid(struct udev_rules *rules, const char *group) {
r = get_group_creds(&group, &gid);
if (r < 0) {
if (r == -ENOENT || r == -ESRCH)
udev_err(rules->udev, "specified group '%s' unknown\n", group);
log_error("specified group '%s' unknown\n", group);
else
udev_err(rules->udev, "error resolving group '%s': %s\n", group, strerror(-r));
log_error("error resolving group '%s': %s\n", group, strerror(-r));
}
/* grow buffer if needed */
@@ -2265,9 +2265,9 @@ int udev_rules_apply_to_event(struct udev_rules *rules,
r = get_user_creds(&ow, &event->uid, NULL, NULL, NULL);
if (r < 0) {
if (r == -ENOENT || r == -ESRCH)
udev_err(event->udev, "specified user '%s' unknown\n", owner);
log_error(event->udev, "specified user '%s' unknown\n", owner);
else
udev_err(event->udev, "error resolving user '%s': %s\n", owner, strerror(-r));
log_error(event->udev, "error resolving user '%s': %s\n", owner, strerror(-r));
event->uid = 0;
}
@@ -2291,9 +2291,9 @@ int udev_rules_apply_to_event(struct udev_rules *rules,
r = get_group_creds(&gr, &event->gid);
if (r < 0) {
if (r == -ENOENT || r == -ESRCH)
udev_err(event->udev, "specified group '%s' unknown\n", group);
log_error(event->udev, "specified group '%s' unknown\n", group);
else
udev_err(event->udev, "error resolving group '%s': %s\n", group, strerror(-r));
log_error(event->udev, "error resolving group '%s': %s\n", group, strerror(-r));
event->gid = 0;
}