diff options
| author | Daniel Drake <dsd@gentoo.org> | 2008-05-04 14:22:16 +0100 |
|---|---|---|
| committer | Daniel Drake <dsd@gentoo.org> | 2008-05-04 14:22:16 +0100 |
| commit | bdce367d1bd8691465844b2411c85215498f517d (patch) | |
| tree | ac4ef68e514fbc1442344b1a2f0b02d7d77db8a4 /libusb/sync.c | |
| parent | bfe74e9cd9c17a40fff042ea0647326f51cfecae (diff) | |
| download | libusb-bdce367d1bd8691465844b2411c85215498f517d.tar.gz | |
sanitized error returns from synchronous I/O functions
Diffstat (limited to 'libusb/sync.c')
| -rw-r--r-- | libusb/sync.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libusb/sync.c b/libusb/sync.c index dd8e253..77d01db 100644 --- a/libusb/sync.c +++ b/libusb/sync.c @@ -59,8 +59,8 @@ static void ctrl_transfer_cb(struct libusb_transfer *transfer) * before giving up due to no response being received. For no timeout, use * value 0. * \returns 0 on success - * \returns -ETIMEDOUT if the transfer timed out - * \returns other negative code on error + * \returns LIBUSB_ERROR_TIMEOUT if the transfer timed out + * \returns another LIBUSB_ERROR code on other failures */ API_EXPORTED int libusb_control_transfer(libusb_device_handle *dev_handle, uint8_t bmRequestType, uint8_t bRequest, uint16_t wValue, uint16_t wIndex, @@ -72,12 +72,12 @@ API_EXPORTED int libusb_control_transfer(libusb_device_handle *dev_handle, int r; if (!transfer) - return -ENOMEM; + return LIBUSB_ERROR_NO_MEM; buffer = malloc(LIBUSB_CONTROL_SETUP_SIZE + wLength); if (!buffer) { libusb_free_transfer(transfer); - return -ENOMEM; + return LIBUSB_ERROR_NO_MEM; } libusb_fill_control_setup(buffer, bmRequestType, bRequest, wValue, wIndex, @@ -114,11 +114,11 @@ API_EXPORTED int libusb_control_transfer(libusb_device_handle *dev_handle, r = transfer->actual_length; break; case LIBUSB_TRANSFER_TIMED_OUT: - r = -ETIMEDOUT; + r = LIBUSB_ERROR_TIMEOUT; break; default: usbi_warn("unrecognised status code %d", transfer->status); - r = -1; + r = LIBUSB_ERROR_OTHER; } libusb_free_transfer(transfer); @@ -142,7 +142,7 @@ static int do_sync_bulk_transfer(struct libusb_device_handle *dev_handle, int r; if (!transfer) - return -ENOMEM; + return LIBUSB_ERROR_NO_MEM; libusb_fill_bulk_transfer(transfer, dev_handle, endpoint, buffer, length, bulk_transfer_cb, &completed, timeout); @@ -172,11 +172,11 @@ static int do_sync_bulk_transfer(struct libusb_device_handle *dev_handle, r = 0; break; case LIBUSB_TRANSFER_TIMED_OUT: - r = -ETIMEDOUT; + r = LIBUSB_ERROR_TIMEOUT; break; default: usbi_warn("unrecognised status code %d", transfer->status); - r = -1; + r = LIBUSB_ERROR_OTHER; } libusb_free_transfer(transfer); @@ -215,9 +215,9 @@ static int do_sync_bulk_transfer(struct libusb_device_handle *dev_handle, * value 0. * * \returns 0 on success (and populates <tt>transferred</tt>) - * \returns -ETIMEDOUT if the transfer timed out (and populates + * \returns LIBUSB_ERROR_TIMEOUT if the transfer timed out (and populates * <tt>transferred</tt>) - * \returns other negative code on error + * \returns another LIBUSB_ERROR code on other failures */ API_EXPORTED int libusb_bulk_transfer(struct libusb_device_handle *dev_handle, unsigned char endpoint, unsigned char *data, int length, int *transferred, @@ -261,8 +261,8 @@ API_EXPORTED int libusb_bulk_transfer(struct libusb_device_handle *dev_handle, * value 0. * * \returns 0 on success (and populates <tt>transferred</tt>) - * \returns -ETIMEDOUT if the transfer timed out - * \returns other negative code on error + * \returns LIBUSB_ERROR_TIMEOUT if the transfer timed out + * \returns another LIBUSB_ERROR code on other error */ API_EXPORTED int libusb_interrupt_transfer( struct libusb_device_handle *dev_handle, unsigned char endpoint, |