Received: from [140.186.70.92] (port=44689 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PQeNG-0006J6-Hr for qemu-devel@nongnu.org; Thu, 09 Dec 2010 06:09:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PQeNE-0000Ic-R7 for qemu-devel@nongnu.org; Thu, 09 Dec 2010 06:09:22 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47372) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PQeNE-0000IV-JU for qemu-devel@nongnu.org; Thu, 09 Dec 2010 06:09:20 -0500 From: Kevin Wolf Date: Thu, 9 Dec 2010 12:10:07 +0100 Message-Id: <1291893010-29223-12-git-send-email-kwolf@redhat.com> In-Reply-To: <1291893010-29223-1-git-send-email-kwolf@redhat.com> References: <1291893010-29223-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 11/14] qemu-option: Don't reinvent append_option_parameters() List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Stefan Hajnoczi parse_option_parameters() may need to create a new option parameter list from a template list. Use append_option_parameters() instead of duplicating the code. Signed-off-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf --- qemu-option.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/qemu-option.c b/qemu-option.c index 1f8f41a..e380fc1 100644 --- a/qemu-option.c +++ b/qemu-option.c @@ -416,20 +416,13 @@ QEMUOptionParameter *parse_option_parameters(const char *param, char value[256]; char *param_delim, *value_delim; char next_delim; - size_t num_options; if (list == NULL) { return NULL; } if (dest == NULL) { - // Count valid options - num_options = count_option_parameters(list); - - // Create a copy of the option list to fill in values - dest = qemu_mallocz((num_options + 1) * sizeof(QEMUOptionParameter)); - allocated = dest; - memcpy(dest, list, (num_options + 1) * sizeof(QEMUOptionParameter)); + dest = allocated = append_option_parameters(NULL, list); } while (*param) { -- 1.7.2.3