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

cppcheck: remove more unused elements in libusb 0.1 compat

Browse Source
This commit is contained in:
Philippe Teuwen 2013-10-13 22:06:04 +02:00
parent 2065164033
commit 856d689748
3 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,10 +97,10 @@ static void _usb_finalize(void)
void usb_init(void) void usb_init(void)
{ {
int r;
usbi_dbg(""); usbi_dbg("");
if (!ctx) { if (!ctx) {
int r;
r = libusb_init(&ctx); r = libusb_init(&ctx);
if (r < 0) { if (r < 0) {
usbi_err("initialization failed!"); usbi_err("initialization failed!");
@ -115,15 +115,6 @@ void usb_init(void)
} }
} }
void usb_set_debug(int level)
{
usb_debug = level;
/* usb_set_debug can be called before usb_init */
if (ctx)
libusb_set_debug(ctx, 3);
}
char *usb_strerror(void) char *usb_strerror(void)
{ {
return strerror(errno); return strerror(errno);
@ -528,7 +519,6 @@ int usb_find_devices(void)
struct usb_bus *bus; struct usb_bus *bus;
libusb_device **dev_list; libusb_device **dev_list;
int dev_list_len; int dev_list_len;
int r;
int changes = 0; int changes = 0;
/* libusb-1.0 initialization might have failed, but we can't indicate /* libusb-1.0 initialization might have failed, but we can't indicate
@ -542,6 +532,7 @@ int usb_find_devices(void)
return compat_err(dev_list_len); return compat_err(dev_list_len);
for (bus = usb_busses; bus; bus = bus->next) { for (bus = usb_busses; bus; bus = bus->next) {
int r;
struct usb_device *new_devices = NULL; struct usb_device *new_devices = NULL;
struct usb_device *dev; struct usb_device *dev;
@ -643,11 +634,6 @@ int usb_close(usb_dev_handle *dev)
return 0; return 0;
} }
struct usb_device *usb_device(usb_dev_handle *dev)
{
return dev->device;
}
int usb_set_configuration(usb_dev_handle *dev, int configuration) int usb_set_configuration(usb_dev_handle *dev, int configuration)
{ {
usbi_dbg("configuration %d", configuration); usbi_dbg("configuration %d", configuration);

5
libnfc/buses/usbbus.c
View File

@ -139,11 +139,6 @@ int usbbus_reset(usbbus_dev_handle *dev)
return usb_reset((usb_dev_handle *)dev); return usb_reset((usb_dev_handle *)dev);
} }
struct usbbus_device *usbbus_device(usbbus_dev_handle *dev)
{
return (struct usbbus_device *) usb_device((usb_dev_handle *)dev);
}
struct usbbus_bus *usbbus_get_busses(void) struct usbbus_bus *usbbus_get_busses(void)
{ {
return (struct usbbus_bus *) usb_get_busses(); return (struct usbbus_bus *) usb_get_busses();

2
libnfc/buses/usbbus.h
View File

@ -134,7 +134,6 @@ struct usbbus_device_descriptor {
} __attribute__((packed)); } __attribute__((packed));
struct usbbus_device;
struct usbbus_bus; struct usbbus_bus;
struct usbbus_device { struct usbbus_device {
@ -177,7 +176,6 @@ int usbbus_claim_interface(usbbus_dev_handle *dev, int interface);
int usbbus_release_interface(usbbus_dev_handle *dev, int interface); int usbbus_release_interface(usbbus_dev_handle *dev, int interface);
int usbbus_set_altinterface(usbbus_dev_handle *dev, int alternate); int usbbus_set_altinterface(usbbus_dev_handle *dev, int alternate);
int usbbus_reset(usbbus_dev_handle *dev); int usbbus_reset(usbbus_dev_handle *dev);
struct usbbus_device *usbbus_device(usbbus_dev_handle *dev);
struct usbbus_bus *usbbus_get_busses(void); struct usbbus_bus *usbbus_get_busses(void);
#endif // __NFC_BUS_USB_H__ #endif // __NFC_BUS_USB_H__