projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some more pthread_* call mishandled errors
[fio.git]
/
parse.c
diff --git
a/parse.c
b/parse.c
index 8a2e6f215f0ba1f3df53abb2e3e9774a7180af17..f838a1f625e111f6aa55a5bdf221a4f6352319a4 100644
(file)
--- a/
parse.c
+++ b/
parse.c
@@
-236,7
+236,7
@@
static int __handle_option(struct fio_option *o, const char *ptr, void *data,
dprint(FD_PARSE, "__handle_option=%s, type=%d, ptr=%s\n", o->name,
o->type, ptr);
dprint(FD_PARSE, "__handle_option=%s, type=%d, ptr=%s\n", o->name,
o->type, ptr);
- if (!ptr && o->type != FIO_OPT_STR_SET) {
+ if (!ptr && o->type != FIO_OPT_STR_SET
&& o->type != FIO_OPT_STR
) {
fprintf(stderr, "Option %s requires an argument\n", o->name);
return 1;
}
fprintf(stderr, "Option %s requires an argument\n", o->name);
return 1;
}
@@
-474,6
+474,7
@@
static struct fio_option *get_option(const char *opt,
*ret = '\0';
ret = (char *) opt;
(*post)++;
*ret = '\0';
ret = (char *) opt;
(*post)++;
+ strip_blank_end(ret);
o = find_option(options, ret);
} else {
o = find_option(options, opt);
o = find_option(options, ret);
} else {
o = find_option(options, opt);
@@
-520,7
+521,7
@@
int parse_cmd_option(const char *opt, const char *val,
o = find_option(options, opt);
if (!o) {
o = find_option(options, opt);
if (!o) {
- fprintf(stderr, "Bad option
%s
\n", opt);
+ fprintf(stderr, "Bad option
<%s>
\n", opt);
return 1;
}
return 1;
}
@@
-589,7
+590,7
@@
int parse_option(const char *opt, struct fio_option *options, void *data)
o = get_option(tmp, options, &post);
if (!o) {
o = get_option(tmp, options, &post);
if (!o) {
- fprintf(stderr, "Bad option
%s
\n", tmp);
+ fprintf(stderr, "Bad option
<%s>
\n", tmp);
free(tmp);
return 1;
}
free(tmp);
return 1;
}