From 63f29372bc1bd69b66816c96d88b9c0bd8f3d8b9 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Wed, 10 Jan 2007 13:20:09 +0100 Subject: [PATCH] [PATCH] Option minval should be signed Signed-off-by: Jens Axboe --- parse.c | 18 +++++++++--------- parse.h | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/parse.c b/parse.c index 1cc55dc6..abe0653b 100644 --- a/parse.c +++ b/parse.c @@ -48,7 +48,7 @@ static unsigned long get_mult_bytes(char c) /* * convert string into decimal value, noting any size suffix */ -static int str_to_decimal(const char *str, unsigned long long *val, int kilo) +static int str_to_decimal(const char *str, long long *val, int kilo) { int len; @@ -68,12 +68,12 @@ static int str_to_decimal(const char *str, unsigned long long *val, int kilo) return 0; } -static int check_str_bytes(const char *p, unsigned long long *val) +static int check_str_bytes(const char *p, long long *val) { return str_to_decimal(p, val, 1); } -static int check_str_time(const char *p, unsigned long long *val) +static int check_str_time(const char *p, long long *val) { return str_to_decimal(p, val, 0); } @@ -96,7 +96,7 @@ void strip_blank_end(char *p) *(s + 1) = '\0'; } -static int check_range_bytes(const char *str, unsigned long *val) +static int check_range_bytes(const char *str, long *val) { char suffix; @@ -114,7 +114,7 @@ static int check_range_bytes(const char *str, unsigned long *val) return 1; } -static int check_int(const char *p, unsigned int *val) +static int check_int(const char *p, int *val) { if (!strlen(p)) return 1; @@ -148,9 +148,9 @@ static struct fio_option *find_option(struct fio_option *options, static int __handle_option(struct fio_option *o, const char *ptr, void *data, int first, int more) { - unsigned int il, *ilp; - unsigned long long ull, *ullp; - unsigned long ul1, ul2; + int il, *ilp; + long long ull, *ullp; + long ul1, ul2; char **cp; int ret = 0, is_time = 0; @@ -252,7 +252,7 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data, if (ret) break; - if (o->maxval && il > o->maxval) + if (o->maxval && il > (int) o->maxval) il = o->maxval; if (o->minval && il < o->minval) il = o->minval; diff --git a/parse.h b/parse.h index 414f77c8..2d4b55ec 100644 --- a/parse.h +++ b/parse.h @@ -27,7 +27,7 @@ struct fio_option { unsigned int off3; unsigned int off4; unsigned int maxval; /* max and min value */ - unsigned int minval; + int minval; void *cb; /* callback */ const char *help; /* help text for option */ const char *def; /* default setting */ @@ -49,8 +49,8 @@ extern void strip_blank_end(char *); * Handlers for the options */ typedef int (fio_opt_str_fn)(void *, const char *); -typedef int (fio_opt_str_val_fn)(void *, unsigned long long *); -typedef int (fio_opt_int_fn)(void *, unsigned int *); +typedef int (fio_opt_str_val_fn)(void *, long long *); +typedef int (fio_opt_int_fn)(void *, int *); typedef int (fio_opt_str_set_fn)(void *); #define td_var(start, offset) ((void *) start + (offset)) -- 2.25.1