From 9e16ee09cf79c2e0c47bfd2c1a9f8f65741b9d1c Mon Sep 17 00:00:00 2001 From: Daniel P. Berrangé Date: Feb 19 2019 14:51:29 +0000 Subject: Fix signed/unsigned mixup in format args Reviewed-by: Marc-André Lureau Signed-off-by: Daniel P. Berrangé --- diff --git a/src/ovirt-foreign-menu.c b/src/ovirt-foreign-menu.c index d234a27..5cfd70b 100644 --- a/src/ovirt-foreign-menu.c +++ b/src/ovirt-foreign-menu.c @@ -367,7 +367,7 @@ ovirt_foreign_menu_next_async_step(OvirtForeignMenu *menu, default: g_warn_if_reached(); g_task_return_new_error(task, OVIRT_ERROR, OVIRT_ERROR_FAILED, - "Invalid state: %d", current_state); + "Invalid state: %u", current_state); g_object_unref(task); } } diff --git a/src/remote-viewer.c b/src/remote-viewer.c index 989466b..509b82a 100644 --- a/src/remote-viewer.c +++ b/src/remote-viewer.c @@ -505,10 +505,10 @@ create_ovirt_session(VirtViewerApp *app, const char *uri, GError **err) "proxy-url", &proxy_url, NULL); if (port != 0) { - gport = g_strdup_printf("%d", port); + gport = g_strdup_printf("%u", port); } if (secure_port != 0) { - gtlsport = g_strdup_printf("%d", secure_port); + gtlsport = g_strdup_printf("%u", secure_port); } if (ghost == NULL) { @@ -524,7 +524,7 @@ create_ovirt_session(VirtViewerApp *app, const char *uri, GError **err) session_type = "vnc"; } else { g_set_error(&error, VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_FAILED, - _("oVirt VM %s has unknown display type: %d"), vm_name, type); + _("oVirt VM %s has unknown display type: %u"), vm_name, type); g_debug("%s", error->message); goto error; } diff --git a/src/virt-viewer-file-transfer-dialog.c b/src/virt-viewer-file-transfer-dialog.c index dcf99a3..6cc397d 100644 --- a/src/virt-viewer-file-transfer-dialog.c +++ b/src/virt-viewer-file-transfer-dialog.c @@ -153,8 +153,8 @@ static void update_global_progress(VirtViewerFileTransferDialog *self) if (self->priv->num_files == 1) { message = g_strdup(_("Transferring 1 file...")); } else { - message = g_strdup_printf(ngettext("Transferring %d file of %d...", - "Transferring %d files of %d...", n_files), + message = g_strdup_printf(ngettext("Transferring %u file of %u...", + "Transferring %u files of %u...", n_files), n_files, self->priv->num_files); } gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(self->priv->progressbar), fraction); diff --git a/src/virt-viewer-session-spice.c b/src/virt-viewer-session-spice.c index c28afc5..463f30b 100644 --- a/src/virt-viewer-session-spice.c +++ b/src/virt-viewer-session-spice.c @@ -799,7 +799,7 @@ virt_viewer_session_spice_main_channel_event(SpiceChannel *channel, virt_viewer_session_spice_channel_destroy(NULL, channel, session); break; default: - g_warning("unhandled spice main channel event: %d", event); + g_warning("unhandled spice main channel event: %u", event); break; } diff --git a/src/virt-viewer-session-vnc.c b/src/virt-viewer-session-vnc.c index c79b63c..e7c8cad 100644 --- a/src/virt-viewer-session-vnc.c +++ b/src/virt-viewer-session-vnc.c @@ -159,7 +159,7 @@ virt_viewer_session_vnc_auth_unsupported(VncDisplay *vnc G_GNUC_UNUSED, unsigned int authType, VirtViewerSession *session) { - gchar *msg = g_strdup_printf(_("Unsupported authentication type %d"), + gchar *msg = g_strdup_printf(_("Unsupported authentication type %u"), authType); g_signal_emit_by_name(session, "session-auth-unsupported", msg); g_free(msg); @@ -275,7 +275,7 @@ virt_viewer_session_vnc_auth_credential(GtkWidget *src G_GNUC_UNUSED, gboolean wantPassword = FALSE, wantUsername = FALSE; int i; - g_debug("Got VNC credential request for %d credential(s)", credList->n_values); + g_debug("Got VNC credential request for %u credential(s)", credList->n_values); for (i = 0 ; i < credList->n_values ; i++) { GValue *cred = g_value_array_get_nth(credList, i); diff --git a/src/virt-viewer.c b/src/virt-viewer.c index 33b61f7..162e78c 100644 --- a/src/virt-viewer.c +++ b/src/virt-viewer.c @@ -258,7 +258,7 @@ virt_viewer_start_reconnect_poll(VirtViewer *self) { VirtViewerPrivate *priv = self->priv; - g_debug("reconnect_poll: %d", priv->reconnect_poll); + g_debug("reconnect_poll: %u", priv->reconnect_poll); if (priv->reconnect_poll != 0) return; @@ -271,7 +271,7 @@ virt_viewer_stop_reconnect_poll(VirtViewer *self) { VirtViewerPrivate *priv = self->priv; - g_debug("reconnect_poll: %d", priv->reconnect_poll); + g_debug("reconnect_poll: %u", priv->reconnect_poll); if (priv->reconnect_poll == 0) return; @@ -975,7 +975,7 @@ virt_viewer_auth_libvirt_credentials(virConnectCredentialPtr cred, int i; int ret = 0; - g_debug("Got libvirt credential request for %d credential(s)", ncred); + g_debug("Got libvirt credential request for %u credential(s)", ncred); for (i = 0 ; i < ncred ; i++) { switch (cred[i].type) {