[libvirt] [PATCH 15/22] vmware: Fix misaligned arguments and misaligned conditions

Shi Lei shi_lei at massclouds.com
Fri Oct 5 08:11:38 UTC 2018


This patch fixes misaligned arguments and misaligned conditions.

Signed-off-by: Shi Lei <shi_lei at massclouds.com>
---
 src/vmware/vmware_conf.c   |  2 +-
 src/vmware/vmware_driver.c | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c
index 89ed639..3f4db2e 100644
--- a/src/vmware/vmware_conf.c
+++ b/src/vmware/vmware_conf.c
@@ -152,7 +152,7 @@ vmwareLoadDomains(struct vmware_driver *driver)
         goto cleanup;
 
     for (str = outbuf; (vmxPath = strtok_r(str, "\n", &saveptr)) != NULL;
-        str = NULL) {
+         str = NULL) {
 
         if (vmxPath[0] != '/')
             continue;
diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c
index f94b325..beaa847 100644
--- a/src/vmware/vmware_driver.c
+++ b/src/vmware/vmware_driver.c
@@ -206,8 +206,9 @@ vmwareConnectOpen(virConnectPtr conn,
         goto cleanup;
 
     if ((tmp = STRSKIP(conn->uri->scheme, "vmware")) == NULL) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, _("unable to parse URI "
-                       "scheme '%s'"), conn->uri->scheme);
+        virReportError(VIR_ERR_INTERNAL_ERROR,
+                       _("unable to parse URI scheme '%s'"),
+                       conn->uri->scheme);
         goto cleanup;
     }
 
@@ -215,8 +216,9 @@ vmwareConnectOpen(virConnectPtr conn,
     driver->type = vmwareDriverTypeFromString(tmp);
 
     if (driver->type == -1) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, _("unable to find valid "
-                       "requested VMware backend '%s'"), tmp);
+        virReportError(VIR_ERR_INTERNAL_ERROR,
+                       _("unable to find valid requested VMware backend '%s'"),
+                       tmp);
         goto cleanup;
     }
 
-- 
2.17.1





More information about the libvir-list mailing list