diff options
| author | Anthony G. Basile <blueness@gentoo.org> | 2015-02-11 16:53:37 -0500 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2015-02-11 16:53:37 -0500 |
| commit | 0a5fbf1cdb55852d2a80fafa871b63c93c52c413 (patch) | |
| tree | 6f591d28a9156a1ef11ea8968d0b72738c600581 /src/udev | |
| parent | e0bb33e4a80f8b0ada8283cb731377f5103dd0d8 (diff) | |
Minor cleanups
Diffstat (limited to 'src/udev')
| -rw-r--r-- | src/udev/udev-builtin-net_id.c | 2 | ||||
| -rw-r--r-- | src/udev/udev-rules.c | 12 | ||||
| -rw-r--r-- | src/udev/udevadm-info.c | 1 |
3 files changed, 6 insertions, 9 deletions
diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c index 97eb9dec06..37ff1b8008 100644 --- a/src/udev/udev-builtin-net_id.c +++ b/src/udev/udev-builtin-net_id.c @@ -1,5 +1,5 @@ /*** - This file is part of eudev, forked from systemd. + This file is part of systemd. Copyright 2012 Kay Sievers <kay@vrfy.org> diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c index 11cf21a4fb..54c865f143 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c @@ -1420,12 +1420,12 @@ static int add_rule(struct udev_rules *rules, char *line, } else { if (streq(value, "%k")) { log_error("NAME=\"%%k\" is ignored, because it breaks kernel supplied names, " - "please remove it from %s:%u", filename, lineno); + "please remove it from %s:%u\n", filename, lineno); continue; } if (value[0] == '\0') { log_debug("NAME=\"\" is ignored, because udev will not delete any device nodes, " - "please remove it from %s:%u", filename, lineno); + "please remove it from %s:%u\n", filename, lineno); continue; } rule_add_key(&rule_tmp, TK_A_NAME, op, value, NULL); @@ -2454,7 +2454,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, if (major(udev_device_get_devnum(event->dev)) && (!streq(name_str, udev_device_get_devnode(event->dev) + strlen("/dev/")))) { log_error("NAME=\"%s\" ignored, kernel device nodes " - "can not be renamed; please fix it in %s:%u", name, + "can not be renamed; please fix it in %s:%u\n", name, rules_str(rules, rule->rule.filename_off), rule->rule.filename_line); break; } @@ -2646,10 +2646,8 @@ int udev_rules_apply_static_dev_perms(struct udev_rules *rules) { strscpyl(tags_dir, sizeof(tags_dir), "/run/udev/static_node-tags/", *t, "/", NULL); r = mkdir_p(tags_dir, 0755); - if (r < 0) { - log_error_errno(r, "failed to create %s: %m", tags_dir); - return r; - } + if (r < 0) + return log_error_errno(r, "failed to create %s: %m", tags_dir); unescaped_filename = xescape(rules_str(rules, cur->key.value_off), "/."); diff --git a/src/udev/udevadm-info.c b/src/udev/udevadm-info.c index 48c0e79406..0e53d2e46c 100644 --- a/src/udev/udevadm-info.c +++ b/src/udev/udevadm-info.c @@ -32,7 +32,6 @@ #include "udev.h" #include "udev-util.h" #include "udevadm-util.h" -#include "util.h" static bool skip_attribute(const char *name) { static const char* const skip[] = { |