[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 1/4] json-parser: drop superfluous assignment for
From: |
arei.gonglei |
Subject: |
[Qemu-devel] [PATCH v3 1/4] json-parser: drop superfluous assignment for token variable |
Date: |
Tue, 10 Jun 2014 17:20:24 +0800 |
From: Gonglei <address@hidden>
Signed-off-by: ChenLiang <address@hidden>
Signed-off-by: Gonglei <address@hidden>
---
qobject/json-parser.c | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/qobject/json-parser.c b/qobject/json-parser.c
index e46c264..4288267 100644
--- a/qobject/json-parser.c
+++ b/qobject/json-parser.c
@@ -423,7 +423,6 @@ static QObject *parse_object(JSONParserContext *ctxt,
va_list *ap)
if (!token_is_operator(token, '{')) {
goto out;
}
- token = NULL;
dict = qdict_new();
@@ -449,7 +448,6 @@ static QObject *parse_object(JSONParserContext *ctxt,
va_list *ap)
parse_error(ctxt, token, "expected separator in dict");
goto out;
}
- token = NULL;
if (parse_pair(ctxt, dict, ap) == -1) {
goto out;
@@ -461,10 +459,8 @@ static QObject *parse_object(JSONParserContext *ctxt,
va_list *ap)
goto out;
}
}
- token = NULL;
} else {
- token = parser_context_pop_token(ctxt);
- token = NULL;
+ (void)parser_context_pop_token(ctxt);
}
return QOBJECT(dict);
@@ -487,10 +483,8 @@ static QObject *parse_array(JSONParserContext *ctxt,
va_list *ap)
}
if (!token_is_operator(token, '[')) {
- token = NULL;
goto out;
}
- token = NULL;
list = qlist_new();
@@ -523,8 +517,6 @@ static QObject *parse_array(JSONParserContext *ctxt,
va_list *ap)
goto out;
}
- token = NULL;
-
obj = parse_value(ctxt, ap);
if (obj == NULL) {
parse_error(ctxt, token, "expecting value");
@@ -539,11 +531,8 @@ static QObject *parse_array(JSONParserContext *ctxt,
va_list *ap)
goto out;
}
}
-
- token = NULL;
} else {
- token = parser_context_pop_token(ctxt);
- token = NULL;
+ (void)parser_context_pop_token(ctxt);
}
return QOBJECT(list);
--
1.7.12.4
[Qemu-devel] [PATCH v3 4/4] vga: Fix divide-by-zero in vga_update_text, arei.gonglei, 2014/06/10