ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

json: add va_arg versions for write_string and write_named_string

Browse Source 
Change-Id: I22ca6db43f797d9e615208b251923d9ce61acec6
Signed-off-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
Reviewed-on: https://review.gerrithub.io/401024
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
This commit is contained in:
Pawel Wodkowski 2018-02-22 14:55:46 +01:00 committed by Jim Harris
parent 488e6418a5
commit a5cfd43036
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/spdk/json.h
View File

@ -225,6 +225,8 @@ int spdk_json_write_string_utf16le_raw(struct spdk_json_write_ctx *w, const uint
int spdk_json_write_string_fmt(struct spdk_json_write_ctx *w, const char *fmt, int spdk_json_write_string_fmt(struct spdk_json_write_ctx *w, const char *fmt,
...) __attribute__((__format__(__printf__, 2, 3))); ...) __attribute__((__format__(__printf__, 2, 3)));
int spdk_json_write_string_fmt_v(struct spdk_json_write_ctx *w, const char *fmt, va_list args);
int spdk_json_write_array_begin(struct spdk_json_write_ctx *w); int spdk_json_write_array_begin(struct spdk_json_write_ctx *w);
int spdk_json_write_array_end(struct spdk_json_write_ctx *w); int spdk_json_write_array_end(struct spdk_json_write_ctx *w);
int spdk_json_write_object_begin(struct spdk_json_write_ctx *w); int spdk_json_write_object_begin(struct spdk_json_write_ctx *w);
@ -251,6 +253,9 @@ int spdk_json_write_named_int64(struct spdk_json_write_ctx *w, const char *name,
int spdk_json_write_named_string(struct spdk_json_write_ctx *w, const char *name, const char *val); int spdk_json_write_named_string(struct spdk_json_write_ctx *w, const char *name, const char *val);
int spdk_json_write_named_string_fmt(struct spdk_json_write_ctx *w, const char *name, int spdk_json_write_named_string_fmt(struct spdk_json_write_ctx *w, const char *name,
const char *fmt, ...) __attribute__((__format__(__printf__, 3, 4))); const char *fmt, ...) __attribute__((__format__(__printf__, 3, 4)));
int spdk_json_write_named_string_fmt_v(struct spdk_json_write_ctx *w, const char *name,
const char *fmt, va_list args);
int spdk_json_write_named_array_begin(struct spdk_json_write_ctx *w, const char *name); int spdk_json_write_named_array_begin(struct spdk_json_write_ctx *w, const char *name);
int spdk_json_write_named_object_begin(struct spdk_json_write_ctx *w, const char *name); int spdk_json_write_named_object_begin(struct spdk_json_write_ctx *w, const char *name);

29
lib/json/json_write.c
View File

@ -431,14 +431,23 @@ spdk_json_write_string_utf16le(struct spdk_json_write_ctx *w, const uint16_t *va
int int
spdk_json_write_string_fmt(struct spdk_json_write_ctx *w, const char *fmt, ...) spdk_json_write_string_fmt(struct spdk_json_write_ctx *w, const char *fmt, ...)
{ {
char *s;
va_list args; va_list args;
int rc; int rc;
va_start(args, fmt); va_start(args, fmt);
s = spdk_vsprintf_alloc(fmt, args); rc = spdk_json_write_string_fmt_v(w, fmt, args);
va_end(args); va_end(args);
return rc;
}
int
spdk_json_write_string_fmt_v(struct spdk_json_write_ctx *w, const char *fmt, va_list args)
{
char *s;
int rc;
s = spdk_vsprintf_alloc(fmt, args);
if (s == NULL) { if (s == NULL) {
return -1; return -1;
} }
@ -631,18 +640,28 @@ int spdk_json_write_named_string(struct spdk_json_write_ctx *w, const char *name
int spdk_json_write_named_string_fmt(struct spdk_json_write_ctx *w, const char *name, int spdk_json_write_named_string_fmt(struct spdk_json_write_ctx *w, const char *name,
const char *fmt, ...) const char *fmt, ...)
{ {
char *s;
va_list args; va_list args;
int rc; int rc;
va_start(args, fmt);
rc = spdk_json_write_named_string_fmt_v(w, name, fmt, args);
va_end(args);
return rc;
}
int spdk_json_write_named_string_fmt_v(struct spdk_json_write_ctx *w, const char *name,
const char *fmt, va_list args)
{
char *s;
int rc;
rc = spdk_json_write_name(w, name); rc = spdk_json_write_name(w, name);
if (rc) { if (rc) {
return rc; return rc;
} }
va_start(args, fmt);
s = spdk_vsprintf_alloc(fmt, args); s = spdk_vsprintf_alloc(fmt, args);
va_end(args);
if (s == NULL) { if (s == NULL) {
return -1; return -1;