[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 05/10] maint: more of same, but manual: convert VIR_ERROR("%s" to VIR_ERROR0(



From: Jim Meyering <meyering redhat com>

---
 daemon/libvirtd.c      |    3 +--
 src/phyp/phyp_driver.c |   12 +++++-------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index 04af58f..afa10fb 100644
--- 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 4a10461..8a9c7a6 100644
--- 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;
     }

-- 
1.7.1.259.g3aef8


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]