avoid "not a string literal..." warnings

* src/qemu_conf.c (qemudParseInterfaceXML): Add "%s".
(qemudBuildCommandLine, qemudGenerateXML): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 31686451fc6f01449eec69b0d3cb089f5f67efa2..4ea1fb4c9f9913c7e98a99764082c72be0cc30a3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue May 13 10:55:43 CEST 2008 Jim Meyering <meyering@redhat.com>
+
+       avoid "not a string literal..." warnings
+       * src/qemu_conf.c (qemudParseInterfaceXML): Add "%s".
+       (qemudBuildCommandLine, qemudGenerateXML): Likewise.
+
 Mon May 12 23:32:21 PST 2008 David L. Leskovec <dlesko@linux.vnet.ibm.com>
 
        * qemud/qemud.c: get siginfo with signals, distribute to drivers that

diff --git a/src/qemu_conf.c b/src/qemu_conf.c
index 2a29382e43794e735672aa01dc9e95c8d0f1f78a..9772721591ecd0a1a3c21395ecc088d435dce06a 100644 (file)
--- a/src/qemu_conf.c
+++ b/src/qemu_conf.c
@@ -1006,7 +1006,7 @@ static int qemudParseInterfaceXML(virConnectPtr conn,
                 (model[i] >= 'a' && model[i] <= 'z') ||
                 (model[i] >= 'A' && model[i] <= 'Z') || model[i] == '_';
             if (!char_ok) {
-                qemudReportError (conn, NULL, NULL, VIR_ERR_INVALID_ARG,
+                qemudReportError (conn, NULL, NULL, VIR_ERR_INVALID_ARG, "%s",
                                   _("Model name contains invalid characters"));
                 goto error;
             }
@@ -2751,9 +2751,9 @@ int qemudBuildCommandLine(virConnectPtr conn,
         while(sound && size > 0) {
             const char *model = qemudSoundModelToString(sound->model);
             if (!model) {
-               qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
-                                _("invalid sound model"));
-               goto error;
+                qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
+                                 "%s", _("invalid sound model"));
+                goto error;
             }
             strncat(modstr, model, size);
             size -= strlen(model);
@@ -3988,7 +3988,7 @@ char *qemudGenerateXML(virConnectPtr conn,
         const char *model = qemudSoundModelToString(sound->model);
         if (!model) {
             qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
-                             _("invalid sound model"));
+                             "%s", _("invalid sound model"));
             goto cleanup;
         }
         virBufferVSprintf(&buf, "    <sound model='%s'/>\n", model);