aboutsummaryrefslogtreecommitdiffstats
path: root/wsutil/json_dumper.c
diff options
context:
space:
mode:
authorDario Lombardo <lomato@gmail.com>2018-12-25 23:19:46 +0100
committerDario Lombardo <lomato@gmail.com>2018-12-27 20:19:38 +0000
commite830182d9e37840c066e16f93ecea278ff5adce7 (patch)
treed84f91bf4e92c7412e32f947982116586a4caf1e /wsutil/json_dumper.c
parentc9cfae7fecd4bc21b8b4f48328d08e104d47dd52 (diff)
json_dumper: add json_dumper_value_va_list().
Change-Id: I8effb701b505e5ce0c06be42ab524c458e1839ce Reviewed-on: https://code.wireshark.org/review/31207 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Dario Lombardo <lomato@gmail.com>
Diffstat (limited to 'wsutil/json_dumper.c')
-rw-r--r--wsutil/json_dumper.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/wsutil/json_dumper.c b/wsutil/json_dumper.c
index 5162b6b8c9..43db64ec64 100644
--- a/wsutil/json_dumper.c
+++ b/wsutil/json_dumper.c
@@ -306,21 +306,28 @@ json_dumper_value_string(json_dumper *dumper, const char *value)
}
void
-json_dumper_value_anyf(json_dumper *dumper, const char *format, ...)
+json_dumper_value_va_list(json_dumper *dumper, const char *format, va_list ap)
{
- va_list ap;
if (!json_dumper_check_state(dumper, JSON_DUMPER_SET_VALUE, JSON_DUMPER_TYPE_VALUE)) {
return;
}
prepare_token(dumper);
- va_start(ap, format);
vfprintf(dumper->output_file, format, ap);
- va_end(ap);
dumper->state[dumper->current_depth] = JSON_DUMPER_TYPE_VALUE;
}
+void
+json_dumper_value_anyf(json_dumper *dumper, const char *format, ...)
+{
+ va_list ap;
+
+ va_start(ap, format);
+ json_dumper_value_va_list(dumper, format, ap);
+ va_end(ap);
+}
+
gboolean
json_dumper_finish(json_dumper *dumper)
{