From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=51207 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PPtxr-0006B7-6q for qemu-devel@nongnu.org; Tue, 07 Dec 2010 04:36:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PPtxq-0001QU-0J for qemu-devel@nongnu.org; Tue, 07 Dec 2010 04:36:03 -0500 Received: from mtagate7.uk.ibm.com ([194.196.100.167]:52834) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PPtxp-0001Q4-PO for qemu-devel@nongnu.org; Tue, 07 Dec 2010 04:36:01 -0500 Received: from d06nrmr1806.portsmouth.uk.ibm.com (d06nrmr1806.portsmouth.uk.ibm.com [9.149.39.193]) by mtagate7.uk.ibm.com (8.13.1/8.13.1) with ESMTP id oB79a1Oi029830 for ; Tue, 7 Dec 2010 09:36:01 GMT Received: from d06av05.portsmouth.uk.ibm.com (d06av05.portsmouth.uk.ibm.com [9.149.37.229]) by d06nrmr1806.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id oB79a07M2662640 for ; Tue, 7 Dec 2010 09:36:02 GMT Received: from d06av05.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av05.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id oB79ZwUs012986 for ; Tue, 7 Dec 2010 02:35:58 -0700 From: Stefan Hajnoczi Date: Tue, 7 Dec 2010 09:35:53 +0000 Message-Id: <1291714556-22961-2-git-send-email-stefanha@linux.vnet.ibm.com> In-Reply-To: <1291714556-22961-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1291714556-22961-1-git-send-email-stefanha@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 1/4] 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: qemu-devel@nongnu.org Cc: Kevin Wolf , 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 --- 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