[prev in list] [next in list] [prev in thread] [next in thread]
List: xen-cvs
Subject: [Xen-changelog] [xen master] libxl_json: fix JSON parser debug code
From: patchbot () xen ! org
Date: 2014-04-18 8:44:54
Message-ID: E1Wb4Pm-0003Ou-NM () xenbits ! xen ! org
[Download RAW message or body]
commit b955e8c5b7ceab7a6dde006f50b8dc90c5decf26
Author: Wei Liu <wei.liu2@citrix.com>
AuthorDate: Thu Apr 10 16:26:32 2014 +0100
Commit: Ian Campbell <ian.campbell@citrix.com>
CommitDate: Wed Apr 16 17:06:41 2014 +0100
libxl_json: fix JSON parser debug code
Two changes included:
1. implement DEBUG_GEN_ALLOC for YAJL2
2. use size_t for variable "len"
without these two fixes it fails to compile when DEBUG_ANSWER is
defined.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
tools/libxl/libxl_json.c | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/tools/libxl/libxl_json.c b/tools/libxl/libxl_json.c
index 989ac3f..3ea56a4 100644
--- a/tools/libxl/libxl_json.c
+++ b/tools/libxl/libxl_json.c
@@ -34,11 +34,20 @@ struct libxl__yajl_ctx {
};
#ifdef DEBUG_ANSWER
-# define DEBUG_GEN_ALLOC(ctx) \
- if ((ctx)->g == NULL) { \
- yajl_gen_config conf = { 1, " " }; \
+#if YAJL_VERSION < 20000
+# define DEBUG_GEN_ALLOC(ctx) \
+ if ((ctx)->g == NULL) { \
+ yajl_gen_config conf = { 1, " " }; \
(ctx)->g = yajl_gen_alloc(&conf, NULL); \
}
+#else /* YAJL2 */
+# define DEBUG_GEN_ALLOC(ctx) \
+ if ((ctx)->g == NULL) { \
+ (ctx)->g = yajl_gen_alloc(NULL); \
+ yajl_gen_config((ctx)->g, yajl_gen_beautify, 1); \
+ yajl_gen_config((ctx)->g, yajl_gen_indent_string, " "); \
+ }
+#endif
# define DEBUG_GEN_FREE(ctx) \
if ((ctx)->g) yajl_gen_free((ctx)->g)
# define DEBUG_GEN(ctx, type) yajl_gen_##type(ctx->g)
@@ -48,7 +57,7 @@ struct libxl__yajl_ctx {
# define DEBUG_GEN_REPORT(yajl_ctx) \
do { \
const unsigned char *buf = NULL; \
- unsigned int len = 0; \
+ size_t len = 0; \
yajl_gen_get_buf((yajl_ctx)->g, &buf, &len); \
LIBXL__LOG(libxl__gc_owner((yajl_ctx)->gc), \
LIBXL__LOG_DEBUG, "response:\n%s", buf); \
--
generated by git-patchbot for /home/xen/git/xen.git#master
_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xen.org
http://lists.xensource.com/xen-changelog
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic