jarjar/libnfc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libusb compat: silent warnings

Browse Source
This commit is contained in:
Philippe Teuwen 2013-10-13 21:44:59 +02:00
parent a9ec5e79fa
commit 2065164033
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libnfc/buses/libusb-compat-core.c
View File

@ -34,20 +34,20 @@ static libusb_context *ctx = NULL;
static int usb_debug = 0; static int usb_debug = 0;
#ifdef ENABLE_LOGGING #ifdef ENABLE_LOGGING
#define _usbi_log(level, fmt...) usbi_log(level, __FUNCTION__, fmt) #define _usbi_log(level, ...) usbi_log(level, __FUNCTION__, __VA_ARGS__)
#else #else
#define _usbi_log(level, fmt...) #define _usbi_log(level, ...)
#endif #endif
#ifdef ENABLE_DEBUG_LOGGING #ifdef ENABLE_DEBUG_LOGGING
#define usbi_dbg(fmt...) _usbi_log(LOG_LEVEL_DEBUG, fmt) #define usbi_dbg(...) _usbi_log(LOG_LEVEL_DEBUG, __VA_ARGS__)
#else #else
#define usbi_dbg(fmt...) #define usbi_dbg(...)
#endif #endif
#define usbi_info(fmt...) _usbi_log(LOG_LEVEL_INFO, fmt) #define usbi_info(...) _usbi_log(LOG_LEVEL_INFO, __VA_ARGS__)
#define usbi_warn(fmt...) _usbi_log(LOG_LEVEL_WARNING, fmt) #define usbi_warn(...) _usbi_log(LOG_LEVEL_WARNING, __VA_ARGS__)
#define usbi_err(fmt...) _usbi_log(LOG_LEVEL_ERROR, fmt) #define usbi_err(...) _usbi_log(LOG_LEVEL_ERROR, __VA_ARGS__)
struct usb_bus *usb_busses = NULL; struct usb_bus *usb_busses = NULL;
@ -696,7 +696,7 @@ int usb_reset(usb_dev_handle *dev)
return compat_err(libusb_reset_device(dev->handle)); return compat_err(libusb_reset_device(dev->handle));
} }
static int usb_bulk_io(usb_dev_handle *dev, int ep, char *bytes, static int usb_bulk_io(usb_dev_handle *dev, int ep, unsigned char *bytes,
int size, int timeout) int size, int timeout)
{ {
int actual_length; int actual_length;
@ -724,7 +724,7 @@ int usb_bulk_read(usb_dev_handle *dev, int ep, char *bytes,
ep |= USB_ENDPOINT_IN; ep |= USB_ENDPOINT_IN;
} }
return usb_bulk_io(dev, ep, bytes, size, timeout); return usb_bulk_io(dev, ep, (unsigned char *) bytes, size, timeout);
} }
int usb_bulk_write(usb_dev_handle *dev, int ep, const char *bytes, int usb_bulk_write(usb_dev_handle *dev, int ep, const char *bytes,
@ -738,7 +738,7 @@ int usb_bulk_write(usb_dev_handle *dev, int ep, const char *bytes,
ep &= ~USB_ENDPOINT_IN; ep &= ~USB_ENDPOINT_IN;
} }
return usb_bulk_io(dev, ep, (char *)bytes, size, timeout); return usb_bulk_io(dev, ep, (unsigned char *)bytes, size, timeout);
} }
int usb_get_string_simple(usb_dev_handle *dev, int desc_index, int usb_get_string_simple(usb_dev_handle *dev, int desc_index,
@ -746,7 +746,7 @@ int usb_get_string_simple(usb_dev_handle *dev, int desc_index,
{ {
int r; int r;
r = libusb_get_string_descriptor_ascii(dev->handle, desc_index & 0xff, r = libusb_get_string_descriptor_ascii(dev->handle, desc_index & 0xff,
buf, (int) buflen); (unsigned char *) buf, (int) buflen);
if (r >= 0) if (r >= 0)
return r; return r;
return compat_err(r); return compat_err(r);