diff options
| -rw-r--r-- | json-lexer.c | 10 | ||||
| -rw-r--r-- | json-parser.c | 3 |
2 files changed, 5 insertions, 8 deletions
diff --git a/json-lexer.c b/json-lexer.c index 534fcf7..65c9720 100644 --- a/json-lexer.c +++ b/json-lexer.c @@ -27,12 +27,8 @@ * */ -/* Building with mingw results in an error because ERROR is defined as a - * macro in this environment. Undefined it */ -#undef ERROR - enum json_lexer_state { - ERROR = 0, + IN_ERROR = 0, IN_DQ_UCODE3, IN_DQ_UCODE2, IN_DQ_UCODE1, @@ -154,7 +150,7 @@ static const uint8_t json_lexer[][256] = { /* Zero */ [IN_ZERO] = { TERMINAL(JSON_INTEGER), - ['0' ... '9'] = ERROR, + ['0' ... '9'] = IN_ERROR, ['.'] = IN_MANTISSA, }, @@ -306,7 +302,7 @@ static int json_lexer_feed_char(JSONLexer *lexer, char ch) lexer->token = qstring_new(); new_state = IN_START; break; - case ERROR: + case IN_ERROR: return -EINVAL; default: break; diff --git a/json-parser.c b/json-parser.c index 70b9b6f..6c06ef9 100644 --- a/json-parser.c +++ b/json-parser.c @@ -91,7 +91,8 @@ static int token_is_escape(QObject *obj, const char *value) /** * Error handler */ -static void parse_error(JSONParserContext *ctxt, QObject *token, const char *msg, ...) +static void GCC_FMT_ATTR(3, 4) parse_error(JSONParserContext *ctxt, + QObject *token, const char *msg, ...) { va_list ap; va_start(ap, msg); |