FGCOM/jansson
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implemented json_pack() format specifiers 's?', 'o?', and 'O?'.

Browse Source
This commit is contained in:
David Harvey-Macaulay
2016-02-22 21:32:20 +00:00
parent e08101704c
commit 811965b475
2 changed files with 99 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/pack_unpack.c
View File

@@ -48,7 +48,6 @@ static const char * const type_names[] = {
static const char unpack_value_starters[] = "{[siIbfFOon";
static void scanner_init(scanner_t *s, json_error_t *error,
size_t flags, const char *fmt)
{
@@ -291,6 +290,26 @@ error:
return NULL;
}
static json_t *pack_string(scanner_t *s, va_list *ap) {
char *str;
size_t len;
int ours;
int nullable;
nullable = s->start[1] == '?';
if (nullable)
next_token(s);
str = read_string(s, ap, "string", &len, &ours);
if (!str) {
return nullable ? json_null() : NULL;
} else if (ours) {
return jsonp_stringn_nocheck_own(str, len);
} else {
return json_stringn_nocheck(str, len);
}
}
static json_t *pack(scanner_t *s, va_list *ap)
{
switch(token(s)) {
@@ -301,20 +320,7 @@ static json_t *pack(scanner_t *s, va_list *ap)
return pack_array(s, ap);
case 's': /* string */
{
char *str;
size_t len;
int ours;
str = read_string(s, ap, "string", &len, &ours);
if(!str)
return NULL;
if (ours)
return jsonp_stringn_nocheck_own(str, len);
else
return json_stringn_nocheck(str, len);
}
return pack_string(s, ap);
case 'n': /* null */
return json_null();
@@ -332,10 +338,38 @@ static json_t *pack(scanner_t *s, va_list *ap)
return json_real(va_arg(*ap, double));
case 'O': /* a json_t object; increments refcount */
return json_incref(va_arg(*ap, json_t *));
{
int nullable;
json_t *json;
nullable = s->start[1] == '?';
if (nullable)
next_token(s);
json = va_arg(*ap, json_t *);
if (!json && nullable) {
return json_null();
} else {
return json_incref(json);
}
}
case 'o': /* a json_t object; doesn't increment refcount */
return va_arg(*ap, json_t *);
{
int nullable;
json_t *json;
nullable = s->start[1] == '?';
if (nullable)
next_token(s);
json = va_arg(*ap, json_t *);
if (!json && nullable) {
return json_null();
} else {
return json;
}
}
default:
set_error(s, "<format>", "Unexpected format character '%c'",