Commit fe2cb866 authored by Martin Aumueller's avatar Martin Aumueller Committed by Matt Colyer

Print strerror of negated return values after failed usb_bulk_write/read.

Signed-off-by: 's avatarMatt Colyer <matt@colyer.name>
parent 279222bd
...@@ -87,14 +87,15 @@ iPhone *get_iPhone() { ...@@ -87,14 +87,15 @@ iPhone *get_iPhone() {
if (bytes < 20 && debug) { if (bytes < 20 && debug) {
printf("get_iPhone(): libusb did NOT send enough!\n"); printf("get_iPhone(): libusb did NOT send enough!\n");
if (bytes < 0) { if (bytes < 0) {
printf("get_iPhone(): libusb gave me the error: %s\n", usb_strerror()); printf("get_iPhone(): libusb gave me the error %d: %s (%s)\n",
bytes, usb_strerror(), strerror(-bytes));
} }
} }
bytes = usb_bulk_read(phone->device, BULKIN, (char*)version, sizeof(*version), 800); bytes = usb_bulk_read(phone->device, BULKIN, (char*)version, sizeof(*version), 800);
if (bytes < 20) { if (bytes < 20) {
free_iPhone(phone); free_iPhone(phone);
if (debug) printf("get_iPhone(): Invalid version message -- header too short.\n"); if (debug) printf("get_iPhone(): Invalid version message -- header too short.\n");
if (debug && bytes < 0) printf("get_iPhone(): libusb error message: %s\n", usb_strerror()); if (debug && bytes < 0) printf("get_iPhone(): libusb error message %d: %s (%s)\n", usb_strerror(), strerror(-bytes));
return NULL; return NULL;
} else { } else {
if (ntohl(version->major) == 1 && ntohl(version->minor) == 0) { if (ntohl(version->major) == 1 && ntohl(version->minor) == 0) {
...@@ -149,7 +150,7 @@ int send_to_phone(iPhone *phone, char *data, int datalen) { ...@@ -149,7 +150,7 @@ int send_to_phone(iPhone *phone, char *data, int datalen) {
if (debug) printf("noooo...?\n"); if (debug) printf("noooo...?\n");
if (bytes < datalen) { if (bytes < datalen) {
if(debug && bytes < 0) if(debug && bytes < 0)
printf("send_to_iphone(): libusb gave me the error: %s\n", usb_strerror()); printf("send_to_iphone(): libusb gave me the error %d: %s\n", bytes, usb_strerror(), strerror(-bytes));
return -1; return -1;
} else { } else {
return bytes; return bytes;
...@@ -173,7 +174,7 @@ int recv_from_phone(iPhone *phone, char *data, int datalen) { ...@@ -173,7 +174,7 @@ int recv_from_phone(iPhone *phone, char *data, int datalen) {
bytes = usb_bulk_read(phone->device, BULKIN, data, datalen, 3500); bytes = usb_bulk_read(phone->device, BULKIN, data, datalen, 3500);
if(bytes < 0) if(bytes < 0)
{ {
if(debug) printf("recv_from_iphone(): libusb gave me the error: %s\n", usb_strerror()); if(debug) printf("recv_from_iphone(): libusb gave me the error %d: %s (%s)\n", bytes, usb_strerror(), strerror(-bytes));
return -1; return -1;
} }
return bytes; return bytes;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment