From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MTZ0p-00037Y-0k for qemu-devel@nongnu.org; Wed, 22 Jul 2009 06:25:27 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MTZ0j-00034N-KU for qemu-devel@nongnu.org; Wed, 22 Jul 2009 06:25:26 -0400 Received: from [199.232.76.173] (port=45253 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MTZ0j-00034F-EJ for qemu-devel@nongnu.org; Wed, 22 Jul 2009 06:25:21 -0400 Received: from mx2.redhat.com ([66.187.237.31]:56897) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MTZ0i-00055T-Uz for qemu-devel@nongnu.org; Wed, 22 Jul 2009 06:25:21 -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 n6MAPKOk032605 for ; Wed, 22 Jul 2009 06:25:20 -0400 From: Gerd Hoffmann Date: Wed, 22 Jul 2009 12:25:04 +0200 Message-Id: <1248258307-17071-6-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 5/8] qemu-option: factor out parse_option_size 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 | 62 +++++++++++++++++++++++++++++++++----------------------- qemu-option.h | 1 + 2 files changed, 37 insertions(+), 26 deletions(-) diff --git a/qemu-option.c b/qemu-option.c index 45f0c8f..390c97d 100644 --- a/qemu-option.c +++ b/qemu-option.c @@ -118,6 +118,40 @@ int parse_option_bool(const char *name, const char *value, int *ret) return 0; } +int parse_option_size(const char *name, const char *value, uint64_t *ret) +{ + char *postfix; + double sizef; + + if (value != NULL) { + sizef = strtod(value, &postfix); + switch (*postfix) { + case 'T': + sizef *= 1024; + case 'G': + sizef *= 1024; + case 'M': + sizef *= 1024; + case 'K': + case 'k': + sizef *= 1024; + case 'b': + case '\0': + *ret = (uint64_t) sizef; + break; + default: + fprintf(stderr, "Option '%s' needs size as parameter\n", name); + fprintf(stderr, "You may use k, M, G or T suffixes for " + "kilobytes, megabytes, gigabytes and terabytes.\n"); + return -1; + } + } else { + fprintf(stderr, "Option '%s' needs a parameter\n", name); + return -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: @@ -165,34 +199,10 @@ int set_option_parameter(QEMUOptionParameter *list, const char *name, break; case OPT_SIZE: - if (value != NULL) { - double sizef = strtod(value, (char**) &value); - - switch (*value) { - case 'T': - sizef *= 1024; - case 'G': - sizef *= 1024; - case 'M': - sizef *= 1024; - case 'K': - case 'k': - sizef *= 1024; - case 'b': - case '\0': - list->value.n = (uint64_t) sizef; - break; - default: - fprintf(stderr, "Option '%s' needs size as parameter\n", name); - fprintf(stderr, "You may use k, M, G or T suffixes for " - "kilobytes, megabytes, gigabytes and terabytes.\n"); - return -1; - } - } else { - fprintf(stderr, "Option '%s' needs a parameter\n", name); + if (-1 == parse_option_size(name, value, &list->value.n)) return -1; - } break; + default: fprintf(stderr, "Bug: Option '%s' has an unknown type\n", name); return -1; diff --git a/qemu-option.h b/qemu-option.h index cb8b1c3..9525e87 100644 --- a/qemu-option.h +++ b/qemu-option.h @@ -48,6 +48,7 @@ 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); +int parse_option_size(const char *name, const char *value, uint64_t *ret); /* * The following functions take a parameter list as input. This is a pointer to -- 1.6.2.5