diff options
| author | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2007-12-16 20:37:22 +0200 |
|---|---|---|
| committer | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2007-12-16 20:37:22 +0200 |
| commit | be71f3ccb61d3c4f1ebc096ba4e5e1563f578681 (patch) | |
| tree | 9bcd5381887297186189e3c46b4a7da678976e8b /mysys | |
| parent | dd3bba09f22ff3a48443454f2927dc22fd43da05 (diff) | |
| download | mariadb-git-be71f3ccb61d3c4f1ebc096ba4e5e1563f578681.tar.gz | |
Fixed after-merge problems.
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_getopt.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c index d7de0d12e08..796062f75b0 100644 --- a/mysys/my_getopt.c +++ b/mysys/my_getopt.c @@ -30,7 +30,6 @@ my_error_reporter my_getopt_error_reporter= &default_reporter; static int findopt(char *, uint, const struct my_option **, char **); my_bool getopt_compare_strings(const char *, const char *, uint); static longlong getopt_ll(char *arg, const struct my_option *optp, int *err); -static longlong getopt_ll_limit_value(longlong, const struct my_option *); static ulonglong getopt_ull(char *, const struct my_option *, int *); static double getopt_double(char *arg, const struct my_option *optp, int *err); static void init_variables(const struct my_option *options, @@ -789,8 +788,8 @@ static longlong getopt_ll(char *arg, const struct my_option *optp, int *err) Returns "fixed" value. */ -static longlong getopt_ll_limit_value(longlong num, const struct my_option *optp, - bool *fix) +longlong getopt_ll_limit_value(longlong num, const struct my_option *optp, + bool *fix) { longlong old= num; bool adjusted= FALSE; @@ -859,7 +858,7 @@ static ulonglong getopt_ull(char *arg, const struct my_option *optp, int *err) ulonglong getopt_ull_limit_value(ulonglong num, const struct my_option *optp, - bool *fix); + bool *fix) { bool adjusted= FALSE; ulonglong old= num; @@ -965,25 +964,27 @@ static void init_one_value(const struct my_option *optp, uchar* *variable, *((my_bool*) variable)= (my_bool) value; break; case GET_INT: - *((int*) variable)= (int) getopt_ll_limit_value(value, optp); + *((int*) variable)= (int) getopt_ll_limit_value(value, optp, NULL); break; case GET_UINT: - *((uint*) variable)= (uint) getopt_ull_limit_value(value, optp); + *((uint*) variable)= (uint) getopt_ull_limit_value(value, optp, NULL); break; case GET_ENUM: *((uint*) variable)= (uint) value; break; case GET_LONG: - *((long*) variable)= (long) getopt_ll_limit_value(value, optp); + *((long*) variable)= (long) getopt_ll_limit_value(value, optp, NULL); break; case GET_ULONG: - *((ulong*) variable)= (ulong) getopt_ull_limit_value(value, optp); + *((ulong*) variable)= (ulong) getopt_ull_limit_value(value, optp, NULL); break; case GET_LL: - *((longlong*) variable)= (longlong) getopt_ll_limit_value(value, optp); + *((longlong*) variable)= (longlong) getopt_ll_limit_value(value, optp, + NULL); break; case GET_ULL: - *((ulonglong*) variable)= (ulonglong) getopt_ull_limit_value(value, optp); + *((ulonglong*) variable)= (ulonglong) getopt_ull_limit_value(value, optp, + NULL); break; case GET_SET: *((ulonglong*) variable)= (ulonglong) value; |