diff options
| author | Francisco Facioni <fran6co@gmail.com> | 2013-06-14 13:03:54 -0300 |
|---|---|---|
| committer | Pete Batard <pete@akeo.ie> | 2014-01-07 21:08:45 +0000 |
| commit | b1bbea6f4f5cadc8ba2f48ae077f0c4ac339c3cc (patch) | |
| tree | 9898c835a7156c26a59e8960f7c6c12795b8517d | |
| parent | 8b46e1c088167eb86b1712765896e2f17d70d148 (diff) | |
| download | libusb-b1bbea6f4f5cadc8ba2f48ae077f0c4ac339c3cc.tar.gz | |
Darwin: Return error code in darwin_error_str() on unknown error
* Closes #117
| -rw-r--r-- | libusb/os/darwin_usb.c | 4 | ||||
| -rw-r--r-- | libusb/version_nano.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libusb/os/darwin_usb.c b/libusb/os/darwin_usb.c index 204e1ef..0105e3c 100644 --- a/libusb/os/darwin_usb.c +++ b/libusb/os/darwin_usb.c @@ -71,6 +71,7 @@ static int process_new_device (struct libusb_context *ctx, io_service_t service) #if defined(ENABLE_LOGGING) static const char *darwin_error_str (int result) { + static char string_buffer[50]; switch (result) { case kIOReturnSuccess: return "no error"; @@ -103,7 +104,8 @@ static const char *darwin_error_str (int result) { case kIOUSBHighSpeedSplitError: return "high speed split error"; default: - return "unknown error"; + snprintf(string_buffer, sizeof(string_buffer), "unknown error (0x%x)", result); + return string_buffer; } } #endif diff --git a/libusb/version_nano.h b/libusb/version_nano.h index 9b72a0c..d576271 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 10857 +#define LIBUSB_NANO 10858 |