Fix most -Wpedantic warnings

On Linux and gcc 12.2 at least.

Signed-off-by: Tormod Volden <debian.tormod@gmail.com>

6 files changed, 16 insertions, 13 deletions

diff --git a/libusb/core.c b/libusb/core.c
index 3249152..e374621 100644
--- a/libusb/core.c
+++ b/libusb/core.c
@@ -1531,7 +1531,7 @@ static void do_close(struct libusb_context *ctx,
 		 * the device handle is invalid
 		 */
 		usbi_dbg(ctx, "Removed transfer %p from the in-flight list because device handle %p closed",
-			 transfer, dev_handle);
+			 (void *) transfer, (void *) dev_handle);
 	}
 	usbi_mutex_unlock(&ctx->flying_transfers_lock);
 
diff --git a/libusb/hotplug.c b/libusb/hotplug.c
index 6b743c7..0b34e9f 100644
--- a/libusb/hotplug.c
+++ b/libusb/hotplug.c
@@ -311,7 +311,7 @@ void usbi_hotplug_process(struct libusb_context *ctx, struct list_head *hotplug_
 	for_each_hotplug_cb_safe(ctx, hotplug_cb, next_cb) {
 		if (hotplug_cb->flags & USBI_HOTPLUG_NEEDS_FREE) {
 			usbi_dbg(ctx, "freeing hotplug cb %p with handle %d",
-				hotplug_cb, hotplug_cb->handle);
+				 (void *) hotplug_cb, hotplug_cb->handle);
 			list_del(&hotplug_cb->list);
 			free(hotplug_cb);
 		}
@@ -377,7 +377,8 @@ int API_EXPORTED libusb_hotplug_register_callback(libusb_context *ctx,
 
 	usbi_mutex_unlock(&ctx->hotplug_cbs_lock);
 
-	usbi_dbg(ctx, "new hotplug cb %p with handle %d", hotplug_cb, hotplug_cb->handle);
+	usbi_dbg(ctx, "new hotplug cb %p with handle %d",
+		 (void *) hotplug_cb, hotplug_cb->handle);
 
 	if ((flags & LIBUSB_HOTPLUG_ENUMERATE) && (events & LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED)) {
 		ssize_t i, len;
diff --git a/libusb/io.c b/libusb/io.c
index e4753fc..7c20a7e 100644
--- a/libusb/io.c
+++ b/libusb/io.c
@@ -1342,7 +1342,7 @@ void API_EXPORTED libusb_free_transfer(struct libusb_transfer *transfer)
 	if (!transfer)
 		return;
 
-	usbi_dbg(TRANSFER_CTX(transfer), "transfer %p", transfer);
+	usbi_dbg(TRANSFER_CTX(transfer), "transfer %p", (void *) transfer);
 	if (transfer->flags & LIBUSB_TRANSFER_FREE_BUFFER)
 		free(transfer->buffer);
 
@@ -1504,7 +1504,7 @@ int API_EXPORTED libusb_submit_transfer(struct libusb_transfer *transfer)
 	itransfer->dev = libusb_ref_device(transfer->dev_handle->dev);
 
 	ctx = HANDLE_CTX(transfer->dev_handle);
-	usbi_dbg(ctx, "transfer %p", transfer);
+	usbi_dbg(ctx, "transfer %p", (void *) transfer);
 
 	/*
 	 * Important note on locking, this function takes / releases locks
@@ -1615,7 +1615,7 @@ int API_EXPORTED libusb_cancel_transfer(struct libusb_transfer *transfer)
 	struct libusb_context *ctx = ITRANSFER_CTX(itransfer);
 	int r;
 
-	usbi_dbg(ctx, "transfer %p", transfer );
+	usbi_dbg(ctx, "transfer %p", (void *) transfer );
 	usbi_mutex_lock(&itransfer->lock);
 	if (!(itransfer->state_flags & USBI_TRANSFER_IN_FLIGHT)
 			|| (itransfer->state_flags & USBI_TRANSFER_CANCELLING)) {
@@ -1717,7 +1717,8 @@ int usbi_handle_transfer_completion(struct usbi_transfer *itransfer,
 	flags = transfer->flags;
 	transfer->status = status;
 	transfer->actual_length = itransfer->transferred;
-	usbi_dbg(ctx, "transfer %p has callback %p", transfer, transfer->callback);
+	usbi_dbg(ctx, "transfer %p has callback %p",
+		 (void *) transfer, transfer->callback);
 	if (transfer->callback)
 		transfer->callback(transfer);
 	/* transfer might have been freed by the above call, do not use from
@@ -2849,7 +2850,7 @@ void usbi_handle_disconnect(struct libusb_device_handle *dev_handle)
 			break;
 
 		usbi_dbg(ctx, "cancelling transfer %p from disconnect",
-			 USBI_TRANSFER_TO_LIBUSB_TRANSFER(to_cancel));
+			 (void *) USBI_TRANSFER_TO_LIBUSB_TRANSFER(to_cancel));
 
 		usbi_mutex_lock(&to_cancel->lock);
 		usbi_backend.clear_transfer_priv(to_cancel);
diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c
index b39b702..1115a04 100644
--- a/libusb/os/linux_usbfs.c
+++ b/libusb/os/linux_usbfs.c
@@ -1083,8 +1083,9 @@ retry:
 		goto retry;
 	}
 
-	usbi_dbg(ctx, "dev %p (%s) has parent %p (%s) port %u", dev, sysfs_dir,
-		 dev->parent_dev, parent_sysfs_dir, dev->port_number);
+	usbi_dbg(ctx, "dev %p (%s) has parent %p (%s) port %u",
+		 (void *) dev, sysfs_dir, (void *) dev->parent_dev,
+		 parent_sysfs_dir, dev->port_number);
 
 	free(parent_sysfs_dir);
 
diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index baae326..dd05afa 100644
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11776
+#define LIBUSB_NANO 11777
diff --git a/tests/stress.c b/tests/stress.c
index 09e670a..1b0c192 100644
--- a/tests/stress.c
+++ b/tests/stress.c
@@ -63,7 +63,7 @@ static libusb_testlib_result test_get_device_list(void)
 		if (list_size < 0 || !device_list) {
 			libusb_testlib_logf(
 				"Failed to get device list on iteration %d: %ld (%p)",
-				i, (long)-list_size, device_list);
+				i, (long) -list_size, (void *) device_list);
 			libusb_exit(ctx);
 			return TEST_STATUS_FAILURE;
 		}
@@ -97,7 +97,7 @@ static libusb_testlib_result test_many_device_lists(void)
 		if (list_size < 0 || !device_lists[i]) {
 			libusb_testlib_logf(
 				"Failed to get device list on iteration %d: %ld (%p)",
-				i, (long)-list_size, device_lists[i]);
+				i, (long) -list_size, (void *) device_lists[i]);
 			result = TEST_STATUS_FAILURE;
 			break;
 		}