[Spice-devel] [PATCH spice-gtk] mingw: Fix -Werror format & missing-prototypes

[Pavel Grunt]

---
 src/spice-widget.c           | 2 +-
 src/usb-device-manager.c     | 6 +++---
 src/win-usb-clerk.h          | 4 ++--
 src/win-usb-driver-install.c | 3 ++-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/spice-widget.c b/src/spice-widget.c
index 0c70ce4..51a2055 100644
--- a/src/spice-widget.c
+++ b/src/spice-widget.c
@@ -923,7 +923,7 @@ error:
     {
         DWORD errval  = GetLastError();
         gchar *errstr = g_win32_error_message(errval);
-        g_warning("failed to clip cursor (%ld) %s", errval, errstr);
+        g_warning("failed to clip cursor (%lu) %s", errval, errstr);
     }
 
     return false;
diff --git a/src/usb-device-manager.c b/src/usb-device-manager.c
index 325533d..1fc8fc1 100644
--- a/src/usb-device-manager.c
+++ b/src/usb-device-manager.c
@@ -54,7 +54,7 @@
 #include <glib/gi18n.h>
 
 #ifndef G_OS_WIN32 /* Linux -- device id is bus.addr */
-#define DEV_ID_FMT "at %d.%d"
+#define DEV_ID_FMT "at %u.%u"
 #else /* Windows -- device id is vid:pid */
 #define DEV_ID_FMT "0x%04x:0x%04x"
 #endif
@@ -999,7 +999,7 @@ static void spice_usb_device_manager_add_dev(SpiceUsbDeviceManager  *self,
 }
 
 static void spice_usb_device_manager_remove_dev(SpiceUsbDeviceManager *self,
-                                                int bus, int address)
+                                                guint bus, guint address)
 {
     SpiceUsbDeviceManagerPrivate *priv = self->priv;
     SpiceUsbDevice *device;
@@ -1081,7 +1081,7 @@ static void spice_usb_device_manager_add_udev(SpiceUsbDeviceManager  *self,
         spice_usb_device_manager_add_dev(self, libdev);
     else
         g_warning("Could not find USB device to add " DEV_ID_FMT,
-                  bus, address);
+                  (guint) bus, (guint) address);
 
     if (!priv->coldplug_list)
         libusb_free_device_list(dev_list, 1);
diff --git a/src/win-usb-clerk.h b/src/win-usb-clerk.h
index 24da3b4..a17980d 100644
--- a/src/win-usb-clerk.h
+++ b/src/win-usb-clerk.h
@@ -4,8 +4,8 @@
 #include <windows.h>
 
 #define USB_CLERK_PIPE_NAME     TEXT("\\\\.\\pipe\\usbclerkpipe")
-#define USB_CLERK_MAGIC         0xDADA
-#define USB_CLERK_VERSION       0x0003
+#define USB_CLERK_MAGIC         0xDADAu
+#define USB_CLERK_VERSION       0x0003u
 
 typedef struct USBClerkHeader {
     UINT16 magic;
diff --git a/src/win-usb-driver-install.c b/src/win-usb-driver-install.c
index 99660ce..a72fcb8 100644
--- a/src/win-usb-driver-install.c
+++ b/src/win-usb-driver-install.c
@@ -78,7 +78,7 @@ static gboolean spice_win_usb_driver_initable_init(GInitable     *initable,
         DWORD errval  = GetLastError();
         gchar *errstr = g_win32_error_message(errval);
         g_set_error(err, SPICE_CLIENT_ERROR, SPICE_CLIENT_ERROR_USB_SERVICE,
-                    "Failed to create service named pipe (%ld) %s", errval, errstr);
+                    "Failed to create service named pipe (%lu) %s", errval, errstr);
         g_free(errstr);
         return FALSE;
     }
@@ -117,6 +117,7 @@ static void spice_win_usb_driver_initable_iface_init(GInitableIface *iface)
 /* ------------------------------------------------------------------ */
 /* callbacks                                                          */
 
+static
 void win_usb_driver_handle_reply_cb(GObject *gobject,
                                     GAsyncResult *read_res,
                                     gpointer user_data)
-- 
2.8.3