diff --git a/include/neuron/json/json.h b/include/neuron/json/json.h index 9b82bf79d..0c0a23fdb 100644 --- a/include/neuron/json/json.h +++ b/include/neuron/json/json.h @@ -61,63 +61,63 @@ typedef enum neu_json_type { } neu_json_type_e; typedef struct { - int8_t * i8s; - uint16_t length; + int8_t *i8s; + size_t length; } neu_json_value_array_int8_t; typedef struct { uint8_t *u8s; - uint16_t length; + size_t length; } neu_json_value_array_uint8_t; typedef struct { int16_t *i16s; - uint16_t length; + size_t length; } neu_json_value_array_int16_t; typedef struct { uint16_t *u16s; - uint16_t length; + size_t length; } neu_json_value_array_uint16_t; typedef struct { int32_t *i32s; - uint16_t length; + size_t length; } neu_json_value_array_int32_t; typedef struct { uint32_t *u32s; - uint16_t length; + size_t length; } neu_json_value_array_uint32_t; typedef struct { int64_t *i64s; - uint16_t length; + size_t length; } neu_json_value_array_int64_t; typedef struct { uint64_t *u64s; - uint16_t length; + size_t length; } neu_json_value_array_uint64_t; typedef struct { - float * f32s; - uint16_t length; + float *f32s; + size_t length; } neu_json_value_array_float_t; typedef struct { - double * f64s; - uint16_t length; + double *f64s; + size_t length; } neu_json_value_array_double_t; typedef struct { - bool * bools; - uint16_t length; + bool * bools; + size_t length; } neu_json_value_array_bool_t; typedef struct { - char ** p_strs; - uint16_t length; + char **p_strs; + size_t length; } neu_json_value_array_str_t; typedef union neu_json_value { diff --git a/plugins/restful/rw_handle.c b/plugins/restful/rw_handle.c index 52ee222ce..c672101e0 100644 --- a/plugins/restful/rw_handle.c +++ b/plugins/restful/rw_handle.c @@ -713,8 +713,8 @@ static void trans(neu_json_write_gtags_req_t *req, neu_req_write_gtags_t *cmd) req->groups[i].tags[k].value.val_array_bool.length; cmd->groups[i].tags[k].value.value.bools.bools = - calloc(sizeof(bool), - req->groups[i].tags[k].value.val_array_bool.length); + calloc(req->groups[i].tags[k].value.val_array_bool.length, + sizeof(bool)); memcpy(cmd->groups[i].tags[k].value.value.bools.bools, req->groups[i].tags[k].value.val_array_bool.bools, sizeof(bool) * diff --git a/src/core/manager.c b/src/core/manager.c index 99560a87c..ba5f26ac4 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -1987,7 +1987,7 @@ inline static void notify_monitor(neu_manager_t * manager, // monitor not ready, ignore neu_node_manager_t *mgr = manager->node_manager; struct sockaddr_un addr = neu_node_manager_get_addr(mgr, "monitor"); - if (0 == addr.sun_path[1]) { + if ('\0' == addr.sun_path[1]) { return; } diff --git a/src/utils/json.c b/src/utils/json.c index bead79bb8..a97aa7abd 100644 --- a/src/utils/json.c +++ b/src/utils/json.c @@ -105,7 +105,7 @@ void neu_json_elem_free(neu_json_elem_t *elem) free(elem->v.val_array_double.f64s); break; case NEU_JSON_ARRAY_STR: - for (int i = 0; i < elem->v.val_array_str.length; ++i) { + for (size_t i = 0; i < elem->v.val_array_str.length; ++i) { free(elem->v.val_array_str.p_strs[i]); } free(elem->v.val_array_str.p_strs); @@ -207,7 +207,7 @@ static json_t *encode_object(json_t *object, neu_json_elem_t ele) case NEU_JSON_ARRAY_BOOL: { void *array = json_array(); - for (int i = 0; i < ele.v.val_array_bool.length; i++) { + for (size_t i = 0; i < ele.v.val_array_bool.length; i++) { json_array_append_new(array, json_boolean(ele.v.val_array_bool.bools[i])); } @@ -218,7 +218,7 @@ static json_t *encode_object(json_t *object, neu_json_elem_t ele) case NEU_JSON_ARRAY_INT8: { void *array = json_array(); - for (int i = 0; i < ele.v.val_array_int8.length; i++) { + for (size_t i = 0; i < ele.v.val_array_int8.length; i++) { json_array_append_new(array, json_integer(ele.v.val_array_int8.i8s[i])); } @@ -229,7 +229,7 @@ static json_t *encode_object(json_t *object, neu_json_elem_t ele) case NEU_JSON_ARRAY_UINT8: { void *array = json_array(); - for (int i = 0; i < ele.v.val_array_uint8.length; i++) { + for (size_t i = 0; i < ele.v.val_array_uint8.length; i++) { json_array_append_new(array, json_integer(ele.v.val_array_uint8.u8s[i])); } @@ -240,7 +240,7 @@ static json_t *encode_object(json_t *object, neu_json_elem_t ele) case NEU_JSON_ARRAY_INT16: { void *array = json_array(); - for (int i = 0; i < ele.v.val_array_int16.length; i++) { + for (size_t i = 0; i < ele.v.val_array_int16.length; i++) { json_array_append_new(array, json_integer(ele.v.val_array_int16.i16s[i])); } @@ -251,7 +251,7 @@ static json_t *encode_object(json_t *object, neu_json_elem_t ele) case NEU_JSON_ARRAY_UINT16: { void *array = json_array(); - for (int i = 0; i < ele.v.val_array_uint16.length; i++) { + for (size_t i = 0; i < ele.v.val_array_uint16.length; i++) { json_array_append_new(array, json_integer(ele.v.val_array_uint16.u16s[i])); } @@ -262,7 +262,7 @@ static json_t *encode_object(json_t *object, neu_json_elem_t ele) case NEU_JSON_ARRAY_INT32: { void *array = json_array(); - for (int i = 0; i < ele.v.val_array_int32.length; i++) { + for (size_t i = 0; i < ele.v.val_array_int32.length; i++) { json_array_append_new(array, json_integer(ele.v.val_array_int32.i32s[i])); } @@ -273,7 +273,7 @@ static json_t *encode_object(json_t *object, neu_json_elem_t ele) case NEU_JSON_ARRAY_UINT32: { void *array = json_array(); - for (int i = 0; i < ele.v.val_array_uint32.length; i++) { + for (size_t i = 0; i < ele.v.val_array_uint32.length; i++) { json_array_append_new(array, json_integer(ele.v.val_array_uint32.u32s[i])); } @@ -284,7 +284,7 @@ static json_t *encode_object(json_t *object, neu_json_elem_t ele) case NEU_JSON_ARRAY_INT64: { void *array = json_array(); - for (int i = 0; i < ele.v.val_array_int64.length; i++) { + for (size_t i = 0; i < ele.v.val_array_int64.length; i++) { json_array_append_new(array, json_integer(ele.v.val_array_int64.i64s[i])); } @@ -295,7 +295,7 @@ static json_t *encode_object(json_t *object, neu_json_elem_t ele) case NEU_JSON_ARRAY_UINT64: { void *array = json_array(); - for (int i = 0; i < ele.v.val_array_uint64.length; i++) { + for (size_t i = 0; i < ele.v.val_array_uint64.length; i++) { json_array_append_new(array, json_integer(ele.v.val_array_uint64.u64s[i])); } @@ -306,7 +306,7 @@ static json_t *encode_object(json_t *object, neu_json_elem_t ele) case NEU_JSON_ARRAY_FLOAT: { void *array = json_array(); - for (int i = 0; i < ele.v.val_array_float.length; i++) { + for (size_t i = 0; i < ele.v.val_array_float.length; i++) { json_array_append_new(array, json_real(ele.v.val_array_float.f32s[i])); } @@ -317,7 +317,7 @@ static json_t *encode_object(json_t *object, neu_json_elem_t ele) case NEU_JSON_ARRAY_DOUBLE: { void *array = json_array(); - for (int i = 0; i < ele.v.val_array_double.length; i++) { + for (size_t i = 0; i < ele.v.val_array_double.length; i++) { json_array_append_new(array, json_real(ele.v.val_array_double.f64s[i])); } @@ -328,7 +328,7 @@ static json_t *encode_object(json_t *object, neu_json_elem_t ele) case NEU_JSON_ARRAY_STR: { void *array = json_array(); - for (int i = 0; i < ele.v.val_array_str.length; i++) { + for (size_t i = 0; i < ele.v.val_array_str.length; i++) { json_array_append_new(array, json_string(ele.v.val_array_str.p_strs[i])); } @@ -388,7 +388,7 @@ static json_t *encode_object_ecp(json_t *object, neu_json_elem_t ele) #define ENCODE_ARRAY_TO_STRING(TYPE, FIELD, DATA, FORMAT) \ case TYPE: { \ size_t buffer_size = 2; \ - for (int i = 0; i < ele.v.FIELD.length; i++) { \ + for (size_t i = 0; i < ele.v.FIELD.length; i++) { \ buffer_size += snprintf(NULL, 0, FORMAT, ele.v.FIELD.DATA[i]) + 2; \ } \ char *array_str = (char *) malloc(buffer_size); \ @@ -397,7 +397,7 @@ static json_t *encode_object_ecp(json_t *object, neu_json_elem_t ele) } \ char *ptr = array_str; \ *ptr++ = '['; \ - for (int i = 0; i < ele.v.FIELD.length; i++) { \ + for (size_t i = 0; i < ele.v.FIELD.length; i++) { \ int len = sprintf(ptr, FORMAT, ele.v.FIELD.DATA[i]); \ ptr += len; \ if (i < ele.v.FIELD.length - 1) { \ @@ -438,7 +438,7 @@ static json_t *encode_object_ecp(json_t *object, neu_json_elem_t ele) case NEU_JSON_ARRAY_STR: { size_t buffer_size = 2; - for (int i = 0; i < ele.v.val_array_str.length; i++) { + for (size_t i = 0; i < ele.v.val_array_str.length; i++) { buffer_size += snprintf(NULL, 0, "\"%s\"", ele.v.val_array_str.p_strs[i]) + 2; } @@ -451,7 +451,7 @@ static json_t *encode_object_ecp(json_t *object, neu_json_elem_t ele) char *ptr = array_str; *ptr++ = '['; - for (int i = 0; i < ele.v.val_array_str.length; i++) { + for (size_t i = 0; i < ele.v.val_array_str.length; i++) { int len = sprintf(ptr, "\"%s\"", ele.v.val_array_str.p_strs[i]); ptr += len;