External/libvirt
1
0
Fork 0
Code

qparams.c: do not skip va_end, twice

Browse Source 
* src/util/qparams.c (new_qparam_set, append_qparams): Do not skip
va_end due to an early return.
This commit is contained in:
Jim Meyering 2010-02-18 20:27:22 +01:00
parent 37ce5600c0
commit 12ed08bc3a
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/util/qparams.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2007, 2009 Red Hat, Inc. /* Copyright (C) 2007, 2009-2010 Red Hat, Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -62,7 +62,8 @@ new_qparam_set (int init_alloc, ...)
if (append_qparam (ps, pname, pvalue) == -1) { if (append_qparam (ps, pname, pvalue) == -1) {
free_qparam_set (ps); free_qparam_set (ps);
return NULL; ps = NULL;
break;
} }
} }
va_end (args); va_end (args);
@ -75,17 +76,20 @@ append_qparams (struct qparam_set *ps, ...)
{ {
va_list args; va_list args;
const char *pname, *pvalue; const char *pname, *pvalue;
int ret = 0;
va_start (args, ps); va_start (args, ps);
while ((pname = va_arg (args, char *)) != NULL) { while ((pname = va_arg (args, char *)) != NULL) {
pvalue = va_arg (args, char *); pvalue = va_arg (args, char *);
if (append_qparam (ps, pname, pvalue) == -1) if (append_qparam (ps, pname, pvalue) == -1) {
return -1; ret = -1;
break;
}
} }
va_end (args); va_end (args);
return 0; return ret;
} }
/* Ensure there is space to store at least one more parameter /* Ensure there is space to store at least one more parameter