From 316d1c573345d8d13a289ce38cbe2fd683a75d98 Mon Sep 17 00:00:00 2001

From: Lennart Poettering <lennart@poettering.net>

Date: Tue, 24 Dec 2013 16:39:37 +0100

Subject: [PATCH] log: log_error() and friends add a newline after each line

 anyway, so avoid including it in the log strings

Conflicts:

	src/bus-driverd/bus-driverd.c

	src/bus-proxyd/bus-proxyd.c

	src/shared/path-util.c

	src/udev/net/link-config.c

	src/udev/scsi_id/scsi_id.c

	src/udev/scsi_id/scsi_serial.c

	src/udev/udev-builtin-keyboard.c

	src/udev/udev-event.c

	src/udev/udev-rules.c

	src/udev/udevadm-monitor.c

	src/udev/udevadm-trigger.c

	src/udev/udevd.c

---

 src/binfmt/binfmt.c                    |   2 +-

 src/bootchart/bootchart.c              |   4 +-

 src/journal/coredumpctl.c              |   2 +-

 src/journal/journal-authenticate.c     |   2 +-

 src/modules-load/modules-load.c        |   4 +-

 src/sysctl/sysctl.c                    |   2 +-

 src/test/test-udev.c                   |   8 +-

 src/tmpfiles/tmpfiles.c                |   4 +-

 src/udev/accelerometer/accelerometer.c |   2 +-

 src/udev/ata_id/ata_id.c               |   6 +-

 src/udev/cdrom_id/cdrom_id.c           | 160 ++++++++++++++++-----------------

 src/udev/udev-builtin-blkid.c          |   2 +-

 src/udev/udev-builtin-firmware.c       |  10 +--

 src/udev/udev-builtin-input_id.c       |  14 +--

 src/udev/udev-builtin-kmod.c           |  18 ++--

 src/udev/udev-builtin-usb_id.c         |  22 ++---

 src/udev/udev-ctrl.c                   |  22 ++---

 src/udev/udev-node.c                   |  32 +++----

 src/udev/udev-watch.c                  |  10 +--

 src/udev/udevadm-hwdb.c                |  42 ++++-----

 src/udev/udevadm-settle.c              |  16 ++--

 src/udev/udevadm-test.c                |   4 +-

 src/udev/udevadm.c                     |   2 +-

 23 files changed, 195 insertions(+), 195 deletions(-)

diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c

index 5a42b3d..7ed1ae7 100644

--- a/src/binfmt/binfmt.c

+++ b/src/binfmt/binfmt.c

@@ -94,7 +94,7 @@ static int apply_file(const char *path, bool ignore_enoent) {

                 return r;

         }

-        log_debug("apply: %s\n", path);

+        log_debug("apply: %s", path);

         for (;;) {

                 char l[LINE_MAX], *p;

                 int k;

diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c

index 14ccd3e..9f99c1f 100644

--- a/src/bootchart/bootchart.c

+++ b/src/bootchart/bootchart.c

@@ -262,12 +262,12 @@ static void do_journal_append(char *file)

         f = open(file, O_RDONLY);

         if (f < 0) {

-                log_error("Failed to read bootchart data: %m\n");

+                log_error("Failed to read bootchart data: %m");

                 return;

         }

         n = loop_read(f, p + 10, BOOTCHART_MAX, false);

         if (n < 0) {

-                log_error("Failed to read bootchart data: %s\n", strerror(-n));

+                log_error("Failed to read bootchart data: %s", strerror(-n));

                 close(f);

                 return;

         }

diff --git a/src/journal/coredumpctl.c b/src/journal/coredumpctl.c

index 75c96cc..560a91b 100644

--- a/src/journal/coredumpctl.c

+++ b/src/journal/coredumpctl.c

@@ -417,7 +417,7 @@ static int dump_core(sd_journal* j) {

         r = sd_journal_previous(j);

         if (r >= 0)

-                log_warning("More than one entry matches, ignoring rest.\n");

+                log_warning("More than one entry matches, ignoring rest.");

         return 0;

 }

diff --git a/src/journal/journal-authenticate.c b/src/journal/journal-authenticate.c

index bd7100a..f416b79 100644

--- a/src/journal/journal-authenticate.c

+++ b/src/journal/journal-authenticate.c

@@ -60,7 +60,7 @@ int journal_file_append_tag(JournalFile *f) {

         o->tag.seqnum = htole64(journal_file_tag_seqnum(f));

         o->tag.epoch = htole64(FSPRG_GetEpoch(f->fsprg_state));

-        log_debug("Writing tag %"PRIu64" for epoch %"PRIu64"\n",

+        log_debug("Writing tag %"PRIu64" for epoch %"PRIu64"",

                   le64toh(o->tag.seqnum),

                   FSPRG_GetEpoch(f->fsprg_state));

diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c

index 49ee420..9789398 100644

--- a/src/modules-load/modules-load.c

+++ b/src/modules-load/modules-load.c

@@ -122,7 +122,7 @@ static int load_module(struct kmod_ctx *ctx, const char *m) {

         struct kmod_list *itr, *modlist = NULL;

         int r = 0;

-        log_debug("load: %s\n", m);

+        log_debug("load: %s", m);

         r = kmod_module_new_from_lookup(ctx, m, &modlist);

         if (r < 0) {

@@ -190,7 +190,7 @@ static int apply_file(struct kmod_ctx *ctx, const char *path, bool ignore_enoent

                 return r;

         }

-        log_debug("apply: %s\n", path);

+        log_debug("apply: %s", path);

         for (;;) {

                 char line[LINE_MAX], *l;

                 int k;

diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c

index b5670db..8fb0eb6 100644

--- a/src/sysctl/sysctl.c

+++ b/src/sysctl/sysctl.c

@@ -132,7 +132,7 @@ static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno

                 return r;

         }

-        log_debug("parse: %s\n", path);

+        log_debug("parse: %s", path);

         while (!feof(f)) {

                 char l[LINE_MAX], *p, *value, *new_value, *property, *existing;

                 void *v;

diff --git a/src/test/test-udev.c b/src/test/test-udev.c

index 17825f1..676669b 100644

--- a/src/test/test-udev.c

+++ b/src/test/test-udev.c

@@ -101,20 +101,20 @@ int main(int argc, char *argv[])

         if (udev == NULL)

                 return EXIT_FAILURE;

-        log_debug("version %s\n", VERSION);

+        log_debug("version %s", VERSION);

         label_init("/dev");

         sigprocmask(SIG_SETMASK, NULL, &sigmask_orig);

         action = argv[1];

         if (action == NULL) {

-                log_error("action missing\n");

+                log_error("action missing");

                 goto out;

         }

         devpath = argv[2];

         if (devpath == NULL) {

-                log_error("devpath missing\n");

+                log_error("devpath missing");

                 goto out;

         }

@@ -123,7 +123,7 @@ int main(int argc, char *argv[])

         strscpyl(syspath, sizeof(syspath), "/sys", devpath, NULL);

         dev = udev_device_new_from_syspath(udev, syspath);

         if (dev == NULL) {

-                log_debug("unknown device '%s'\n", devpath);

+                log_debug("unknown device '%s'", devpath);

                 goto out;

         }

diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c

index e23847b..00f74c2 100644

--- a/src/tmpfiles/tmpfiles.c

+++ b/src/tmpfiles/tmpfiles.c

@@ -359,7 +359,7 @@ static int dir_cleanup(

                                 continue;

                         if (i->type != IGNORE_DIRECTORY_PATH || !streq(dent->d_name, p)) {

-                                log_debug("rmdir '%s'\n", sub_path);

+                                log_debug("rmdir '%s'", sub_path);

                                 if (unlinkat(dirfd(d), dent->d_name, AT_REMOVEDIR) < 0) {

                                         if (errno != ENOENT && errno != ENOTEMPTY) {

@@ -407,7 +407,7 @@ static int dir_cleanup(

                         if (age >= cutoff)

                                 continue;

-                        log_debug("unlink '%s'\n", sub_path);

+                        log_debug("unlink '%s'", sub_path);

                         if (unlinkat(dirfd(d), dent->d_name, 0) < 0) {

                                 if (errno != ENOENT) {

diff --git a/src/udev/accelerometer/accelerometer.c b/src/udev/accelerometer/accelerometer.c

index e611b48..9610d7c 100644

--- a/src/udev/accelerometer/accelerometer.c

+++ b/src/udev/accelerometer/accelerometer.c

@@ -334,7 +334,7 @@ int main (int argc, char** argv)

                 return 0;

         }

-        log_debug("opening accelerometer device %s\n", devnode);

+        log_debug("opening accelerometer device %s", devnode);

         test_orientation(udev, dev, devnode);

         free(devnode);

         log_close();

diff --git a/src/udev/ata_id/ata_id.c b/src/udev/ata_id/ata_id.c

index d375d43..5e55f8d 100644

--- a/src/udev/ata_id/ata_id.c

+++ b/src/udev/ata_id/ata_id.c

@@ -462,14 +462,14 @@ int main(int argc, char *argv[])

         node = argv[optind];

         if (node == NULL) {

-                log_error("no node specified\n");

+                log_error("no node specified");

                 rc = 1;

                 goto exit;

         }

         fd = open(node, O_RDONLY|O_NONBLOCK);

         if (fd < 0) {

-                log_error("unable to open '%s'\n", node);

+                log_error("unable to open '%s'", node);

                 rc = 1;

                 goto exit;

         }

@@ -501,7 +501,7 @@ int main(int argc, char *argv[])

         } else {

                 /* If this fails, then try HDIO_GET_IDENTITY */

                 if (ioctl(fd, HDIO_GET_IDENTITY, &id) != 0) {

-                        log_debug("HDIO_GET_IDENTITY failed for '%s': %m\n", node);

+                        log_debug("HDIO_GET_IDENTITY failed for '%s': %m", node);

                         rc = 2;

                         goto close;

                 }

diff --git a/src/udev/cdrom_id/cdrom_id.c b/src/udev/cdrom_id/cdrom_id.c

index 1ad0459..1fc0dfa 100644

--- a/src/udev/cdrom_id/cdrom_id.c

+++ b/src/udev/cdrom_id/cdrom_id.c

@@ -137,10 +137,10 @@ static bool is_mounted(const char *device)

 static void info_scsi_cmd_err(struct udev *udev, const char *cmd, int err)

 {

         if (err == -1) {

-                log_debug("%s failed\n", cmd);

+                log_debug("%s failed", cmd);

                 return;

         }

-        log_debug("%s failed with SK=%Xh/ASC=%02Xh/ACQ=%02Xh\n", cmd, SK(err), ASC(err), ASCQ(err));

+        log_debug("%s failed with SK=%Xh/ASC=%02Xh/ACQ=%02Xh", cmd, SK(err), ASC(err), ASCQ(err));

 }

 struct scsi_cmd {

@@ -205,11 +205,11 @@ static int media_lock(struct udev *udev, int fd, bool lock)

         /* disable the kernel's lock logic */

         err = ioctl(fd, CDROM_CLEAR_OPTIONS, CDO_LOCK);

         if (err < 0)

-                log_debug("CDROM_CLEAR_OPTIONS, CDO_LOCK failed\n");

+                log_debug("CDROM_CLEAR_OPTIONS, CDO_LOCK failed");

         err = ioctl(fd, CDROM_LOCKDOOR, lock ? 1 : 0);

         if (err < 0)

-                log_debug("CDROM_LOCKDOOR failed\n");

+                log_debug("CDROM_LOCKDOOR failed");

         return err;

 }

@@ -237,7 +237,7 @@ static int cd_capability_compat(struct udev *udev, int fd)

         capability = ioctl(fd, CDROM_GET_CAPABILITY, NULL);

         if (capability < 0) {

-                log_debug("CDROM_GET_CAPABILITY failed\n");

+                log_debug("CDROM_GET_CAPABILITY failed");

                 return -1;

         }

@@ -261,7 +261,7 @@ static int cd_capability_compat(struct udev *udev, int fd)

 static int cd_media_compat(struct udev *udev, int fd)

 {

         if (ioctl(fd, CDROM_DRIVE_STATUS, CDSL_CURRENT) != CDS_DISC_OK) {

-                log_debug("CDROM_DRIVE_STATUS != CDS_DISC_OK\n");

+                log_debug("CDROM_DRIVE_STATUS != CDS_DISC_OK");

                 return -1;

         }

         cd_media = 1;

@@ -285,11 +285,11 @@ static int cd_inquiry(struct udev *udev, int fd)

         }

         if ((inq[0] & 0x1F) != 5) {

-                log_debug("not an MMC unit\n");

+                log_debug("not an MMC unit");

                 return -1;

         }

-        log_debug("INQUIRY: [%.8s][%.16s][%.4s]\n", inq + 8, inq + 16, inq + 32);

+        log_debug("INQUIRY: [%.8s][%.16s][%.4s]", inq + 8, inq + 16, inq + 32);

         return 0;

 }

@@ -299,105 +299,105 @@ static void feature_profile_media(struct udev *udev, int cur_profile)

         case 0x03:

         case 0x04:

         case 0x05:

-                log_debug("profile 0x%02x \n", cur_profile);

+                log_debug("profile 0x%02x ", cur_profile);

                 cd_media = 1;

                 cd_media_mo = 1;

                 break;

         case 0x08:

-                log_debug("profile 0x%02x media_cd_rom\n", cur_profile);

+                log_debug("profile 0x%02x media_cd_rom", cur_profile);

                 cd_media = 1;

                 cd_media_cd_rom = 1;

                 break;

         case 0x09:

-                log_debug("profile 0x%02x media_cd_r\n", cur_profile);

+                log_debug("profile 0x%02x media_cd_r", cur_profile);

                 cd_media = 1;

                 cd_media_cd_r = 1;

                 break;

         case 0x0a:

-                log_debug("profile 0x%02x media_cd_rw\n", cur_profile);

+                log_debug("profile 0x%02x media_cd_rw", cur_profile);

                 cd_media = 1;

                 cd_media_cd_rw = 1;

                 break;

         case 0x10:

-                log_debug("profile 0x%02x media_dvd_ro\n", cur_profile);

+                log_debug("profile 0x%02x media_dvd_ro", cur_profile);

                 cd_media = 1;

                 cd_media_dvd_rom = 1;

                 break;

         case 0x11:

-                log_debug("profile 0x%02x media_dvd_r\n", cur_profile);

+                log_debug("profile 0x%02x media_dvd_r", cur_profile);

                 cd_media = 1;

                 cd_media_dvd_r = 1;

                 break;

         case 0x12:

-                log_debug("profile 0x%02x media_dvd_ram\n", cur_profile);

+                log_debug("profile 0x%02x media_dvd_ram", cur_profile);

                 cd_media = 1;

                 cd_media_dvd_ram = 1;

                 break;

         case 0x13:

-                log_debug("profile 0x%02x media_dvd_rw_ro\n", cur_profile);

+                log_debug("profile 0x%02x media_dvd_rw_ro", cur_profile);

                 cd_media = 1;

                 cd_media_dvd_rw = 1;

                 cd_media_dvd_rw_ro = 1;

                 break;

         case 0x14:

-                log_debug("profile 0x%02x media_dvd_rw_seq\n", cur_profile);

+                log_debug("profile 0x%02x media_dvd_rw_seq", cur_profile);

                 cd_media = 1;

                 cd_media_dvd_rw = 1;

                 cd_media_dvd_rw_seq = 1;

                 break;

         case 0x1B:

-                log_debug("profile 0x%02x media_dvd_plus_r\n", cur_profile);

+                log_debug("profile 0x%02x media_dvd_plus_r", cur_profile);

                 cd_media = 1;

                 cd_media_dvd_plus_r = 1;

                 break;

         case 0x1A:

-                log_debug("profile 0x%02x media_dvd_plus_rw\n", cur_profile);

+                log_debug("profile 0x%02x media_dvd_plus_rw", cur_profile);

                 cd_media = 1;

                 cd_media_dvd_plus_rw = 1;

                 break;

         case 0x2A:

-                log_debug("profile 0x%02x media_dvd_plus_rw_dl\n", cur_profile);

+                log_debug("profile 0x%02x media_dvd_plus_rw_dl", cur_profile);

                 cd_media = 1;

                 cd_media_dvd_plus_rw_dl = 1;

                 break;

         case 0x2B:

-                log_debug("profile 0x%02x media_dvd_plus_r_dl\n", cur_profile);

+                log_debug("profile 0x%02x media_dvd_plus_r_dl", cur_profile);

                 cd_media = 1;

                 cd_media_dvd_plus_r_dl = 1;

                 break;

         case 0x40:

-                log_debug("profile 0x%02x media_bd\n", cur_profile);

+                log_debug("profile 0x%02x media_bd", cur_profile);

                 cd_media = 1;

                 cd_media_bd = 1;

                 break;

         case 0x41:

         case 0x42:

-                log_debug("profile 0x%02x media_bd_r\n", cur_profile);

+                log_debug("profile 0x%02x media_bd_r", cur_profile);

                 cd_media = 1;

                 cd_media_bd_r = 1;

                 break;

         case 0x43:

-                log_debug("profile 0x%02x media_bd_re\n", cur_profile);

+                log_debug("profile 0x%02x media_bd_re", cur_profile);

                 cd_media = 1;

                 cd_media_bd_re = 1;

                 break;

         case 0x50:

-                log_debug("profile 0x%02x media_hddvd\n", cur_profile);

+                log_debug("profile 0x%02x media_hddvd", cur_profile);

                 cd_media = 1;

                 cd_media_hddvd = 1;

                 break;

         case 0x51:

-                log_debug("profile 0x%02x media_hddvd_r\n", cur_profile);

+                log_debug("profile 0x%02x media_hddvd_r", cur_profile);

                 cd_media = 1;

                 cd_media_hddvd_r = 1;

                 break;

         case 0x52:

-                log_debug("profile 0x%02x media_hddvd_rw\n", cur_profile);

+                log_debug("profile 0x%02x media_hddvd_rw", cur_profile);

                 cd_media = 1;

                 cd_media_hddvd_rw = 1;

                 break;

         default:

-                log_debug("profile 0x%02x <ignored>\n", cur_profile);

+                log_debug("profile 0x%02x <ignored>", cur_profile);

                 break;

         }

 }

@@ -414,77 +414,77 @@ static int feature_profiles(struct udev *udev, const unsigned char *profiles, si

                 case 0x03:

                 case 0x04:

                 case 0x05:

-                        log_debug("profile 0x%02x mo\n", profile);

+                        log_debug("profile 0x%02x mo", profile);

                         cd_mo = 1;

                         break;

                 case 0x08:

-                        log_debug("profile 0x%02x cd_rom\n", profile);

+                        log_debug("profile 0x%02x cd_rom", profile);

                         cd_cd_rom = 1;

                         break;

                 case 0x09:

-                        log_debug("profile 0x%02x cd_r\n", profile);

+                        log_debug("profile 0x%02x cd_r", profile);

                         cd_cd_r = 1;

                         break;

                 case 0x0A:

-                        log_debug("profile 0x%02x cd_rw\n", profile);

+                        log_debug("profile 0x%02x cd_rw", profile);

                         cd_cd_rw = 1;

                         break;

                 case 0x10:

-                        log_debug("profile 0x%02x dvd_rom\n", profile);

+                        log_debug("profile 0x%02x dvd_rom", profile);

                         cd_dvd_rom = 1;

                         break;

                 case 0x12:

-                        log_debug("profile 0x%02x dvd_ram\n", profile);

+                        log_debug("profile 0x%02x dvd_ram", profile);

                         cd_dvd_ram = 1;

                         break;

                 case 0x13:

                 case 0x14:

-                        log_debug("profile 0x%02x dvd_rw\n", profile);

+                        log_debug("profile 0x%02x dvd_rw", profile);

                         cd_dvd_rw = 1;

                         break;

                 case 0x1B:

-                        log_debug("profile 0x%02x dvd_plus_r\n", profile);

+                        log_debug("profile 0x%02x dvd_plus_r", profile);

                         cd_dvd_plus_r = 1;

                         break;

                 case 0x1A:

-                        log_debug("profile 0x%02x dvd_plus_rw\n", profile);

+                        log_debug("profile 0x%02x dvd_plus_rw", profile);

                         cd_dvd_plus_rw = 1;

                         break;

                 case 0x2A:

-                        log_debug("profile 0x%02x dvd_plus_rw_dl\n", profile);

+                        log_debug("profile 0x%02x dvd_plus_rw_dl", profile);

                         cd_dvd_plus_rw_dl = 1;

                         break;

                 case 0x2B:

-                        log_debug("profile 0x%02x dvd_plus_r_dl\n", profile);

+                        log_debug("profile 0x%02x dvd_plus_r_dl", profile);

                         cd_dvd_plus_r_dl = 1;

                         break;

                 case 0x40:

                         cd_bd = 1;

-                        log_debug("profile 0x%02x bd\n", profile);

+                        log_debug("profile 0x%02x bd", profile);

                         break;

                 case 0x41:

                 case 0x42:

                         cd_bd_r = 1;

-                        log_debug("profile 0x%02x bd_r\n", profile);

+                        log_debug("profile 0x%02x bd_r", profile);

                         break;

                 case 0x43:

                         cd_bd_re = 1;

-                        log_debug("profile 0x%02x bd_re\n", profile);

+                        log_debug("profile 0x%02x bd_re", profile);

                         break;

                 case 0x50:

                         cd_hddvd = 1;

-                        log_debug("profile 0x%02x hddvd\n", profile);

+                        log_debug("profile 0x%02x hddvd", profile);

                         break;

                 case 0x51:

                         cd_hddvd_r = 1;

-                        log_debug("profile 0x%02x hddvd_r\n", profile);

+                        log_debug("profile 0x%02x hddvd_r", profile);

                         break;

                 case 0x52:

                         cd_hddvd_rw = 1;

-                        log_debug("profile 0x%02x hddvd_rw\n", profile);

+                        log_debug("profile 0x%02x hddvd_rw", profile);

                         break;

                 default:

-                        log_debug("profile 0x%02x <ignored>\n", profile);

+                        log_debug("profile 0x%02x <ignored>", profile);

                         break;

                 }

         }

@@ -507,13 +507,13 @@ static int cd_profiles_old_mmc(struct udev *udev, int fd)

         if ((err != 0)) {

                 info_scsi_cmd_err(udev, "READ DISC INFORMATION", err);

                 if (cd_media == 1) {

-                        log_debug("no current profile, but disc is present; assuming CD-ROM\n");

+                        log_debug("no current profile, but disc is present; assuming CD-ROM");

                         cd_media_cd_rom = 1;

                         cd_media_track_count = 1;

                         cd_media_track_count_data = 1;

                         return 0;

                 } else {

-                        log_debug("no current profile, assuming no media\n");

+                        log_debug("no current profile, assuming no media");

                         return -1;

                 }

         };

@@ -522,13 +522,13 @@ static int cd_profiles_old_mmc(struct udev *udev, int fd)

         if (header[2] & 16) {

                 cd_media_cd_rw = 1;

-                log_debug("profile 0x0a media_cd_rw\n");

+                log_debug("profile 0x0a media_cd_rw");

         } else if ((header[2] & 3) < 2 && cd_cd_r) {

                 cd_media_cd_r = 1;

-                log_debug("profile 0x09 media_cd_r\n");

+                log_debug("profile 0x09 media_cd_r");

         } else {

                 cd_media_cd_rom = 1;

-                log_debug("profile 0x08 media_cd_rom\n");

+                log_debug("profile 0x08 media_cd_rom");

         }

         return 0;

 }

@@ -556,8 +556,8 @@ static int cd_profiles(struct udev *udev, int fd)

                 info_scsi_cmd_err(udev, "GET CONFIGURATION", err);

                 /* handle pre-MMC2 drives which do not support GET CONFIGURATION */

                 if (SK(err) == 0x5 && ASC(err) == 0x20) {

-                        log_debug("drive is pre-MMC2 and does not support 46h get configuration command\n");

-                        log_debug("trying to work around the problem\n");

+                        log_debug("drive is pre-MMC2 and does not support 46h get configuration command");

+                        log_debug("trying to work around the problem");

                         ret = cd_profiles_old_mmc(udev, fd);

                 }

                 goto out;

@@ -565,18 +565,18 @@ static int cd_profiles(struct udev *udev, int fd)

         cur_profile = features[6] << 8 | features[7];

         if (cur_profile > 0) {

-                log_debug("current profile 0x%02x\n", cur_profile);

+                log_debug("current profile 0x%02x", cur_profile);

                 feature_profile_media (udev, cur_profile);

                 ret = 0; /* we have media */

         } else {

-                log_debug("no current profile, assuming no media\n");

+                log_debug("no current profile, assuming no media");

         }

         len = features[0] << 24 | features[1] << 16 | features[2] << 8 | features[3];

-        log_debug("GET CONFIGURATION: size of features buffer 0x%04x\n", len);

+        log_debug("GET CONFIGURATION: size of features buffer 0x%04x", len);

         if (len > sizeof(features)) {

-                log_debug("can not get features in a single query, truncating\n");

+                log_debug("can not get features in a single query, truncating");

                 len = sizeof(features);

         } else if (len <= 8) {

                 len = sizeof(features);

@@ -596,10 +596,10 @@ static int cd_profiles(struct udev *udev, int fd)

         /* parse the length once more, in case the drive decided to have other features suddenly :) */

         len = features[0] << 24 | features[1] << 16 | features[2] << 8 | features[3];

-        log_debug("GET CONFIGURATION: size of features buffer 0x%04x\n", len);

+        log_debug("GET CONFIGURATION: size of features buffer 0x%04x", len);

         if (len > sizeof(features)) {

-                log_debug("can not get features in a single query, truncating\n");

+                log_debug("can not get features in a single query, truncating");

                 len = sizeof(features);

         }

@@ -611,11 +611,11 @@ static int cd_profiles(struct udev *udev, int fd)

                 switch (feature) {

                 case 0x00:

-                        log_debug("GET CONFIGURATION: feature 'profiles', with %i entries\n", features[i+3] / 4);

+                        log_debug("GET CONFIGURATION: feature 'profiles', with %i entries", features[i+3] / 4);

                         feature_profiles(udev, &features[i]+4, features[i+3]);

                         break;

                 default:

-                        log_debug("GET CONFIGURATION: feature 0x%04x <ignored>, with 0x%02x bytes\n", feature, features[i+3]);

+                        log_debug("GET CONFIGURATION: feature 0x%04x <ignored>, with 0x%02x bytes", feature, features[i+3]);

                         break;

                 }

         }

@@ -646,8 +646,8 @@ static int cd_media_info(struct udev *udev, int fd)

         };

         cd_media = 1;

-        log_debug("disk type %02x\n", header[8]);

-        log_debug("hardware reported media status: %s\n", media_status[header[2] & 3]);

+        log_debug("disk type %02x", header[8]);

+        log_debug("hardware reported media status: %s", media_status[header[2] & 3]);

         /* exclude plain CDROM, some fake cdroms return 0 for "blank" media here */

         if (!cd_media_cd_rom)

@@ -685,7 +685,7 @@ static int cd_media_info(struct udev *udev, int fd)

                         }

                         if (dvdstruct[4] & 0x02) {

                                 cd_media_state = media_status[2];

-                                log_debug("write-protected DVD-RAM media inserted\n");

+                                log_debug("write-protected DVD-RAM media inserted");

                                 goto determined;

                         }

@@ -702,13 +702,13 @@ static int cd_media_info(struct udev *udev, int fd)

                         len = format[3];

                         if (len & 7 || len < 16) {

-                                log_debug("invalid format capacities length\n");

+                                log_debug("invalid format capacities length");

                                 return -1;

                         }

                         switch(format[8] & 3) {

                             case 1:

-                                log_debug("unformatted DVD-RAM media inserted\n");

+                                log_debug("unformatted DVD-RAM media inserted");

                                 /* This means that last format was interrupted

                                  * or failed, blank dvd-ram discs are factory

                                  * formatted. Take no action here as it takes

@@ -717,12 +717,12 @@ static int cd_media_info(struct udev *udev, int fd)

                                 goto determined;

                             case 2:

-                                log_debug("formatted DVD-RAM media inserted\n");

+                                log_debug("formatted DVD-RAM media inserted");

                                 break;

                             case 3:

                                 cd_media = 0; //return no media

-                                log_debug("format capacities returned no media\n");

+                                log_debug("format capacities returned no media");

                                 return -1;

                         }

                 }

@@ -758,9 +758,9 @@ static int cd_media_info(struct udev *udev, int fd)

                 if (!result) {

                         cd_media_state = media_status[0];

-                        log_debug("no data in blocks 0 or 16, assuming blank\n");

+                        log_debug("no data in blocks 0 or 16, assuming blank");

                 } else {

-                        log_debug("data in blocks 0 or 16, assuming complete\n");

+                        log_debug("data in blocks 0 or 16, assuming complete");

                 }

         }

@@ -796,7 +796,7 @@ static int cd_media_toc(struct udev *udev, int fd)

         }

         len = (header[0] << 8 | header[1]) + 2;

-        log_debug("READ TOC: len: %d, start track: %d, end track: %d\n", len, header[2], header[3]);

+        log_debug("READ TOC: len: %d, start track: %d, end track: %d", len, header[2], header[3]);

         if (len > sizeof(toc))

                 return -1;

         if (len < 2)

@@ -830,7 +830,7 @@ static int cd_media_toc(struct udev *udev, int fd)

                 is_data_track = (p[1] & 0x04) != 0;

                 block = p[4] << 24 | p[5] << 16 | p[6] << 8 | p[7];

-                log_debug("track=%u info=0x%x(%s) start_block=%u\n",

+                log_debug("track=%u info=0x%x(%s) start_block=%u",

                      p[2], p[1] & 0x0f, is_data_track ? "data":"audio", block);

                 if (is_data_track)

@@ -850,7 +850,7 @@ static int cd_media_toc(struct udev *udev, int fd)

                 return -1;

         }

         len = header[4+4] << 24 | header[4+5] << 16 | header[4+6] << 8 | header[4+7];

-        log_debug("last track %u starts at block %u\n", header[4+2], len);

+        log_debug("last track %u starts at block %u", header[4+2], len);

         cd_media_session_last_offset = (unsigned long long int)len * 2048;

         return 0;

 }

@@ -919,7 +919,7 @@ int main(int argc, char *argv[])

         node = argv[optind];

         if (!node) {

-                log_error("no device\n");

+                log_error("no device");

                 fprintf(stderr, "no device\n");

                 rc = 1;

                 goto exit;

@@ -937,12 +937,12 @@ int main(int argc, char *argv[])

                 nanosleep(&duration, NULL);

         }

         if (fd < 0) {

-                log_debug("unable to open '%s'\n", node);

+                log_debug("unable to open '%s'", node);

                 fprintf(stderr, "unable to open '%s'\n", node);

                 rc = 1;

                 goto exit;

         }

-        log_debug("probing: '%s'\n", node);

+        log_debug("probing: '%s'", node);

         /* same data as original cdrom_id */

         if (cd_capability_compat(udev, fd) < 0) {

@@ -973,19 +973,19 @@ int main(int argc, char *argv[])

 work:

         /* lock the media, so we enable eject button events */

         if (lock && cd_media) {

-                log_debug("PREVENT_ALLOW_MEDIUM_REMOVAL (lock)\n");

+                log_debug("PREVENT_ALLOW_MEDIUM_REMOVAL (lock)");

                 media_lock(udev, fd, true);

         }

         if (unlock && cd_media) {

-                log_debug("PREVENT_ALLOW_MEDIUM_REMOVAL (unlock)\n");

+                log_debug("PREVENT_ALLOW_MEDIUM_REMOVAL (unlock)");

                 media_lock(udev, fd, false);

         }

         if (eject) {

-                log_debug("PREVENT_ALLOW_MEDIUM_REMOVAL (unlock)\n");

+                log_debug("PREVENT_ALLOW_MEDIUM_REMOVAL (unlock)");

                 media_lock(udev, fd, false);

-                log_debug("START_STOP_UNIT (eject)\n");

+                log_debug("START_STOP_UNIT (eject)");

                 media_eject(udev, fd);

         }

diff --git a/src/udev/udev-builtin-blkid.c b/src/udev/udev-builtin-blkid.c

index b48dccc..c806bd6 100644

--- a/src/udev/udev-builtin-blkid.c

+++ b/src/udev/udev-builtin-blkid.c

@@ -190,7 +190,7 @@ static int builtin_blkid(struct udev_device *dev, int argc, char *argv[], bool t

         if (err < 0)

                 goto out;

-        log_debug("probe %s %sraid offset=%llu\n",

+        log_debug("probe %s %sraid offset=%llu",

                   udev_device_get_devnode(dev),

                   noraid ? "no" : "", (unsigned long long) offset);

diff --git a/src/udev/udev-builtin-firmware.c b/src/udev/udev-builtin-firmware.c

index b80940b..8cfeed6 100644

--- a/src/udev/udev-builtin-firmware.c

+++ b/src/udev/udev-builtin-firmware.c

@@ -33,7 +33,7 @@ static bool set_loading(struct udev *udev, char *loadpath, const char *state)

         ldfile = fopen(loadpath, "we");

         if (ldfile == NULL) {

-                log_error("error: can not open '%s'\n", loadpath);

+                log_error("error: can not open '%s'", loadpath);

                 return false;

         };

         fprintf(ldfile, "%s\n", state);

@@ -53,7 +53,7 @@ static bool copy_firmware(struct udev *udev, const char *source, const char *tar

                 return false;

         }

-        log_debug("writing '%s' (%zi) to '%s'\n", source, size, target);

+        log_debug("writing '%s' (%zi) to '%s'", source, size, target);

         fsource = fopen(source, "re");

         if (fsource == NULL)

@@ -90,7 +90,7 @@ static int builtin_firmware(struct udev_device *dev, int argc, char *argv[], boo

         firmware = udev_device_get_property_value(dev, "FIRMWARE");

         if (firmware == NULL) {

-                log_error("firmware parameter missing\n\n");

+                log_error("firmware parameter missing");

                 rc = EXIT_FAILURE;

                 goto exit;

         }

@@ -112,7 +112,7 @@ static int builtin_firmware(struct udev_device *dev, int argc, char *argv[], boo

         strscpyl(loadpath, sizeof(loadpath), udev_device_get_syspath(dev), "/loading", NULL);

         if (fwfile == NULL) {

-                log_debug("did not find firmware file '%s'\n", firmware);

+                log_debug("did not find firmware file '%s'", firmware);

                 rc = EXIT_FAILURE;

                 /*

                  * Do not cancel the request in the initrd, the real root might have

@@ -136,7 +136,7 @@ static int builtin_firmware(struct udev_device *dev, int argc, char *argv[], boo

         strscpyl(datapath, sizeof(datapath), udev_device_get_syspath(dev), "/data", NULL);

         if (!copy_firmware(udev, fwpath, datapath, statbuf.st_size)) {

-                log_error("error sending firmware '%s' to device\n", firmware);

+                log_error("error sending firmware '%s' to device", firmware);

                 set_loading(udev, loadpath, "-1");

                 rc = EXIT_FAILURE;

                 goto exit;

diff --git a/src/udev/udev-builtin-input_id.c b/src/udev/udev-builtin-input_id.c

index 445b602..4691fc0 100644

--- a/src/udev/udev-builtin-input_id.c

+++ b/src/udev/udev-builtin-input_id.c

@@ -57,7 +57,7 @@ static void get_cap_mask(struct udev_device *dev,

         unsigned long val;

         snprintf(text, sizeof(text), "%s", udev_device_get_sysattr_value(pdev, attr));

-        log_debug("%s raw kernel attribute: %s\n", attr, text);

+        log_debug("%s raw kernel attribute: %s", attr, text);

         memset (bitmask, 0, bitmask_size);

         i = 0;

@@ -66,7 +66,7 @@ static void get_cap_mask(struct udev_device *dev,

                 if (i < bitmask_size/sizeof(unsigned long))

                         bitmask[i] = val;

                 else

-                        log_debug("ignoring %s block %lX which is larger than maximum size\n", attr, val);

+                        log_debug("ignoring %s block %lX which is larger than maximum size", attr, val);

                 *word = '\0';

                 ++i;

         }

@@ -74,12 +74,12 @@ static void get_cap_mask(struct udev_device *dev,

         if (i < bitmask_size / sizeof(unsigned long))

                 bitmask[i] = val;

         else

-                log_debug("ignoring %s block %lX which is larger than maximum size\n", attr, val);

+                log_debug("ignoring %s block %lX which is larger than maximum size", attr, val);

         if (test) {

                 /* printf pattern with the right unsigned long number of hex chars */

                 snprintf(text, sizeof(text), "  bit %%4u: %%0%zilX\n", 2 * sizeof(unsigned long));

-                log_debug("%s decoded bit map:\n", attr);

+                log_debug("%s decoded bit map:", attr);

                 val = bitmask_size / sizeof (unsigned long);

                 /* skip over leading zeros */

                 while (bitmask[val-1] == 0 && val > 0)

@@ -151,7 +151,7 @@ static void test_key (struct udev_device *dev,

         /* do we have any KEY_* capability? */

         if (!test_bit (EV_KEY, bitmask_ev)) {

-                log_debug("test_key: no EV_KEY capability\n");

+                log_debug("test_key: no EV_KEY capability");

                 return;

         }

@@ -159,13 +159,13 @@ static void test_key (struct udev_device *dev,

         found = 0;

         for (i = 0; i < BTN_MISC/BITS_PER_LONG; ++i) {

                 found |= bitmask_key[i];

-                log_debug("test_key: checking bit block %lu for any keys; found=%i\n", (unsigned long)i*BITS_PER_LONG, found > 0);

+                log_debug("test_key: checking bit block %lu for any keys; found=%i", (unsigned long)i*BITS_PER_LONG, found > 0);

         }

         /* If there are no keys in the lower block, check the higher block */

         if (!found) {

                 for (i = KEY_OK; i < BTN_TRIGGER_HAPPY; ++i) {

                         if (test_bit (i, bitmask_key)) {

-                                log_debug("test_key: Found key %x in high block\n", i);

+                                log_debug("test_key: Found key %x in high block", i);

                                 found = 1;

                                 break;