sfree(NULL) is ok

[fio.git] / parse.c

diff --git a/parse.c b/parse.c
index cbe8e35f2bd7e9fc5c5785c5d2afe77c95f341ca..785d5699857963bcc48ee65db160b7cb4336f0e2 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -289,7 +289,7 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
                fio_opt_str_fn *fn = o->cb;
                const struct value_pair *vp;
                struct value_pair posval[PARSE_MAX_VP];
-               int i;
+               int i, all_skipped = 1;
 
                posval_sort(o, posval);
 
@@ -298,6 +298,7 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
                        vp = &posval[i];
                        if (!vp->ival || vp->ival[0] == '\0')
                                continue;
+                       all_skipped = 0;
                        if (!strncmp(vp->ival, ptr, strlen(vp->ival))) {
                                ret = 0;
                                if (o->roff1) {
@@ -314,7 +315,7 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
                        }
                }
 
-               if (ret)
+               if (ret && !all_skipped)
                        show_option_values(o);
                else if (fn)
                        ret = fn(data, ptr);
@@ -351,13 +352,13 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
                        if (o->type == FIO_OPT_INT) {
                                if (first) {
                                        if (o->roff1)
-                                               *(unsigned long long *) o->roff1 = ull;
+                                               *(unsigned int *) o->roff1 = ull;
                                        else
                                                val_store(ilp, ull, o->off1, 0, data);
                                }
                                if (!more) {
                                        if (o->roff2)
-                                               *(unsigned long long *) o->roff2 = ull;
+                                               *(unsigned int *) o->roff2 = ull;
                                        else if (o->off2)
                                                val_store(ilp, ull, o->off2, 0, data);
                                }
@@ -428,17 +429,17 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 
                        if (first) {
                                if (o->roff1)
-                                       *(unsigned long *) o->roff1 = ul1;
+                                       *(unsigned int *) o->roff1 = ul1;
                                else
                                        val_store(ilp, ul1, o->off1, 0, data);
                                if (o->roff2)
-                                       *(unsigned long *) o->roff2 = ul2;
+                                       *(unsigned int *) o->roff2 = ul2;
                                else
                                        val_store(ilp, ul2, o->off2, 0, data);
                        }
                        if (o->roff3 && o->roff4) {
-                               *(unsigned long *) o->roff3 = ul1;
-                               *(unsigned long *) o->roff4 = ul2;
+                               *(unsigned int *) o->roff3 = ul1;
+                               *(unsigned int *) o->roff4 = ul2;
                        } else if (o->off3 && o->off4) {
                                val_store(ilp, ul1, o->off3, 0, data);
                                val_store(ilp, ul2, o->off4, 0, data);