Misc: Clean up zero-length strings and recursion in clock_gettime()

Commit 0bf84e4d51 ("core: fix build warning on newer versions of gcc")
addressed compiler warnings for zero-length printf format strings in the
core library files, but there are some additional remaining in some of
the backends. Address these remaining ones in the same manner.

Also remove the usbi_dbg() call in netbsd_clock_gettime(). This causes
infinite recursion since usbi_dbg() calls the backend's clock_gettime()
function. This was similarly addressed for the OpenBSD backend in commit
6acbd8b405 ("Remove infinite recursion in OpenBSD backend").

Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>

diff --git a/libusb/os/netbsd_usb.c b/libusb/os/netbsd_usb.c
index 16e07f2..157b2f8 100644 (file)
--- a/libusb/os/netbsd_usb.c
+++ b/libusb/os/netbsd_usb.c
@@ -130,7 +130,7 @@ netbsd_get_device_list(struct libusb_context * ctx,
        char devnode[16];
        int fd, err, i;
 
-       usbi_dbg("");
+       usbi_dbg(" ");
 
        /* Only ugen(4) is supported */
        for (i = 0; i < USB_MAX_DEVICES; i++) {
@@ -231,7 +231,7 @@ netbsd_get_device_descriptor(struct libusb_device *dev, unsigned char *buf,
 {
        struct device_priv *dpriv = (struct device_priv *)dev->os_priv;
 
-       usbi_dbg("");
+       usbi_dbg(" ");
 
        memcpy(buf, &dpriv->ddesc, DEVICE_DESC_LENGTH);
 
@@ -302,7 +302,7 @@ netbsd_get_configuration(struct libusb_device_handle *handle, int *config)
 {
        struct device_priv *dpriv = (struct device_priv *)handle->dev->os_priv;
 
-       usbi_dbg("");
+       usbi_dbg(" ");
 
        if (ioctl(dpriv->fd, USB_GET_CONFIG, config) < 0)
                return _errno_to_libusb(errno);
@@ -376,7 +376,7 @@ netbsd_clear_halt(struct libusb_device_handle *handle, unsigned char endpoint)
        struct device_priv *dpriv = (struct device_priv *)handle->dev->os_priv;
        struct usb_ctl_request req;
 
-       usbi_dbg("");
+       usbi_dbg(" ");
 
        req.ucr_request.bmRequestType = UT_WRITE_ENDPOINT;
        req.ucr_request.bRequest = UR_CLEAR_FEATURE;
@@ -393,7 +393,7 @@ netbsd_clear_halt(struct libusb_device_handle *handle, unsigned char endpoint)
 int
 netbsd_reset_device(struct libusb_device_handle *handle)
 {
-       usbi_dbg("");
+       usbi_dbg(" ");
 
        return (LIBUSB_ERROR_NOT_SUPPORTED);
 }
@@ -403,7 +403,7 @@ netbsd_destroy_device(struct libusb_device *dev)
 {
        struct device_priv *dpriv = (struct device_priv *)dev->os_priv;
 
-       usbi_dbg("");
+       usbi_dbg(" ");
 
        free(dpriv->cdesc);
 }
@@ -415,7 +415,7 @@ netbsd_submit_transfer(struct usbi_transfer *itransfer)
        struct handle_priv *hpriv;
        int err = 0;
 
-       usbi_dbg("");
+       usbi_dbg(" ");
 
        transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
        hpriv = (struct handle_priv *)transfer->dev_handle->os_priv;
@@ -457,7 +457,7 @@ netbsd_submit_transfer(struct usbi_transfer *itransfer)
 int
 netbsd_cancel_transfer(struct usbi_transfer *itransfer)
 {
-       usbi_dbg("");
+       usbi_dbg(" ");
 
        return (LIBUSB_ERROR_NOT_SUPPORTED);
 }
@@ -471,8 +471,6 @@ netbsd_handle_transfer_completion(struct usbi_transfer *itransfer)
 int
 netbsd_clock_gettime(int clkid, struct timespec *tp)
 {
-       usbi_dbg("clock %d", clkid);
-
        if (clkid == USBI_CLOCK_REALTIME)
                return clock_gettime(CLOCK_REALTIME, tp);
 

diff --git a/libusb/os/openbsd_usb.c b/libusb/os/openbsd_usb.c
index ed4d3f2..508d283 100644 (file)
--- a/libusb/os/openbsd_usb.c
+++ b/libusb/os/openbsd_usb.c
@@ -138,7 +138,7 @@ obsd_get_device_list(struct libusb_context * ctx,
        char *udevname;
        int fd, addr, i, j;
 
-       usbi_dbg("");
+       usbi_dbg(" ");
 
        for (i = 0; i < 8; i++) {
                snprintf(busnode, sizeof(busnode), USBDEV "%d", i);
@@ -266,7 +266,7 @@ obsd_get_device_descriptor(struct libusb_device *dev, unsigned char *buf,
 {
        struct device_priv *dpriv = (struct device_priv *)dev->os_priv;
 
-       usbi_dbg("");
+       usbi_dbg(" ");
 
        memcpy(buf, &dpriv->ddesc, DEVICE_DESC_LENGTH);
 
@@ -409,7 +409,7 @@ obsd_clear_halt(struct libusb_device_handle *handle, unsigned char endpoint)
        if ((fd = _bus_open(handle->dev->bus_number)) < 0)
                return _errno_to_libusb(errno);
 
-       usbi_dbg("");
+       usbi_dbg(" ");
 
        req.ucr_addr = handle->dev->device_address;
        req.ucr_request.bmRequestType = UT_WRITE_ENDPOINT;
@@ -431,7 +431,7 @@ obsd_clear_halt(struct libusb_device_handle *handle, unsigned char endpoint)
 int
 obsd_reset_device(struct libusb_device_handle *handle)
 {
-       usbi_dbg("");
+       usbi_dbg(" ");
 
        return (LIBUSB_ERROR_NOT_SUPPORTED);
 }
@@ -441,7 +441,7 @@ obsd_destroy_device(struct libusb_device *dev)
 {
        struct device_priv *dpriv = (struct device_priv *)dev->os_priv;
 
-       usbi_dbg("");
+       usbi_dbg(" ");
 
        free(dpriv->cdesc);
        free(dpriv->devname);
@@ -454,7 +454,7 @@ obsd_submit_transfer(struct usbi_transfer *itransfer)
        struct handle_priv *hpriv;
        int err = 0;
 
-       usbi_dbg("");
+       usbi_dbg(" ");
 
        transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
        hpriv = (struct handle_priv *)transfer->dev_handle->os_priv;
@@ -496,7 +496,7 @@ obsd_submit_transfer(struct usbi_transfer *itransfer)
 int
 obsd_cancel_transfer(struct usbi_transfer *itransfer)
 {
-       usbi_dbg("");
+       usbi_dbg(" ");
 
        return (LIBUSB_ERROR_NOT_SUPPORTED);
 }

diff --git a/libusb/os/sunos_usb.c b/libusb/os/sunos_usb.c
index 20aefe8..9d42b8a 100644 (file)
--- a/libusb/os/sunos_usb.c
+++ b/libusb/os/sunos_usb.c
@@ -1003,7 +1003,7 @@ sunos_close(struct libusb_device_handle *handle)
        sunos_dev_handle_priv_t *hpriv;
        sunos_dev_priv_t *dpriv;
 
-       usbi_dbg("");
+       usbi_dbg(" ");
        if (!handle) {
                return;
        }
@@ -1235,7 +1235,7 @@ sunos_do_async_io(struct libusb_transfer *transfer)
        uint8_t ep;
        struct sunos_transfer_priv *tpriv;
 
-       usbi_dbg("");
+       usbi_dbg(" ");
 
        tpriv = usbi_transfer_get_os_priv(LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer));
        hpriv = (sunos_dev_handle_priv_t *)transfer->dev_handle->os_priv;
@@ -1400,7 +1400,7 @@ sunos_clear_halt(struct libusb_device_handle *handle, uint8_t endpoint)
 int
 sunos_reset_device(struct libusb_device_handle *handle)
 {
-       usbi_dbg("");
+       usbi_dbg(" ");
 
        return (LIBUSB_ERROR_NOT_SUPPORTED);
 }

diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 519fe4a..5ad7260 100644 (file)
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11442
+#define LIBUSB_NANO 11443