commit 9bfb3d508627076720224208c299c05c25e63792
author David 'Digit' Turner <digit@android.com> Tue May 10 12:58:58 2011 +0200
committer David 'Digit' Turner <digit@android.com> Wed Jun 01 17:08:17 2011 +0200
tree a2fe375c8bfac20ad53ae649210d1c59db40e693
parent 6eaacfbad243e6f219667d938b06d68f99981301

json-lexer.c, json-parser.c: minor integrate

Change-Id: Id7a703f5c93c9a9cbd47a5f44bfdf900080e7430

json-lexer.c

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 @@
     /* Zero */
     [IN_ZERO] = {
         TERMINAL(JSON_INTEGER),
-        ['0' ... '9'] = ERROR,
+        ['0' ... '9'] = IN_ERROR,
         ['.'] = IN_MANTISSA,
     },
 
@@ -306,7 +302,7 @@
             lexer->token = qstring_new();
             new_state = IN_START;
             break;
-        case ERROR:
+        case IN_ERROR:
             return -EINVAL;
         default:
             break;

json-parser.c

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 @@
 /**
  * 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);