From 549da0b893d1d85b5a553a92aef8a4fecb4a602f Mon Sep 17 00:00:00 2001
From: Nikias Bassen
Date: Thu, 9 Jan 2014 15:27:00 +0100
Subject: removed trailing \n from usbmuxd_log() messages
---
src/conf.c | 2 +-
src/device.c | 4 ++--
src/main.c | 4 ++--
src/preflight.c | 2 +-
src/usb-linux.c | 2 +-
src/utils.c | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
(limited to 'src')
diff --git a/src/conf.c b/src/conf.c
index ef371a3..12194bc 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -524,6 +524,6 @@ void config_device_record_get_host_id(const char *udid, char **host_id)
plist_free(value);
if (!*host_id) {
- usbmuxd_log(LL_ERROR, "%s: ERROR couldn't get HostID from pairing record for udid %s\n", __func__, udid);
+ usbmuxd_log(LL_ERROR, "%s: ERROR couldn't get HostID from pairing record for udid %s", __func__, udid);
}
}
diff --git a/src/device.c b/src/device.c
index 28c0893..356c70a 100644
--- a/src/device.c
+++ b/src/device.c
@@ -463,7 +463,7 @@ static void device_version_input(struct mux_device *dev, struct version_header *
vh->major = ntohl(vh->major);
vh->minor = ntohl(vh->minor);
if(vh->major != 1 || vh->minor != 0) {
- usbmuxd_log(LL_ERROR, "Device %d has unknown version %d.%d\n", dev->id, vh->major, vh->minor);
+ usbmuxd_log(LL_ERROR, "Device %d has unknown version %d.%d", dev->id, vh->major, vh->minor);
pthread_mutex_lock(&device_list_mutex);
collection_remove(&device_list, dev);
pthread_mutex_unlock(&device_list_mutex);
@@ -491,7 +491,7 @@ static void device_tcp_input(struct mux_device *dev, struct tcphdr *th, unsigned
dev->id, dport, sport, ntohl(th->th_seq), ntohl(th->th_ack), th->th_flags, ntohs(th->th_win) << 8, ntohs(th->th_win), payload_length);
if(dev->state != MUXDEV_ACTIVE) {
- usbmuxd_log(LL_ERROR, "Received TCP packet from device %d but the device isn't active yet, discarding\n", dev->id);
+ usbmuxd_log(LL_ERROR, "Received TCP packet from device %d but the device isn't active yet, discarding", dev->id);
return;
}
diff --git a/src/main.c b/src/main.c
index 350fae6..b565d94 100644
--- a/src/main.c
+++ b/src/main.c
@@ -543,12 +543,12 @@ int main(int argc, char *argv[])
memset(&fst, '\0', sizeof(struct stat));
if (stat(userprefdir, &fst) < 0) {
if (mkdir(userprefdir, 0775) < 0) {
- usbmuxd_log(LL_FATAL, "Failed to create required directory '%s': %s\n", userprefdir, strerror(errno));
+ usbmuxd_log(LL_FATAL, "Failed to create required directory '%s': %s", userprefdir, strerror(errno));
res = -1;
goto terminate;
}
if (stat(userprefdir, &fst) < 0) {
- usbmuxd_log(LL_FATAL, "stat() failed after creating directory '%s': %s\n", userprefdir, strerror(errno));
+ usbmuxd_log(LL_FATAL, "stat() failed after creating directory '%s': %s", userprefdir, strerror(errno));
res = -1;
goto terminate;
}
diff --git a/src/preflight.c b/src/preflight.c
index 5198d8c..5c4474a 100644
--- a/src/preflight.c
+++ b/src/preflight.c
@@ -188,7 +188,7 @@ retry:
lockdown = NULL;
goto retry;
} else {
- usbmuxd_log(LL_ERROR, "%s: Could not remove pair record for device %s\n", __func__, _dev->udid);
+ usbmuxd_log(LL_ERROR, "%s: Could not remove pair record for device %s", __func__, _dev->udid);
}
break;
default:
diff --git a/src/usb-linux.c b/src/usb-linux.c
index 9d463c6..127446a 100644
--- a/src/usb-linux.c
+++ b/src/usb-linux.c
@@ -234,7 +234,7 @@ int usb_discover(void)
devlist_failures++;
// sometimes libusb fails getting the device list if you've just removed something
if(devlist_failures > 5) {
- usbmuxd_log(LL_FATAL, "Too many errors getting device list\n");
+ usbmuxd_log(LL_FATAL, "Too many errors getting device list");
return cnt;
} else {
gettimeofday(&next_dev_poll_time, NULL);
diff --git a/src/utils.c b/src/utils.c
index 245894e..5296332 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -225,7 +225,7 @@ void buffer_read_from_filename(const char *filename, char **buffer, uint64_t *le
*buffer = (char*)malloc(sizeof(char)*(size+1));
if (fread(*buffer, sizeof(char), size, f) != size) {
- usbmuxd_log(LL_ERROR, "%s: ERROR: couldn't read %d bytes from %s\n", __func__, (int)size, filename);
+ usbmuxd_log(LL_ERROR, "%s: ERROR: couldn't read %d bytes from %s", __func__, (int)size, filename);
}
fclose(f);
--
cgit v1.1-32-gdbae