avoid format-related warnings

* qemud/qemud.c (main): Fix a bogus format string reported as umarked.
* src/virsh.c (cmdVcpupin): Non-literal with no args.

diff --git a/ChangeLog b/ChangeLog
index f4e50c7e3320e4596c4e07d41975c40631dcf2b9..7909150cc1dcb8c3ef304984b5ab8fd6548d7045 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Apr 28 11:08:58 CEST 2008 Jim Meyering <meyering@redhat.com>
+
+       avoid format-related warnings
+       * qemud/qemud.c (main): Fix a bogus format string reported as unmarked.
+       * src/virsh.c (cmdVcpupin): Non-literal with no args.
+
 Mon Apr 28 10:26:17 CEST 2008 Daniel Veillard <veillard@redhat.com>
 
        * docs/Makefile.am docs/et.png docs/libvirt.css docs/page.xsl

diff --git a/qemud/qemud.c b/qemud/qemud.c
index a7b27ee5448f25c953067c45f91bcdcb1e2760fc..a9d825d69026e8d55a09c17071f5ad1a574d05f1 100644 (file)
--- a/qemud/qemud.c
+++ b/qemud/qemud.c
@@ -2164,8 +2164,8 @@ int main(int argc, char **argv) {
         const char *sockdirname = LOCAL_STATE_DIR "/run/libvirt";
 
         if (chown(sockdirname, -1, unix_sock_gid) < 0)
-            qemudLog(QEMUD_ERR, "%s %s",
-                    _("Failed to change group ownership of "), sockdirname);
+            qemudLog(QEMUD_ERR, _("Failed to change group ownership of %s"),
+                     sockdirname);
     }
 
     if (godaemon) {

diff --git a/src/virsh.c b/src/virsh.c
index ef6165bc3c0e7f1d947a2a277fdf301f808cd168..5e098a7742ea439595c9952c7aef9aafc11991ac 100644 (file)
--- a/src/virsh.c
+++ b/src/virsh.c
@@ -1745,7 +1745,7 @@ cmdVcpupin(vshControl * ctl, vshCmd * cmd)
     }
 
     if (vcpu >= info.nrVirtCpu) {
-        vshError(ctl, FALSE, _("vcpupin: Invalid vCPU number."));
+        vshError(ctl, FALSE, "%s", _("vcpupin: Invalid vCPU number."));
         virDomainFree(dom);
         return FALSE;
     }