diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/conf.c | 2 | ||||
| -rw-r--r-- | src/device.c | 4 | ||||
| -rw-r--r-- | src/main.c | 4 | ||||
| -rw-r--r-- | src/preflight.c | 2 | ||||
| -rw-r--r-- | src/usb-linux.c | 2 | ||||
| -rw-r--r-- | src/utils.c | 2 |
6 files changed, 8 insertions, 8 deletions
| @@ -524,6 +524,6 @@ void config_device_record_get_host_id(const char *udid, char **host_id) | |||
| 524 | plist_free(value); | 524 | plist_free(value); |
| 525 | 525 | ||
| 526 | if (!*host_id) { | 526 | if (!*host_id) { |
| 527 | usbmuxd_log(LL_ERROR, "%s: ERROR couldn't get HostID from pairing record for udid %s\n", __func__, udid); | 527 | usbmuxd_log(LL_ERROR, "%s: ERROR couldn't get HostID from pairing record for udid %s", __func__, udid); |
| 528 | } | 528 | } |
| 529 | } | 529 | } |
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 * | |||
| 463 | vh->major = ntohl(vh->major); | 463 | vh->major = ntohl(vh->major); |
| 464 | vh->minor = ntohl(vh->minor); | 464 | vh->minor = ntohl(vh->minor); |
| 465 | if(vh->major != 1 || vh->minor != 0) { | 465 | if(vh->major != 1 || vh->minor != 0) { |
| 466 | usbmuxd_log(LL_ERROR, "Device %d has unknown version %d.%d\n", dev->id, vh->major, vh->minor); | 466 | usbmuxd_log(LL_ERROR, "Device %d has unknown version %d.%d", dev->id, vh->major, vh->minor); |
| 467 | pthread_mutex_lock(&device_list_mutex); | 467 | pthread_mutex_lock(&device_list_mutex); |
| 468 | collection_remove(&device_list, dev); | 468 | collection_remove(&device_list, dev); |
| 469 | pthread_mutex_unlock(&device_list_mutex); | 469 | pthread_mutex_unlock(&device_list_mutex); |
| @@ -491,7 +491,7 @@ static void device_tcp_input(struct mux_device *dev, struct tcphdr *th, unsigned | |||
| 491 | 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); | 491 | 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); |
| 492 | 492 | ||
| 493 | if(dev->state != MUXDEV_ACTIVE) { | 493 | if(dev->state != MUXDEV_ACTIVE) { |
| 494 | usbmuxd_log(LL_ERROR, "Received TCP packet from device %d but the device isn't active yet, discarding\n", dev->id); | 494 | usbmuxd_log(LL_ERROR, "Received TCP packet from device %d but the device isn't active yet, discarding", dev->id); |
| 495 | return; | 495 | return; |
| 496 | } | 496 | } |
| 497 | 497 | ||
| @@ -543,12 +543,12 @@ int main(int argc, char *argv[]) | |||
| 543 | memset(&fst, '\0', sizeof(struct stat)); | 543 | memset(&fst, '\0', sizeof(struct stat)); |
| 544 | if (stat(userprefdir, &fst) < 0) { | 544 | if (stat(userprefdir, &fst) < 0) { |
| 545 | if (mkdir(userprefdir, 0775) < 0) { | 545 | if (mkdir(userprefdir, 0775) < 0) { |
| 546 | usbmuxd_log(LL_FATAL, "Failed to create required directory '%s': %s\n", userprefdir, strerror(errno)); | 546 | usbmuxd_log(LL_FATAL, "Failed to create required directory '%s': %s", userprefdir, strerror(errno)); |
| 547 | res = -1; | 547 | res = -1; |
| 548 | goto terminate; | 548 | goto terminate; |
| 549 | } | 549 | } |
| 550 | if (stat(userprefdir, &fst) < 0) { | 550 | if (stat(userprefdir, &fst) < 0) { |
| 551 | usbmuxd_log(LL_FATAL, "stat() failed after creating directory '%s': %s\n", userprefdir, strerror(errno)); | 551 | usbmuxd_log(LL_FATAL, "stat() failed after creating directory '%s': %s", userprefdir, strerror(errno)); |
| 552 | res = -1; | 552 | res = -1; |
| 553 | goto terminate; | 553 | goto terminate; |
| 554 | } | 554 | } |
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: | |||
| 188 | lockdown = NULL; | 188 | lockdown = NULL; |
| 189 | goto retry; | 189 | goto retry; |
| 190 | } else { | 190 | } else { |
| 191 | usbmuxd_log(LL_ERROR, "%s: Could not remove pair record for device %s\n", __func__, _dev->udid); | 191 | usbmuxd_log(LL_ERROR, "%s: Could not remove pair record for device %s", __func__, _dev->udid); |
| 192 | } | 192 | } |
| 193 | break; | 193 | break; |
| 194 | default: | 194 | 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) | |||
| 234 | devlist_failures++; | 234 | devlist_failures++; |
| 235 | // sometimes libusb fails getting the device list if you've just removed something | 235 | // sometimes libusb fails getting the device list if you've just removed something |
| 236 | if(devlist_failures > 5) { | 236 | if(devlist_failures > 5) { |
| 237 | usbmuxd_log(LL_FATAL, "Too many errors getting device list\n"); | 237 | usbmuxd_log(LL_FATAL, "Too many errors getting device list"); |
| 238 | return cnt; | 238 | return cnt; |
| 239 | } else { | 239 | } else { |
| 240 | gettimeofday(&next_dev_poll_time, NULL); | 240 | 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 | |||
| 225 | 225 | ||
| 226 | *buffer = (char*)malloc(sizeof(char)*(size+1)); | 226 | *buffer = (char*)malloc(sizeof(char)*(size+1)); |
| 227 | if (fread(*buffer, sizeof(char), size, f) != size) { | 227 | if (fread(*buffer, sizeof(char), size, f) != size) { |
| 228 | usbmuxd_log(LL_ERROR, "%s: ERROR: couldn't read %d bytes from %s\n", __func__, (int)size, filename); | 228 | usbmuxd_log(LL_ERROR, "%s: ERROR: couldn't read %d bytes from %s", __func__, (int)size, filename); |
| 229 | } | 229 | } |
| 230 | fclose(f); | 230 | fclose(f); |
| 231 | 231 | ||
