mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-03-20 13:39:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'issue-165' of https://github.com/jobol/json-c into jobol-issue-165

Browse Source 
Conflicts:
	tests/test_util_file.c
This commit is contained in:
Eric Haszlakiewicz
2016-08-09 07:36:54 -04:00
parent bc3e691a1e 1fceb2207a
commit f3db59d990
3 changed files with 58 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
json_object.c
View File

@@ -295,20 +295,35 @@ void json_object_set_serializer(json_object *jso,
/* extended conversion to string */
const char* json_object_to_json_string_length(struct json_object *jso, int flags, size_t *length)
{
const char *r = NULL;
size_t s = 0;
if (!jso)
{
s = 4;
r = "null";
}
else if ((jso->_pb) || (jso->_pb = printbuf_new()))
{
printbuf_reset(jso->_pb);
if(jso->_to_json_string(jso, jso->_pb, 0, flags) >= 0)
{
s = (size_t)jso->_pb->bpos;
r = jso->_pb->buf;
}
}
if (length)
*length = s;
return r;
}
const char* json_object_to_json_string_ext(struct json_object *jso, int flags)
{
if (!jso)
return "null";
if ((!jso->_pb) && !(jso->_pb = printbuf_new()))
return NULL;
printbuf_reset(jso->_pb);
if(jso->_to_json_string(jso, jso->_pb, 0, flags) < 0)
return NULL;
return jso->_pb->buf;
return json_object_to_json_string_length(jso, flags, NULL);
}
/* backwards-compatible conversion to string */

10
json_object.h
View File

@@ -223,6 +223,16 @@ extern const char* json_object_to_json_string(struct json_object *obj);
extern const char* json_object_to_json_string_ext(struct json_object *obj, int
flags);
/** Stringify object to json format
* @see json_object_to_json_string() for details on how to free string.
* @param obj the json_object instance
* @param flags formatting options, see JSON_C_TO_STRING_PRETTY and other constants
* @param length a pointer where, if not NULL, the length (without null) is stored
* @returns a string in JSON format and the length if not NULL
*/
extern const char* json_object_to_json_string_length(struct json_object *obj, int
flags, size_t *length);
/**
* Returns the userdata set by json_object_set_userdata() or
* json_object_set_serializer()

22
tests/test1.c
View File

@@ -28,7 +28,27 @@ static int sort_fn (const void *j1, const void *j2)
}
#ifdef TEST_FORMATTED
#define json_object_to_json_string(obj) json_object_to_json_string_ext(obj,sflags)
static const char *to_json_string(json_object *obj, int flags)
{
size_t length;
char *copy;
const char *result;
result = json_object_to_json_string_length(obj, flags, &length);
copy = strndup(result, length);
if (copy == NULL)
printf("to_json_string: Allocation failed!\n");
else {
result = json_object_to_json_string_ext(obj, flags);
if (length != strlen(result))
printf("to_json_string: Length mismatch!\n");
if (strcmp(copy, result) != 0)
printf("to_json_string: Comparison Failed!\n");
free(copy);
}
return result;
}
#define json_object_to_json_string(obj) to_json_string(obj,sflags)
#else
/* no special define */
#endif