diff options
Diffstat (limited to 'src/libmowgli/ext')
-rw-r--r-- | src/libmowgli/ext/json.c | 10 | ||||
-rw-r--r-- | src/libmowgli/ext/program_opts.c | 18 |
2 files changed, 5 insertions, 23 deletions
diff --git a/src/libmowgli/ext/json.c b/src/libmowgli/ext/json.c index 3e273a4..0470463 100644 --- a/src/libmowgli/ext/json.c +++ b/src/libmowgli/ext/json.c @@ -1179,12 +1179,12 @@ lex_char(mowgli_json_parse_t *parse, char c) case ',': lex_easy(parse, TS_VALUE_SEP); return false; } - if ((c == '-') || (c == '.') || isdigit(c)) + if ((c == '-') || (c == '.') || isdigit((unsigned char)c)) { parse->lex = LEX_NUMBER; return true; } - else if (isalpha(c)) + else if (isalpha((unsigned char)c)) { parse->lex = LEX_IDENTIFIER; return true; @@ -1194,7 +1194,7 @@ lex_char(mowgli_json_parse_t *parse, char c) parse->lex = LEX_STRING; return false; } - else if (isspace(c)) + else if (isspace((unsigned char)c)) { return false; } @@ -1248,7 +1248,7 @@ lex_char(mowgli_json_parse_t *parse, char c) case LEX_NUMBER: - if ((c == '-') || (c == '.') || isdigit(c) || (toupper(c) == 'E')) + if ((c == '-') || (c == '.') || isdigit((unsigned char)c) || (toupper((unsigned char)c) == 'E')) { lex_append(parse, c); return false; @@ -1263,7 +1263,7 @@ lex_char(mowgli_json_parse_t *parse, char c) case LEX_IDENTIFIER: - if (isalpha(c)) + if (isalpha((unsigned char)c)) { lex_append(parse, c); return false; diff --git a/src/libmowgli/ext/program_opts.c b/src/libmowgli/ext/program_opts.c index d07c063..93b04ac 100644 --- a/src/libmowgli/ext/program_opts.c +++ b/src/libmowgli/ext/program_opts.c @@ -52,24 +52,6 @@ mowgli_program_opts_consumer_bool(const char *arg, void *userdata) *(bool *) userdata = true; } -static inline mowgli_program_opts_t * -mowgli_program_opts_lookup_name(mowgli_program_opts_t *opts, size_t opts_size, const char *name) -{ - size_t i; - - if (strlen(name) > 1) - for (i = 0; i < opts_size; i++) - if (!strcasecmp(name, opts[i].longopt)) - return &opts[i]; - - else - for (i = 0; i < opts_size; i++) - if (*name == opts[i].smallopt) - return &opts[i]; - - return NULL; -} - static inline mowgli_getopt_option_t * mowgli_program_opts_convert(const mowgli_program_opts_t *opts, size_t opts_size) { |