From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MTZ0j-00034C-1N for qemu-devel@nongnu.org; Wed, 22 Jul 2009 06:25:21 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MTZ0e-00033S-5B for qemu-devel@nongnu.org; Wed, 22 Jul 2009 06:25:20 -0400 Received: from [199.232.76.173] (port=45248 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MTZ0d-00033N-TO for qemu-devel@nongnu.org; Wed, 22 Jul 2009 06:25:15 -0400 Received: from mx2.redhat.com ([66.187.237.31]:56893) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MTZ0d-00054H-Eu for qemu-devel@nongnu.org; Wed, 22 Jul 2009 06:25:15 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n6MAPEPj032578 for ; Wed, 22 Jul 2009 06:25:14 -0400 From: Gerd Hoffmann Date: Wed, 22 Jul 2009 12:25:03 +0200 Message-Id: <1248258307-17071-5-git-send-email-kraxel@redhat.com> In-Reply-To: <1248258307-17071-1-git-send-email-kraxel@redhat.com> References: <1248258307-17071-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 4/8] qemu-option: factor out parse_option_bool List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Signed-off-by: Gerd Hoffmann --- qemu-option.c | 34 ++++++++++++++++++++++------------ qemu-option.h | 1 + 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/qemu-option.c b/qemu-option.c index 646bbad..45f0c8f 100644 --- a/qemu-option.c +++ b/qemu-option.c @@ -101,6 +101,23 @@ QEMUOptionParameter *get_option_parameter(QEMUOptionParameter *list, return NULL; } +int parse_option_bool(const char *name, const char *value, int *ret) +{ + if (value != NULL) { + if (!strcmp(value, "on")) { + *ret = 1; + } else if (!strcmp(value, "off")) { + *ret = 0; + } else { + fprintf(stderr, "Option '%s': Use 'on' or 'off'\n", name); + return -1; + } + } else { + *ret = 1; + } + return 0; +} + /* * Sets the value of a parameter in a given option list. The parsing of the * value depends on the type of option: @@ -121,6 +138,8 @@ QEMUOptionParameter *get_option_parameter(QEMUOptionParameter *list, int set_option_parameter(QEMUOptionParameter *list, const char *name, const char *value) { + int flag; + // Find a matching parameter list = get_option_parameter(list, name); if (list == NULL) { @@ -131,18 +150,9 @@ int set_option_parameter(QEMUOptionParameter *list, const char *name, // Process parameter switch (list->type) { case OPT_FLAG: - if (value != NULL) { - if (!strcmp(value, "on")) { - list->value.n = 1; - } else if (!strcmp(value, "off")) { - list->value.n = 0; - } else { - fprintf(stderr, "Option '%s': Use 'on' or 'off'\n", name); - return -1; - } - } else { - list->value.n = 1; - } + if (-1 == parse_option_bool(name, value, &flag)) + return -1; + list->value.n = flag; break; case OPT_STRING: diff --git a/qemu-option.h b/qemu-option.h index 059c0a4..cb8b1c3 100644 --- a/qemu-option.h +++ b/qemu-option.h @@ -47,6 +47,7 @@ typedef struct QEMUOptionParameter { const char *get_opt_name(char *buf, int buf_size, const char *p, char delim); const char *get_opt_value(char *buf, int buf_size, const char *p); +int parse_option_bool(const char *name, const char *value, int *ret); /* * The following functions take a parameter list as input. This is a pointer to -- 1.6.2.5