mirror/cJSON
1
0
Fork 0
mirror of https://github.com/DaveGamble/cJSON.git synced 2023-08-10 21:13:26 +03:00
Code Issues Projects Releases Wiki Activity

default_configuration: Macro for the internal_configuration defaults

Browse Source
This commit is contained in:
Max Bruckner
2018-02-01 02:01:17 +01:00
parent 99ad8cc64b
commit 69f8bb7778
12 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cJSON.c
View File

@@ -149,15 +149,17 @@ static void *internal_realloc(void *pointer, size_t size)
#define internal_realloc realloc
#endif
static internal_configuration global_configuration = {
256, /* default buffer size */
true, /* enable formatting by default */
true, /* allow data after the JSON by default */
true, /* case sensitive by default */
internal_malloc,
internal_free,
internal_realloc
};
#define default_configuration {\
256, /* default buffer size */\
true, /* enable formatting by default */\
true, /* allow data after the JSON by default */\
true, /* case sensitive by default */\
internal_malloc,\
internal_free,\
internal_realloc\
}
static internal_configuration global_configuration = default_configuration;
static unsigned char* custom_strdup(const unsigned char* string, const internal_configuration * const configuration)
{
@@ -1013,7 +1015,7 @@ static parse_buffer *skip_utf8_bom(parse_buffer * const buffer)
/* Parse an object - create a new root, and populate. */
static cJSON *parse(const char * const json, const internal_configuration * const configuration, size_t *end_position)
{
parse_buffer buffer = { 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0 } };
parse_buffer buffer = { 0, 0, 0, 0, default_configuration };
cJSON *item = NULL;
/* reset global error position */
@@ -1203,7 +1205,7 @@ CJSON_PUBLIC(char *) cJSON_PrintBuffered(const cJSON *item, int prebuffer, cJSON
CJSON_PUBLIC(cJSON_bool) cJSON_PrintPreallocated(cJSON *item, char *buffer, const int length, const cJSON_bool format)
{
printbuffer p = { 0, 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0 } };
printbuffer p = { 0, 0, 0, 0, 0, default_configuration};
if ((length < 0) || (buffer == NULL))
{