projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fio-jsonplus-patches' of https://github.com/vincentkfu/fio
[fio.git]
/
parse.c
diff --git
a/parse.c
b/parse.c
index fc508b674cff11555d2f3e5f73aea7a32d7cd101..ecce8b89dba99f5bd8af7120d10a2843fac056cf 100644
(file)
--- a/
parse.c
+++ b/
parse.c
@@
-135,6
+135,7
@@
static unsigned long long get_mult_time(const char *str, int len,
const char *p = str;
char *c;
unsigned long long mult = 1;
const char *p = str;
char *c;
unsigned long long mult = 1;
+ int i;
/*
* Go forward until we hit a non-digit, or +/- sign
/*
* Go forward until we hit a non-digit, or +/- sign
@@
-153,7
+154,7
@@
static unsigned long long get_mult_time(const char *str, int len,
}
c = strdup(p);
}
c = strdup(p);
- for (i
nt i
= 0; i < strlen(c); i++)
+ for (i = 0; i < strlen(c); i++)
c[i] = tolower(c[i]);
if (!strncmp("us", c, 2) || !strncmp("usec", c, 4))
c[i] = tolower(c[i]);
if (!strncmp("us", c, 2) || !strncmp("usec", c, 4))
@@
-167,7
+168,7
@@
static unsigned long long get_mult_time(const char *str, int len,
else if (!strcmp("h", c))
mult = 60 * 60 * 1000000UL;
else if (!strcmp("d", c))
else if (!strcmp("h", c))
mult = 60 * 60 * 1000000UL;
else if (!strcmp("d", c))
- mult = 24 * 60 * 60 * 1000000UL;
+ mult = 24 * 60 * 60 * 1000000UL
L
;
free(c);
return mult;
free(c);
return mult;
@@
-1344,7
+1345,7
@@
void options_free(struct fio_option *options, void *data)
dprint(FD_PARSE, "free options\n");
for (o = &options[0]; o->name; o++) {
dprint(FD_PARSE, "free options\n");
for (o = &options[0]; o->name; o++) {
- if (o->type != FIO_OPT_STR_STORE || !o->off1)
+ if (o->type != FIO_OPT_STR_STORE || !o->off1
|| o->no_free
)
continue;
ptr = td_var(data, o, o->off1);
continue;
ptr = td_var(data, o, o->off1);