summaryrefslogtreecommitdiff
path: root/src/udev
diff options
context:
space:
mode:
authorMichal Schmidt <mschmidt@redhat.com>2014-11-30 14:45:49 -0500
committerAnthony G. Basile <blueness@gentoo.org>2014-11-30 14:45:49 -0500
commited7c6787bd009fb3e16fac6cccb6c0eb2fe7705e (patch)
tree8c10d837354334564edea989fc1b39480f6637a5 /src/udev
parentaf2ae5734678999478bac5f780ef723631669003 (diff)
treewide: drop unnecessary trailing \n in log_*() calls
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'src/udev')
-rw-r--r--src/udev/udev-event.c18
-rw-r--r--src/udev/udev-rules.c10
-rw-r--r--src/udev/udevd.c4
3 files changed, 16 insertions, 16 deletions
diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
index fc4a2ec848..afcf262ebb 100644
--- a/src/udev/udev-event.c
+++ b/src/udev/udev-event.c
@@ -784,7 +784,7 @@ static int rename_netif_dev_fromname_toname(struct udev_device *dev,const char *
sk = socket(PF_INET, SOCK_DGRAM, 0);
if (sk < 0) {
err = -errno;
- log_error("error opening socket: %m\n");
+ log_error("error opening socket: %m");
return err;
}
@@ -798,11 +798,11 @@ static int rename_netif_dev_fromname_toname(struct udev_device *dev,const char *
int loop;
if (err == 0) {
- log_info("renamed network interface %s to %s\n", ifr.ifr_name, ifr.ifr_newname);
+ log_info("renamed network interface %s to %s", ifr.ifr_name, ifr.ifr_newname);
goto out;
}
/* keep trying if the destination interface name already exists */
- log_debug("collision on rename of network interface %s to %s , retrying until timeout\n",
+ log_debug("collision on rename of network interface %s to %s , retrying until timeout",
ifr.ifr_name, ifr.ifr_newname);
err = -errno;
@@ -818,7 +818,7 @@ static int rename_netif_dev_fromname_toname(struct udev_device *dev,const char *
err = ioctl(sk, SIOCSIFNAME, &ifr);
if (err == 0) {
- log_info("renamed network interface %s to %s\n", ifr.ifr_name, ifr.ifr_newname);
+ log_info("renamed network interface %s to %s", ifr.ifr_name, ifr.ifr_newname);
break;
}
err = -errno;
@@ -828,13 +828,13 @@ static int rename_netif_dev_fromname_toname(struct udev_device *dev,const char *
out:
if (err < 0)
- log_error("error changing net interface name %s to %s: %m\n", ifr.ifr_name, ifr.ifr_newname);
+ log_error("error changing net interface name %s to %s: %m", ifr.ifr_name, ifr.ifr_newname);
#else
if (err >= 0) {
- log_info("renamed network interface %s to %s\n", ifr.ifr_name, ifr.ifr_newname);
+ log_info("renamed network interface %s to %s", ifr.ifr_name, ifr.ifr_newname);
} else {
err = -errno;
- log_error("error changing net interface name %s to %s: %m\n", ifr.ifr_name, ifr.ifr_newname);
+ log_error("error changing net interface name %s to %s: %m", ifr.ifr_name, ifr.ifr_newname);
}
#endif
@@ -961,9 +961,9 @@ void udev_event_execute_rules(struct udev_event *event,
r = rename_netif_dev_fromname_toname(dev,udev_device_get_sysname(dev),newifname);
if (r == 0) {
finalifname = newifname;
- log_debug("renamed netif to '%s' for collision avoidance\n", newifname);
+ log_debug("renamed netif to '%s' for collision avoidance", newifname);
} else {
- log_error("could not rename netif to '%s' for collision avoidance\n",newifname);
+ log_error("could not rename netif to '%s' for collision avoidance",newifname);
}
}
/* rename it now to its final target if its not already there */
diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index 411d4a4ac1..7816d9dc7b 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\n", filename, lineno);
+ "please remove it from %s:%u", 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\n", filename, lineno);
+ "please remove it from %s:%u", filename, lineno);
continue;
}
rule_add_key(&rule_tmp, TK_A_NAME, op, value, NULL);
@@ -1916,9 +1916,9 @@ int udev_rules_assigning_name_to(struct udev_rules *rules, const char *match_nam
strscpy(name_str,UTIL_PATH_SIZE,name);
count = util_replace_chars(name_str, "/");
if (count > 0)
- log_debug("%i character(s) replaced\n", count);
+ log_debug("%i character(s) replaced", count);
if (streq(name_str,match_name)) {
- log_debug("found a match! NAME assigns %s in: %s:%u\n",
+ log_debug("found a match! NAME assigns %s in: %s:%u",
name,
rules_str(rules, rule->rule.filename_off),
rule->rule.filename_line);
@@ -2518,7 +2518,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\n", name,
+ "can not be renamed; please fix it in %s:%u", name,
rules_str(rules, rule->rule.filename_off), rule->rule.filename_line);
break;
}
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index fad0b11179..f2898d0dfa 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -966,7 +966,7 @@ static void static_dev_create_from_modules(struct udev *udev) {
strscpyl(filename, sizeof(filename), "/dev/", devname, NULL);
mkdir_parents_label(filename, 0755);
mac_selinux_create_file_prepare(filename, mode);
- log_debug("mknod '%s' %c%u:%u\n", filename, type, maj, min);
+ log_debug("mknod '%s' %c%u:%u", filename, type, maj, min);
if (mknod(filename, mode, makedev(maj, min)) < 0 && errno == EEXIST)
utimensat(AT_FDCWD, filename, NULL, 0);
mac_selinux_create_file_clear();
@@ -1233,7 +1233,7 @@ int main(int argc, char *argv[]) {
udev_monitor_set_receive_buffer_size(monitor, 128 * 1024 * 1024);
- log_info("starting version " VERSION "\n");
+ log_info("starting version " VERSION);
udev_builtin_init(udev);