return 0;
}
-static int dump_string(const char *str, int ascii, json_dump_callback_t dump, void *data, size_t flags)
+static int dump_string(const char *str, json_dump_callback_t dump, void *data, size_t flags)
{
const char *pos, *end;
int32_t codepoint;
return -1;
/* mandatory escape or control char */
- if(codepoint == '\\' || codepoint == '/' || codepoint == '"' || codepoint < 0x20)
+ if(codepoint == '\\' || codepoint == '"' || codepoint < 0x20)
+ break;
+
+ /* slash */
+ if((flags & JSON_ESCAPE_SLASH) && codepoint == '/')
break;
/* non-ASCII */
- if(ascii && codepoint > 0x7F)
+ if((flags & JSON_ENSURE_ASCII) && codepoint > 0x7F)
break;
pos = end;
case '\n': text = "\\n"; break;
case '\r': text = "\\r"; break;
case '\t': text = "\\t"; break;
- case '/':
- if (flags & JSON_ESCAPE_SLASH)
- text = "\\/";
- else {
- text = "/";
- length = 1;
- }
- break;
+ case '/': text = "\\/"; break;
default:
{
/* codepoint is in BMP */
static int do_dump(const json_t *json, size_t flags, int depth,
json_dump_callback_t dump, void *data)
{
- int ascii = flags & JSON_ENSURE_ASCII ? 1 : 0;
-
switch(json_typeof(json)) {
case JSON_NULL:
return dump("null", 4, data);
}
case JSON_STRING:
- return dump_string(json_string_value(json), ascii, dump, data, flags);
+ return dump_string(json_string_value(json), dump, data, flags);
case JSON_ARRAY:
{
value = json_object_get(json, key);
assert(value);
- dump_string(key, ascii, dump, data, flags);
+ dump_string(key, dump, data, flags);
if(dump(separator, separator_length, data) ||
do_dump(value, flags, depth + 1, dump, data))
{
{
void *next = json_object_iter_next((json_t *)json, iter);
- dump_string(json_object_iter_key(iter), ascii, dump, data, flags);
+ dump_string(json_object_iter_key(iter), dump, data, flags);
if(dump(separator, separator_length, data) ||
do_dump(json_object_iter_value(iter), flags, depth + 1,
dump, data))