diff options
| -rw-r--r-- | src/libirecovery.c | 8 | ||||
| -rw-r--r-- | tools/irecovery.c | 18 |
2 files changed, 12 insertions, 14 deletions
diff --git a/src/libirecovery.c b/src/libirecovery.c index 90fa785..6f155e5 100644 --- a/src/libirecovery.c +++ b/src/libirecovery.c | |||
| @@ -495,8 +495,8 @@ static int irecv_get_string_descriptor_ascii(irecv_client_t client, uint8_t desc | |||
| 495 | if (data[si + 1]) { | 495 | if (data[si + 1]) { |
| 496 | /* high byte */ | 496 | /* high byte */ |
| 497 | buffer[di++] = '?'; | 497 | buffer[di++] = '?'; |
| 498 | } else { | 498 | } else { |
| 499 | buffer[di++] = data[si]; | 499 | buffer[di++] = data[si]; |
| 500 | } | 500 | } |
| 501 | } | 501 | } |
| 502 | buffer[di] = 0; | 502 | buffer[di] = 0; |
| @@ -686,7 +686,7 @@ irecv_error_t irecv_set_interface(irecv_client_t client, int interface, int alt_ | |||
| 686 | 686 | ||
| 687 | irecv_error_t irecv_reset(irecv_client_t client) { | 687 | irecv_error_t irecv_reset(irecv_client_t client) { |
| 688 | if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE; | 688 | if (check_context(client) != IRECV_E_SUCCESS) return IRECV_E_NO_DEVICE; |
| 689 | 689 | ||
| 690 | #ifndef WIN32 | 690 | #ifndef WIN32 |
| 691 | libusb_reset_device(client->handle); | 691 | libusb_reset_device(client->handle); |
| 692 | #else | 692 | #else |
| @@ -714,7 +714,7 @@ irecv_error_t irecv_open_attempts(irecv_client_t* pclient, unsigned long long ec | |||
| 714 | } | 714 | } |
| 715 | } | 715 | } |
| 716 | 716 | ||
| 717 | return IRECV_E_UNABLE_TO_CONNECT; | 717 | return IRECV_E_UNABLE_TO_CONNECT; |
| 718 | } | 718 | } |
| 719 | 719 | ||
| 720 | irecv_error_t irecv_event_subscribe(irecv_client_t client, irecv_event_type type, irecv_event_cb_t callback, void* user_data) { | 720 | irecv_error_t irecv_event_subscribe(irecv_client_t client, irecv_event_type type, irecv_event_cb_t callback, void* user_data) { |
diff --git a/tools/irecovery.c b/tools/irecovery.c index 9ae0cf9..f398ec1 100644 --- a/tools/irecovery.c +++ b/tools/irecovery.c | |||
| @@ -142,7 +142,6 @@ static void init_shell(irecv_client_t client) { | |||
| 142 | irecv_event_subscribe(client, IRECV_POSTCOMMAND, &postcommand_cb, NULL); | 142 | irecv_event_subscribe(client, IRECV_POSTCOMMAND, &postcommand_cb, NULL); |
| 143 | while (!quit) { | 143 | while (!quit) { |
| 144 | error = irecv_receive(client); | 144 | error = irecv_receive(client); |
| 145 | |||
| 146 | if (error != IRECV_E_SUCCESS) { | 145 | if (error != IRECV_E_SUCCESS) { |
| 147 | debug("%s\n", irecv_strerror(error)); | 146 | debug("%s\n", irecv_strerror(error)); |
| 148 | break; | 147 | break; |
| @@ -275,14 +274,14 @@ int main(int argc, char* argv[]) { | |||
| 275 | case 'i': | 274 | case 'i': |
| 276 | if (optarg) { | 275 | if (optarg) { |
| 277 | char* tail = NULL; | 276 | char* tail = NULL; |
| 278 | ecid = strtoull(optarg, &tail, 16); | 277 | ecid = strtoull(optarg, &tail, 16); |
| 279 | if (tail && (tail[0] != '\0')) { | 278 | if (tail && (tail[0] != '\0')) { |
| 280 | ecid = 0; | 279 | ecid = 0; |
| 281 | } | 280 | } |
| 282 | if (ecid == 0) { | 281 | if (ecid == 0) { |
| 283 | fprintf(stderr, "ERROR: Could not parse ECID from argument '%s'\n", optarg); | 282 | fprintf(stderr, "ERROR: Could not parse ECID from argument '%s'\n", optarg); |
| 284 | return -1; | 283 | return -1; |
| 285 | } | 284 | } |
| 286 | } | 285 | } |
| 287 | break; | 286 | break; |
| 288 | 287 | ||
| @@ -398,4 +397,3 @@ int main(int argc, char* argv[]) { | |||
| 398 | irecv_close(client); | 397 | irecv_close(client); |
| 399 | return 0; | 398 | return 0; |
| 400 | } | 399 | } |
| 401 | |||
