Fix up NLS warnings.

When building with --disable-nls, I got a few messages like this:

storage/storage_backend.c: In function 'virStorageBackendCreateQemuImg':
storage/storage_backend.c:571: warning: format not a string literal and no format arguments

Fix these up.

Signed-off-by: Chris Lalancette <clalance@redhat.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index ba6b28da52dd027be1d8642fb61de1dfdf655126..a9c8573014c798f31461ed15ea32c177e1206941 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -1813,7 +1813,7 @@ virDomainWatchdogDefParseXML(virConnectPtr conn,
 
     model = virXMLPropString (node, "model");
     if (model == NULL) {
-        virDomainReportError (conn, VIR_ERR_INTERNAL_ERROR,
+        virDomainReportError (conn, VIR_ERR_INTERNAL_ERROR, "%s",
                               _("watchdog must contain model name"));
         goto error;
     }

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 9a5c43a1c70977aab023c7952268e5d17a115708..1e984c5aa82d6c24dec4235500bbbd94f0d445e7 100644 (file)
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -1858,7 +1858,7 @@ static int lxcSetSchedulerParameters(virDomainPtr domain,
     for (i = 0; i < nparams; i++) {
         virSchedParameterPtr param = &params[i];
         if (param->type != VIR_DOMAIN_SCHED_FIELD_ULLONG) {
-            lxcError(NULL, domain, VIR_ERR_INVALID_ARG,
+            lxcError(NULL, domain, VIR_ERR_INVALID_ARG, "%s",
                      _("invalid type for cpu_shares tunable, expected a 'ullong'"));
             goto cleanup;
         }

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index d4d847ad7a8c9b69fdbe5dfbfc300e7396f0a35c..615c1f7a3c2dbe2a096e1f1cc33c9d2e8b1bd618 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -5299,7 +5299,7 @@ static int qemuSetSchedulerParameters(virDomainPtr dom,
         if (STREQ(param->field, "cpu_shares")) {
             int rc;
             if (param->type != VIR_DOMAIN_SCHED_FIELD_ULLONG) {
-                qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_ARG,
+                qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_ARG, "%s",
                                  _("invalid type for cpu_shares tunable, expected a 'ullong'"));
                 goto cleanup;
             }
@@ -6463,7 +6463,7 @@ static int doTunnelSendAll(virDomainPtr dom,
             break;
 
         if (virStreamSend(st, buffer, nbytes) < 0) {
-            qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED,
+            qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, "%s",
                              _("Failed to write migration data to remote libvirtd"));
             return -1;
         }
@@ -6685,7 +6685,7 @@ static int doNonTunnelMigrate(virDomainPtr dom,
         goto cleanup;
 
     if (uri_out == NULL) {
-        qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
+        qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s",
                          _("domainMigratePrepare2 did not set uri"));
     }
 

diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
index 18a69be764585f7fc79774bc58d7853a8eaef345..bb926cdefb3a0015e50174b67f38ab771e0ad78b 100644 (file)
--- a/src/storage/storage_backend.c
+++ b/src/storage/storage_backend.c
@@ -568,7 +568,7 @@ virStorageBackendCreateQemuImg(virConnectPtr conn,
             return -1;
         }
         if (enc->nsecrets > 1) {
-            virStorageReportError(conn, VIR_ERR_INVALID_STORAGE_VOL,
+            virStorageReportError(conn, VIR_ERR_INVALID_STORAGE_VOL, "%s",
                                   _("too many secrets for qcow encryption"));
             return -1;
         }