From: Markus Armbruster <armbru@redhat.com>
Date: Tue, 19 Aug 2014 08:31:10 +0000 (+0200)
Subject: qemu-io-cmds: g_renew() can't fail, bury dead error handling
X-Git-Tag: qemu-xen-4.6.0-rc1~251^2~26
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=08193dd52ba911077c9a29f62157bc4f3b9564eb;p=qemu-upstream-unstable.git

qemu-io-cmds: g_renew() can't fail, bury dead error handling

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c
index afd886759..b224ede5f 100644
--- a/qemu-io-cmds.c
+++ b/qemu-io-cmds.c
@@ -115,22 +115,13 @@ static char **breakline(char *input, int *count)
     int c = 0;
     char *p;
     char **rval = g_new0(char *, 1);
-    char **tmp;
 
     while (rval && (p = qemu_strsep(&input, " ")) != NULL) {
         if (!*p) {
             continue;
         }
         c++;
-        tmp = g_renew(char *, rval, (c + 1));
-        if (!tmp) {
-            g_free(rval);
-            rval = NULL;
-            c = 0;
-            break;
-        } else {
-            rval = tmp;
-        }
+        rval = g_renew(char *, rval, (c + 1));
         rval[c - 1] = p;
         rval[c] = NULL;
     }