From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47594) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XKqCH-0000qr-Mn for qemu-devel@nongnu.org; Fri, 22 Aug 2014 10:52:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XKqCB-0005bL-IF for qemu-devel@nongnu.org; Fri, 22 Aug 2014 10:52:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:27049) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XKqCB-0005bG-B1 for qemu-devel@nongnu.org; Fri, 22 Aug 2014 10:52:03 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s7MEq26Z016821 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 22 Aug 2014 10:52:02 -0400 From: Kevin Wolf Date: Fri, 22 Aug 2014 16:51:27 +0200 Message-Id: <1408719113-5316-4-git-send-email-kwolf@redhat.com> In-Reply-To: <1408719113-5316-1-git-send-email-kwolf@redhat.com> References: <1408719113-5316-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 03/29] 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 From: Markus Armbruster Signed-off-by: Markus Armbruster Reviewed-by: Max Reitz Reviewed-by: Jeff Cody Signed-off-by: Kevin Wolf --- 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.8.3.1