diff options
| author | 2020-08-02 01:49:51 +0200 | |
|---|---|---|
| committer | 2020-08-02 01:49:51 +0200 | |
| commit | 0cd01163e5e30c2005edf4daafecbddea236a0d0 (patch) | |
| tree | 19b6c3105864354d60094d7698b1e916d42fa3f6 | |
| parent | 540e0c1fb988b926b625618c8bf31c8311f37e19 (diff) | |
| download | usbmuxd-0cd01163e5e30c2005edf4daafecbddea236a0d0.tar.gz usbmuxd-0cd01163e5e30c2005edf4daafecbddea236a0d0.tar.bz2 | |
device: Remove unnecessary copy in device_control_input() logging
| -rw-r--r-- | src/device.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/device.c b/src/device.c index 0402092..95d3569 100644 --- a/src/device.c +++ b/src/device.c | |||
| @@ -595,28 +595,20 @@ static void device_control_input(struct mux_device *dev, unsigned char *payload, | |||
| 595 | switch (payload[0]) { | 595 | switch (payload[0]) { |
| 596 | case 3: | 596 | case 3: |
| 597 | if (payload_length > 1) { | 597 | if (payload_length > 1) { |
| 598 | char* buf = malloc(payload_length); | 598 | usbmuxd_log(LL_ERROR, "%s: ERROR (on device): %.*s", __func__, payload_length-1, payload+1); |
| 599 | strncpy(buf, (char*)payload+1, payload_length-1); | ||
| 600 | buf[payload_length-1] = '\0'; | ||
| 601 | usbmuxd_log(LL_ERROR, "%s: ERROR (on device): %s", __func__, buf); | ||
| 602 | free(buf); | ||
| 603 | } else { | 599 | } else { |
| 604 | usbmuxd_log(LL_ERROR, "%s: Got device error payload with empty message", __func__); | 600 | usbmuxd_log(LL_ERROR, "%s: Got device error payload with empty message", __func__); |
| 605 | } | 601 | } |
| 606 | break; | 602 | break; |
| 607 | case 7: | 603 | case 7: |
| 608 | if (payload_length > 1) { | 604 | if (payload_length > 1) { |
| 609 | char* buf = malloc(payload_length); | 605 | usbmuxd_log(LL_INFO, "%s: %.*s", __func__, payload_length-1, payload+1); |
| 610 | strncpy(buf, (char*)payload+1, payload_length-1); | ||
| 611 | buf[payload_length-1] = '\0'; | ||
| 612 | usbmuxd_log(LL_INFO, "%s: %s", __func__, buf); | ||
| 613 | free(buf); | ||
| 614 | } else { | 606 | } else { |
| 615 | usbmuxd_log(LL_WARNING, "%s: Got payload type 7 with empty message", __func__); | 607 | usbmuxd_log(LL_WARNING, "%s: Got payload type %d with empty message", __func__, payload[0]); |
| 616 | } | 608 | } |
| 617 | break; | 609 | break; |
| 618 | default: | 610 | default: |
| 619 | usbmuxd_log(LL_WARNING, "%s: Got unhandled payload type %d", __func__, payload[0]); | 611 | usbmuxd_log(LL_WARNING, "%s: Got unhandled payload type %d: %.*s", __func__, payload[0], payload_length-1, payload+1); |
| 620 | break; | 612 | break; |
| 621 | } | 613 | } |
| 622 | } else { | 614 | } else { |
