Get rid of int vs siint difference

[fio.git] / parse.c

diff --git a/parse.c b/parse.c
index d653f5e489458236a6d441a1157fab15396314ed..a8f42e1d6185159b9ad5c076a3a82d207e9a1b06 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -112,13 +112,18 @@ static unsigned long get_mult_bytes(char c)
  */
 int str_to_decimal(const char *str, long long *val, int kilo)
 {
-       int len;
+       int len, base;
 
        len = strlen(str);
        if (!len)
                return 1;
 
-       *val = strtoll(str, NULL, 10);
+       if (strstr(str, "0x") || strstr(str, "0X"))
+               base = 16;
+       else
+               base = 10;
+
+       *val = strtoll(str, NULL, base);
        if (*val == LONG_MAX && errno == ERANGE)
                return 1;
 
@@ -272,6 +277,7 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
        }
        case FIO_OPT_STR_VAL_TIME:
                is_time = 1;
+       case FIO_OPT_INT:
        case FIO_OPT_STR_VAL:
        case FIO_OPT_STR_VAL_INT: {
                fio_opt_str_val_fn *fn = o->cb;
@@ -368,7 +374,6 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 
                break;
        }
-       case FIO_OPT_INT:
        case FIO_OPT_BOOL: {
                fio_opt_int_fn *fn = o->cb;