From: Michal Privoznik <mprivozn@redhat.com>
Date: Wed, 18 Feb 2015 17:06:44 +0000 (+0100)
Subject: virCPUDefFormatBufFull: Use our general error handling pattern
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=33912cc03e25247842851d1e261bd08cee2d86ff;p=people%2Fliuw%2Flibxenctrl-split%2Flibvirt.git

virCPUDefFormatBufFull: Use our general error handling pattern

Well, so far there are no variables to free, no cleanup work needed on
an error, so bare 'return -1;' after each error is just okay. But this
will change in a while.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
index 4e3393469..2bce525d5 100644
--- a/src/conf/cpu_conf.c
+++ b/src/conf/cpu_conf.c
@@ -434,6 +434,8 @@ virCPUDefFormatBufFull(virBufferPtr buf,
                        virDomainNumaPtr numa,
                        bool updateCPU)
 {
+    int ret = -1;
+
     if (!def)
         return 0;
 
@@ -445,7 +447,7 @@ virCPUDefFormatBufFull(virBufferPtr buf,
             if (!(tmp = virCPUModeTypeToString(def->mode))) {
                 virReportError(VIR_ERR_INTERNAL_ERROR,
                                _("Unexpected CPU mode %d"), def->mode);
-                return -1;
+                goto cleanup;
             }
             virBufferAsprintf(buf, " mode='%s'", tmp);
         }
@@ -457,7 +459,7 @@ virCPUDefFormatBufFull(virBufferPtr buf,
                 virReportError(VIR_ERR_INTERNAL_ERROR,
                                _("Unexpected CPU match policy %d"),
                                def->match);
-                return -1;
+                goto cleanup;
             }
             virBufferAsprintf(buf, " match='%s'", tmp);
         }
@@ -469,15 +471,17 @@ virCPUDefFormatBufFull(virBufferPtr buf,
         virBufferAsprintf(buf, "<arch>%s</arch>\n",
                           virArchToString(def->arch));
     if (virCPUDefFormatBuf(buf, def, updateCPU) < 0)
-        return -1;
+        goto cleanup;
 
     if (virDomainNumaDefCPUFormat(buf, numa) < 0)
-        return -1;
+        goto cleanup;
 
     virBufferAdjustIndent(buf, -2);
     virBufferAddLit(buf, "</cpu>\n");
 
-    return 0;
+    ret = 0;
+ cleanup:
+    return ret;
 }
 
 int