libs
/
sunchb_cson
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move util functions

This commit is contained in:
sunchb 2020-02-26 11:16:38 +08:00
parent cf7d1953c9
commit 665193ad72
5 changed files with 77 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/cson_reflect.h
View File

@ -119,7 +119,7 @@ extern const reflect_item_t realReflectTbl[];
* @param obj: object to be operated. * @param obj: object to be operated.
* @param field: * @param field:
* @param tbl: property table of the type. * @param tbl: property table of the type.
* @param pIndex: return index of the field in tbl. * @param pIndex: return index of the field in tbl. @nullable
* *
* @return address of field. * @return address of field.
*/ */

14
inc/cson_util.h
View File

@ -4,20 +4,6 @@
#include "cson.h" #include "cson.h"
typedef union {
char c;
short s;
int i;
long long l;
}integer_val_t;
typedef struct {
integer_val_t val;
int size;
}integer_t;
int getIntegerValue(cson_t jo_tmp, int size, integer_val_t* i);
int checkIntegerValue(long long val, int size, integer_val_t* i);
long long getIntegerValueFromPointer(void* ptr, int size); long long getIntegerValueFromPointer(void* ptr, int size);
#endif #endif

78
src/cson_parser.c
View File

@ -46,6 +46,16 @@ json_obj_proc jsonObjDefaultTbl[] = {
NULL NULL
}; };
typedef union {
char c;
short s;
int i;
long long l;
}integer_val_t;
static int getIntegerValue(cson_t jo_tmp, int size, integer_val_t* i);
static int convertInteger(long long val, int size, integer_val_t* i);
static int checkInteger(long long val, int size);
static int csonJsonObj2Struct(cson_t jo, void* output, const reflect_item_t* tbl); static int csonJsonObj2Struct(cson_t jo, void* output, const reflect_item_t* tbl);
int csonJsonStr2Struct(const char* jstr, void* output, const reflect_item_t* tbl) int csonJsonStr2Struct(const char* jstr, void* output, const reflect_item_t* tbl)
@ -131,7 +141,6 @@ int parseJsonInteger(cson_t jo_tmp, void* output, const reflect_item_t* tbl, int
return ret; return ret;
} }
int parseJsonObject(cson_t jo_tmp, void* output, const reflect_item_t* tbl, int index) int parseJsonObject(cson_t jo_tmp, void* output, const reflect_item_t* tbl, int index)
{ {
return csonJsonObj2Struct(jo_tmp, (char*)output + tbl[index].offset, tbl[index].reflect_tbl); return csonJsonObj2Struct(jo_tmp, (char*)output + tbl[index].offset, tbl[index].reflect_tbl);
@ -176,9 +185,9 @@ int parseJsonArray(cson_t jo_tmp, void* output, const reflect_item_t* tbl, int i
} }
integer_val_t val; integer_val_t val;
if(checkIntegerValue(successCount, tbl[countIndex].size, &val) != ERR_NONE){ if(convertInteger(successCount, tbl[countIndex].size, &val) != ERR_NONE){
successCount = 0; successCount = 0;
} }
if (successCount == 0) { if (successCount == 0) {
csonSetPropertyFast(output, &successCount, tbl + countIndex); csonSetPropertyFast(output, &successCount, tbl + countIndex);
@ -292,3 +301,66 @@ int parseJsonRealDefault(cson_t jo_tmp, void* output, const reflect_item_t* tbl,
csonSetPropertyFast(output, &temp, tbl + index); csonSetPropertyFast(output, &temp, tbl + index);
return ERR_NONE; return ERR_NONE;
} }
int getIntegerValue(cson_t jo_tmp, int size, integer_val_t* i){
long long temp;
if(cson_typeof(jo_tmp) == CSON_INTEGER){
temp = cson_integer_value(jo_tmp);
}else if(cson_typeof(jo_tmp) == CSON_TRUE){
temp = 1;
}else if(cson_typeof(jo_tmp) == CSON_FALSE){
temp = 0;
}else if(cson_typeof(jo_tmp) == CSON_REAL){
double tempDouble = cson_real_value(jo_tmp);
if(tempDouble > LLONG_MAX || tempDouble < LLONG_MIN){
return ERR_OVERFLOW;
}else{
temp = tempDouble;
}
}else{
return ERR_ARGS;
}
return convertInteger(temp, size, i);
}
int convertInteger(long long val, int size, integer_val_t* i){
int ret = checkInteger(val, size);
if(ret != ERR_NONE) return ret;
/* avoid error on big endian */
if(size == sizeof(char)){
i->c = val;
}else if(size == sizeof(short)){
i->s = val;
}else if(size == sizeof(int)){
i->i = val;
}else{
i->l = val;
}
return ERR_NONE;
}
int checkInteger(long long val, int size){
if(size != sizeof(char) &&
size != sizeof(short) &&
size != sizeof(int) &&
size != sizeof(long long)){
return ERR_OVERFLOW;
}
if(size == sizeof(char) && (val > CHAR_MAX || val < CHAR_MIN)){
return ERR_OVERFLOW;
}else if(size == sizeof(short) && (val > SHRT_MAX || val < SHRT_MIN)){
return ERR_OVERFLOW;
}else if(size == sizeof(int) && (val > INT_MAX || val < INT_MIN)){
return ERR_OVERFLOW;
}else{
}
return ERR_NONE;
}

2
src/cson_reflect.c
View File

@ -95,7 +95,7 @@ void csonLoopProperty(void* pData, const reflect_item_t* tbl, loop_func_t func)
} }
long long size = getIntegerValueFromPointer(ptr, tbl[countIndex].size); long long size = getIntegerValueFromPointer(ptr, tbl[countIndex].size);
for (int j = 0; j < size; j++) { for (long long j = 0; j < size; j++) {
csonLoopProperty(*((char**)pProperty) + j * tbl[i].arraySize, tbl[i].reflect_tbl, func); csonLoopProperty(*((char**)pProperty) + j * tbl[i].arraySize, tbl[i].reflect_tbl, func);
} }
} else if (tbl[i].type == CSON_OBJECT) { } else if (tbl[i].type == CSON_OBJECT) {

83
src/cson_util.c
View File

@ -3,89 +3,6 @@
#include "limits.h" #include "limits.h"
#include "stdio.h" #include "stdio.h"
int getIntegerValue(cson_t jo_tmp, int size, integer_val_t* i){
long long temp;
if(size != sizeof(char) &&
size != sizeof(short) &&
size != sizeof(int) &&
size != sizeof(long long)){
return ERR_OVERFLOW;
}
if(cson_typeof(jo_tmp) == CSON_INTEGER){
temp = cson_integer_value(jo_tmp);
}else if(cson_typeof(jo_tmp) == CSON_TRUE){
temp = 1;
}else if(cson_typeof(jo_tmp) == CSON_FALSE){
temp = 0;
}else if(cson_typeof(jo_tmp) == CSON_REAL){
double tempDouble = cson_real_value(jo_tmp);
if(tempDouble > LLONG_MAX || tempDouble < LLONG_MIN){
return ERR_OVERFLOW;
}else{
temp = tempDouble;
}
}else{
return ERR_ARGS;
}
if(size == sizeof(char) && (temp > CHAR_MAX || temp < CHAR_MIN)){
return ERR_OVERFLOW;
}else if(size == sizeof(short) && (temp > SHRT_MAX || temp < SHRT_MIN)){
return ERR_OVERFLOW;
}else if(size == sizeof(int) && (temp > INT_MAX || temp < INT_MIN)){
return ERR_OVERFLOW;
}else{
}
/* avoid error on big endian */
if(size == sizeof(char)){
i->c = temp;
}else if(size == sizeof(short)){
i->s = temp;
}else if(size == sizeof(int)){
i->i = temp;
}else{
i->l = temp;
}
return ERR_NONE;
}
int checkIntegerValue(long long val, int size, integer_val_t* i){
if(size != sizeof(char) &&
size != sizeof(short) &&
size != sizeof(int) &&
size != sizeof(long long)){
return ERR_OVERFLOW;
}
if(size == sizeof(char) && (val > CHAR_MAX || val < CHAR_MIN)){
return ERR_OVERFLOW;
}else if(size == sizeof(short) && (val > SHRT_MAX || val < SHRT_MIN)){
return ERR_OVERFLOW;
}else if(size == sizeof(int) && (val > INT_MAX || val < INT_MIN)){
return ERR_OVERFLOW;
}else{
}
/* avoid error on big endian */
if(size == sizeof(char)){
i->c = val;
}else if(size == sizeof(short)){
i->s = val;
}else if(size == sizeof(int)){
i->i = val;
}else{
i->l = val;
}
return ERR_NONE;
}
long long getIntegerValueFromPointer(void* ptr, int size){ long long getIntegerValueFromPointer(void* ptr, int size){
long long ret = 0; long long ret = 0;