[Qemu-devel] [PATCH 4/8] qemu-option: factor out parse_option_bool

[Gerd Hoffmann]

Signed-off-by: Gerd Hoffmann <address@hidden>
---
 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