diff mbox

[v2,3/4] qemu-io-cmds: g_renew() can't fail, bury dead error handling

Message ID 1408378243-19713-4-git-send-email-armbru@redhat.com
State New
Headers show

Commit Message

Markus Armbruster Aug. 18, 2014, 4:10 p.m. UTC 
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 qemu-io-cmds.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

Comments

Max Reitz Aug. 18, 2014, 4:50 p.m. UTC | #1 
On 18.08.2014 18:10, Markus Armbruster wrote:
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>   qemu-io-cmds.c | 11 +----------
>   1 file changed, 1 insertion(+), 10 deletions(-)

Oops, disregard my comment for patch 2. ;-)

Reviewed-by: Max Reitz <mreitz@redhat.com>
Jeff Cody Aug. 18, 2014, 7:59 p.m. UTC | #2 
On Mon, Aug 18, 2014 at 06:10:42PM +0200, Markus Armbruster wrote:
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  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
> 
>

Reviewed-by: Jeff Cody <jcody@redhat.com>
diff mbox

Patch

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;
     }