mirror of
https://github.com/DaveGamble/cJSON
synced 2025-04-26 13:17:56 +00:00
internal_configuration: Add case_sensitive
This commit is contained in:
parent
f02f79ecbb
commit
ba8fe0f479
6
cJSON.c
6
cJSON.c
@ -121,6 +121,7 @@ typedef struct internal_configuration
|
|||||||
size_t buffer_size;
|
size_t buffer_size;
|
||||||
cJSON_bool format;
|
cJSON_bool format;
|
||||||
cJSON_bool allow_data_after_json;
|
cJSON_bool allow_data_after_json;
|
||||||
|
cJSON_bool case_sensitive;
|
||||||
void *(*allocate)(size_t size);
|
void *(*allocate)(size_t size);
|
||||||
void (*deallocate)(void *pointer);
|
void (*deallocate)(void *pointer);
|
||||||
void *(*reallocate)(void *pointer, size_t size);
|
void *(*reallocate)(void *pointer, size_t size);
|
||||||
@ -150,6 +151,7 @@ static internal_configuration global_configuration = {
|
|||||||
256, /* default buffer size */
|
256, /* default buffer size */
|
||||||
true, /* enable formatting by default */
|
true, /* enable formatting by default */
|
||||||
true, /* allow data after the JSON by default */
|
true, /* allow data after the JSON by default */
|
||||||
|
true, /* case sensitive by default */
|
||||||
internal_malloc,
|
internal_malloc,
|
||||||
internal_free,
|
internal_free,
|
||||||
internal_realloc
|
internal_realloc
|
||||||
@ -1009,7 +1011,7 @@ static parse_buffer *skip_utf8_bom(parse_buffer * const buffer)
|
|||||||
/* Parse an object - create a new root, and populate. */
|
/* 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)
|
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 } };
|
parse_buffer buffer = { 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0 } };
|
||||||
cJSON *item = NULL;
|
cJSON *item = NULL;
|
||||||
|
|
||||||
/* reset global error position */
|
/* reset global error position */
|
||||||
@ -1199,7 +1201,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)
|
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 } };
|
printbuffer p = { 0, 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0 } };
|
||||||
|
|
||||||
if ((length < 0) || (buffer == NULL))
|
if ((length < 0) || (buffer == NULL))
|
||||||
{
|
{
|
||||||
|
@ -418,7 +418,7 @@ static void *failing_realloc(void *pointer, size_t size)
|
|||||||
|
|
||||||
static void ensure_should_fail_on_failed_realloc(void)
|
static void ensure_should_fail_on_failed_realloc(void)
|
||||||
{
|
{
|
||||||
printbuffer buffer = {NULL, 10, 0, 0, false, {256, false, true, &malloc, &free, &failing_realloc}};
|
printbuffer buffer = {NULL, 10, 0, 0, false, {256, false, true, true, &malloc, &free, &failing_realloc}};
|
||||||
buffer.buffer = (unsigned char*)malloc(100);
|
buffer.buffer = (unsigned char*)malloc(100);
|
||||||
TEST_ASSERT_NOT_NULL(buffer.buffer);
|
TEST_ASSERT_NOT_NULL(buffer.buffer);
|
||||||
|
|
||||||
@ -428,7 +428,7 @@ static void ensure_should_fail_on_failed_realloc(void)
|
|||||||
static void skip_utf8_bom_should_skip_bom(void)
|
static void skip_utf8_bom_should_skip_bom(void)
|
||||||
{
|
{
|
||||||
const unsigned char string[] = "\xEF\xBB\xBF{}";
|
const unsigned char string[] = "\xEF\xBB\xBF{}";
|
||||||
parse_buffer buffer = { 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0 } };
|
parse_buffer buffer = { 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0 } };
|
||||||
buffer.content = string;
|
buffer.content = string;
|
||||||
buffer.length = sizeof(string);
|
buffer.length = sizeof(string);
|
||||||
buffer.configuration = global_configuration;
|
buffer.configuration = global_configuration;
|
||||||
@ -440,7 +440,7 @@ static void skip_utf8_bom_should_skip_bom(void)
|
|||||||
static void skip_utf8_bom_should_not_skip_bom_if_not_at_beginning(void)
|
static void skip_utf8_bom_should_not_skip_bom_if_not_at_beginning(void)
|
||||||
{
|
{
|
||||||
const unsigned char string[] = " \xEF\xBB\xBF{}";
|
const unsigned char string[] = " \xEF\xBB\xBF{}";
|
||||||
parse_buffer buffer = { 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0 } };
|
parse_buffer buffer = { 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0 } };
|
||||||
buffer.content = string;
|
buffer.content = string;
|
||||||
buffer.length = sizeof(string);
|
buffer.length = sizeof(string);
|
||||||
buffer.configuration = global_configuration;
|
buffer.configuration = global_configuration;
|
||||||
|
@ -44,7 +44,7 @@ static void assert_is_array(cJSON *array_item)
|
|||||||
|
|
||||||
static void assert_not_array(const char *json)
|
static void assert_not_array(const char *json)
|
||||||
{
|
{
|
||||||
parse_buffer buffer = { 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0 } };
|
parse_buffer buffer = { 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0 } };
|
||||||
buffer.content = (const unsigned char*)json;
|
buffer.content = (const unsigned char*)json;
|
||||||
buffer.length = strlen(json) + sizeof("");
|
buffer.length = strlen(json) + sizeof("");
|
||||||
buffer.configuration = global_configuration;
|
buffer.configuration = global_configuration;
|
||||||
@ -55,7 +55,7 @@ static void assert_not_array(const char *json)
|
|||||||
|
|
||||||
static void assert_parse_array(const char *json)
|
static void assert_parse_array(const char *json)
|
||||||
{
|
{
|
||||||
parse_buffer buffer = { 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0 } };
|
parse_buffer buffer = { 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0 } };
|
||||||
buffer.content = (const unsigned char*)json;
|
buffer.content = (const unsigned char*)json;
|
||||||
buffer.length = strlen(json) + sizeof("");
|
buffer.length = strlen(json) + sizeof("");
|
||||||
buffer.configuration = global_configuration;
|
buffer.configuration = global_configuration;
|
||||||
|
@ -45,7 +45,7 @@ static void assert_is_number(cJSON *number_item)
|
|||||||
|
|
||||||
static void assert_parse_number(const char *string, int integer, double real)
|
static void assert_parse_number(const char *string, int integer, double real)
|
||||||
{
|
{
|
||||||
parse_buffer buffer = { 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0 } };
|
parse_buffer buffer = { 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0 } };
|
||||||
buffer.content = (const unsigned char*)string;
|
buffer.content = (const unsigned char*)string;
|
||||||
buffer.length = strlen(string) + sizeof("");
|
buffer.length = strlen(string) + sizeof("");
|
||||||
|
|
||||||
|
@ -52,7 +52,7 @@ static void assert_is_child(cJSON *child_item, const char *name, int type)
|
|||||||
|
|
||||||
static void assert_not_object(const char *json)
|
static void assert_not_object(const char *json)
|
||||||
{
|
{
|
||||||
parse_buffer parsebuffer = { 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0 } };
|
parse_buffer parsebuffer = { 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0 } };
|
||||||
parsebuffer.content = (const unsigned char*)json;
|
parsebuffer.content = (const unsigned char*)json;
|
||||||
parsebuffer.length = strlen(json) + sizeof("");
|
parsebuffer.length = strlen(json) + sizeof("");
|
||||||
parsebuffer.configuration = global_configuration;
|
parsebuffer.configuration = global_configuration;
|
||||||
@ -64,7 +64,7 @@ static void assert_not_object(const char *json)
|
|||||||
|
|
||||||
static void assert_parse_object(const char *json)
|
static void assert_parse_object(const char *json)
|
||||||
{
|
{
|
||||||
parse_buffer parsebuffer = { 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0 } };
|
parse_buffer parsebuffer = { 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0 } };
|
||||||
parsebuffer.content = (const unsigned char*)json;
|
parsebuffer.content = (const unsigned char*)json;
|
||||||
parsebuffer.length = strlen(json) + sizeof("");
|
parsebuffer.length = strlen(json) + sizeof("");
|
||||||
parsebuffer.configuration = global_configuration;
|
parsebuffer.configuration = global_configuration;
|
||||||
|
@ -45,7 +45,7 @@ static void assert_is_string(cJSON *string_item)
|
|||||||
|
|
||||||
static void assert_parse_string(const char *string, const char *expected)
|
static void assert_parse_string(const char *string, const char *expected)
|
||||||
{
|
{
|
||||||
parse_buffer buffer = { 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0 } };
|
parse_buffer buffer = { 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0 } };
|
||||||
buffer.content = (const unsigned char*)string;
|
buffer.content = (const unsigned char*)string;
|
||||||
buffer.length = strlen(string) + sizeof("");
|
buffer.length = strlen(string) + sizeof("");
|
||||||
buffer.configuration = global_configuration;
|
buffer.configuration = global_configuration;
|
||||||
@ -59,7 +59,7 @@ static void assert_parse_string(const char *string, const char *expected)
|
|||||||
|
|
||||||
static void assert_not_parse_string(const char * const string)
|
static void assert_not_parse_string(const char * const string)
|
||||||
{
|
{
|
||||||
parse_buffer buffer = { 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0 } };
|
parse_buffer buffer = { 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0 } };
|
||||||
buffer.content = (const unsigned char*)string;
|
buffer.content = (const unsigned char*)string;
|
||||||
buffer.length = strlen(string) + sizeof("");
|
buffer.length = strlen(string) + sizeof("");
|
||||||
buffer.configuration = global_configuration;
|
buffer.configuration = global_configuration;
|
||||||
|
@ -43,7 +43,7 @@ static void assert_is_value(cJSON *value_item, int type)
|
|||||||
|
|
||||||
static void assert_parse_value(const char *string, int type)
|
static void assert_parse_value(const char *string, int type)
|
||||||
{
|
{
|
||||||
parse_buffer buffer = { 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0 } };
|
parse_buffer buffer = { 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0 } };
|
||||||
buffer.content = (const unsigned char*) string;
|
buffer.content = (const unsigned char*) string;
|
||||||
buffer.length = strlen(string) + sizeof("");
|
buffer.length = strlen(string) + sizeof("");
|
||||||
buffer.configuration = global_configuration;
|
buffer.configuration = global_configuration;
|
||||||
|
@ -31,10 +31,10 @@ static void assert_print_array(const char * const expected, const char * const i
|
|||||||
|
|
||||||
cJSON item[1];
|
cJSON item[1];
|
||||||
|
|
||||||
printbuffer formatted_buffer = { 0, 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0 } };
|
printbuffer formatted_buffer = { 0, 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0 } };
|
||||||
printbuffer unformatted_buffer = { 0, 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0 } };
|
printbuffer unformatted_buffer = { 0, 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0 } };
|
||||||
|
|
||||||
parse_buffer parsebuffer = { 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0 } };
|
parse_buffer parsebuffer = { 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0 } };
|
||||||
parsebuffer.content = (const unsigned char*)input;
|
parsebuffer.content = (const unsigned char*)input;
|
||||||
parsebuffer.length = strlen(input) + sizeof("");
|
parsebuffer.length = strlen(input) + sizeof("");
|
||||||
parsebuffer.configuration = global_configuration;
|
parsebuffer.configuration = global_configuration;
|
||||||
|
@ -28,7 +28,7 @@ static void assert_print_number(const char *expected, double input)
|
|||||||
{
|
{
|
||||||
unsigned char printed[1024];
|
unsigned char printed[1024];
|
||||||
cJSON item[1];
|
cJSON item[1];
|
||||||
printbuffer buffer = { 0, 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0 } };
|
printbuffer buffer = { 0, 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0 } };
|
||||||
buffer.buffer = printed;
|
buffer.buffer = printed;
|
||||||
buffer.length = sizeof(printed);
|
buffer.length = sizeof(printed);
|
||||||
buffer.offset = 0;
|
buffer.offset = 0;
|
||||||
|
@ -31,9 +31,9 @@ static void assert_print_object(const char * const expected, const char * const
|
|||||||
|
|
||||||
cJSON item[1];
|
cJSON item[1];
|
||||||
|
|
||||||
printbuffer formatted_buffer = { 0, 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0 } };
|
printbuffer formatted_buffer = { 0, 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0 } };
|
||||||
printbuffer unformatted_buffer = { 0, 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0 } };
|
printbuffer unformatted_buffer = { 0, 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0 } };
|
||||||
parse_buffer parsebuffer = { 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0 } };
|
parse_buffer parsebuffer = { 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0 } };
|
||||||
|
|
||||||
/* buffer for parsing */
|
/* buffer for parsing */
|
||||||
parsebuffer.content = (const unsigned char*)input;
|
parsebuffer.content = (const unsigned char*)input;
|
||||||
|
@ -27,7 +27,7 @@
|
|||||||
static void assert_print_string(const char *expected, const char *input)
|
static void assert_print_string(const char *expected, const char *input)
|
||||||
{
|
{
|
||||||
unsigned char printed[1024];
|
unsigned char printed[1024];
|
||||||
printbuffer buffer = { 0, 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0 } };
|
printbuffer buffer = { 0, 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0 } };
|
||||||
buffer.buffer = printed;
|
buffer.buffer = printed;
|
||||||
buffer.length = sizeof(printed);
|
buffer.length = sizeof(printed);
|
||||||
buffer.offset = 0;
|
buffer.offset = 0;
|
||||||
|
@ -32,8 +32,8 @@ static void assert_print_value(const char *input)
|
|||||||
{
|
{
|
||||||
unsigned char printed[1024];
|
unsigned char printed[1024];
|
||||||
cJSON item[1];
|
cJSON item[1];
|
||||||
printbuffer buffer = { 0, 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0 } };
|
printbuffer buffer = { 0, 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0 } };
|
||||||
parse_buffer parsebuffer = { 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0 } };
|
parse_buffer parsebuffer = { 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0 } };
|
||||||
buffer.buffer = printed;
|
buffer.buffer = printed;
|
||||||
buffer.length = sizeof(printed);
|
buffer.length = sizeof(printed);
|
||||||
buffer.offset = 0;
|
buffer.offset = 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user