maint: more of same, but manual: convert VIR_ERROR("%s" to VIR_ERROR0(

diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index 3d8498fb1e508ce32a180afa766e59021f7b2e5f..aac2d08be0a9f3881aa1c236076b767682a0b250 100644 (file)
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -817,8 +817,7 @@ static int qemudInitPaths(struct qemud_server *server,
 
  snprintf_error:
     if (ret)
-        VIR_ERROR(_("%s"),
-                  _("Resulting path too long for buffer in qemudInitPaths()"));
+        VIR_ERROR0(_("Resulting path too long for buffer in qemudInitPaths()"));
 
  cleanup:
     VIR_FREE(dir_prefix);

diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index 4a1046151e5270dfdf41e018e8a0d83f2115fd2a..8a9c7a6267927d0d9150b9eca274a9985b63fbb2 100644 (file)
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -1520,9 +1520,8 @@ phypDomainSetCPU(virDomainPtr dom, unsigned int nvcpus)
         goto err;
 
     if (nvcpus > phypGetLparCPUMAX(dom)) {
-        VIR_ERROR(_("%s"),
-                  "You are trying to set a number of CPUs bigger than "
-                  "the max possible..");
+        VIR_ERROR0(_("You are trying to set a number of CPUs bigger than "
+                     "the max possible.."));
         goto err;
     }
 
@@ -1547,9 +1546,8 @@ phypDomainSetCPU(virDomainPtr dom, unsigned int nvcpus)
     ret = phypExec(session, cmd, &exit_status, dom->conn);
 
     if (exit_status < 0) {
-        VIR_ERROR(_("%s"),
-                  "Possibly you don't have IBM Tools installed in your LPAR."
-                  "Contact your support to enable this feature.");
+        VIR_ERROR0(_("Possibly you don't have IBM Tools installed in your LPAR."
+                     "Contact your support to enable this feature."));
         goto err;
     }
 
@@ -1690,7 +1688,7 @@ phypBuildLpar(virConnectPtr conn, virDomainDefPtr def)
     ret = phypExec(session, cmd, &exit_status, conn);
 
     if (exit_status < 0) {
-        VIR_ERROR(_("%s\"%s\""), "Unable to create LPAR. Reason: ", ret);
+        VIR_ERROR(_("Unable to create LPAR. Reason: '%s'"), ret);
         goto err;
     }