From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56363) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XJPWK-0000W0-UF for qemu-devel@nongnu.org; Mon, 18 Aug 2014 12:11:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XJPWC-0003MY-2D for qemu-devel@nongnu.org; Mon, 18 Aug 2014 12:10:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:12204) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XJPWB-0003MA-Q8 for qemu-devel@nongnu.org; Mon, 18 Aug 2014 12:10:47 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s7IGAktf015120 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 18 Aug 2014 12:10:47 -0400 From: Markus Armbruster Date: Mon, 18 Aug 2014 18:10:42 +0200 Message-Id: <1408378243-19713-4-git-send-email-armbru@redhat.com> In-Reply-To: <1408378243-19713-1-git-send-email-armbru@redhat.com> References: <1408378243-19713-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v2 3/4] qemu-io-cmds: g_renew() can't fail, bury dead error handling List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, stefanha@redhat.com, mreitz@redhat.com Signed-off-by: Markus Armbruster --- qemu-io-cmds.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c index afd8867..b224ede 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; } -- 1.9.3