From 9f6445e34a57c270f013c9416c123e56261553dd Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 24 Dec 2013 16:39:37 +0100 Subject: log: log_error() and friends add a newline after each line anyway, so avoid including it in the log strings --- src/udev/udev-builtin-firmware.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/udev/udev-builtin-firmware.c') diff --git a/src/udev/udev-builtin-firmware.c b/src/udev/udev-builtin-firmware.c index b80940b6ef..8cfeed663b 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; -- cgit v1.2.3-54-g00ecf