AIR/tiny-json
1
0
Fork 0
mirror of https://github.com/rafagafe/tiny-json.git synced 2024-11-17 11:35:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2 from PetersSharp/master

Browse Source 
update warning unnamed structs/unions
This commit is contained in:
rafagafe 2018-04-28 01:31:49 +02:00 committed by GitHub
commit b1d8a0cbd6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -1,4 +1,7 @@
# tiny-json
- update warning: "ISO C99 doesn't support unnamed structs/unions"
tiny-json is a versatile and easy to use json parser in C suitable for embedded systems. It is fast, robust and portable.
It is not only a tokenizer. You can get data in string format or get the primitives values in C type variables without performance loss.

20
tiny-json.c
View File

@ -30,7 +30,7 @@ typedef struct jsonPool_s {
/* Search a property by its name in a JSON object. */
json_t const* json_getProperty( json_t const* obj, char const* property ) {
json_t const* sibling;
for( sibling = obj->u.child; sibling; sibling = sibling->sibling )
for( sibling = obj->u.c.child; sibling; sibling = sibling->sibling )
if ( sibling->name && !strcmp( sibling->name, property ) )
return sibling;
return 0;
@ -63,7 +63,7 @@ json_t const* json_create( char* str, json_t mem[], unsigned int qty ) {
json_t* obj = poolInit( &pool );
obj->name = 0;
obj->sibling = 0;
obj->u.child = 0;
obj->u.c.child = 0;
ptr = objValue( ptr, obj, &pool );
if ( !ptr ) return 0;
return obj;
@ -300,12 +300,12 @@ static char* numValue( char* ptr, json_t* property ) {
* @param property The handler of the property to be added. */
static void add( json_t* obj, json_t* property ) {
property->sibling = 0;
if ( !obj->u.child ){
obj->u.child = property;
obj->u.last_child = property;
if ( !obj->u.c.child ){
obj->u.c.child = property;
obj->u.c.last_child = property;
} else {
obj->u.last_child->sibling = property;
obj->u.last_child = property;
obj->u.c.last_child->sibling = property;
obj->u.c.last_child = property;
}
}
@ -316,7 +316,7 @@ static void add( json_t* obj, json_t* property ) {
* @retval Null pointer if any error occur. */
static char* objValue( char* ptr, json_t* obj, jsonPool_t* pool ) {
obj->type = JSON_OBJ;
obj->u.child = 0;
obj->u.c.child = 0;
obj->sibling = 0;
ptr++;
for(;;) {
@ -349,14 +349,14 @@ static char* objValue( char* ptr, json_t* obj, jsonPool_t* pool ) {
switch( *ptr ) {
case '{':
property->type = JSON_OBJ;
property->u.child = 0;
property->u.c.child = 0;
property->sibling = obj;
obj = property;
++ptr;
break;
case '[':
property->type = JSON_ARRAY;
property->u.child = 0;
property->u.c.child = 0;
property->sibling = obj;
obj = property;
++ptr;

10
tiny-json.h
View File

@ -43,10 +43,10 @@ typedef struct json_s {
char const* name;
union {
char const* value;
struct {
struct json_s* child;
struct json_s* last_child;
};
struct {
struct json_s* child;
struct json_s* last_child;
} c;
} u;
jsonType_t type;
} json_t;
@ -112,7 +112,7 @@ char const* json_getPropertyValue( json_t const* obj, char const* property );
* @retval The handler of the first property if there is.
* @retval Null pointer if the json object has not properties. */
static inline json_t const* json_getChild( json_t const* json ) {
return json->u.child;
return json->u.c.child;
}
/** Get the value of a json boolean property.