Merge pull request #952 from fengzeroz/main

new type: WORD/DWORD/LWORD
This commit is contained in:
fengzeroz
2022-12-01 13:56:52 +08:00
committed by GitHub
3 changed files with 9 additions and 0 deletions
+3
View File
@@ -48,6 +48,7 @@ int wrap_tag_data(neu_json_read_resp_tag_t *json_tag,
json_tag->t = NEU_JSON_INT;
json_tag->value.val_int = tag_value->value.value.i16;
break;
case NEU_TYPE_WORD:
case NEU_TYPE_UINT16:
json_tag->t = NEU_JSON_INT;
json_tag->value.val_int = tag_value->value.value.u16;
@@ -56,6 +57,7 @@ int wrap_tag_data(neu_json_read_resp_tag_t *json_tag,
json_tag->t = NEU_JSON_INT;
json_tag->value.val_int = tag_value->value.value.i32;
break;
case NEU_TYPE_DWORD:
case NEU_TYPE_UINT32:
json_tag->t = NEU_JSON_INT;
json_tag->value.val_int = tag_value->value.value.u32;
@@ -64,6 +66,7 @@ int wrap_tag_data(neu_json_read_resp_tag_t *json_tag,
json_tag->t = NEU_JSON_INT;
json_tag->value.val_int = tag_value->value.value.i64;
break;
case NEU_TYPE_LWORD:
case NEU_TYPE_UINT64:
json_tag->t = NEU_JSON_INT;
json_tag->value.val_int = tag_value->value.value.u64;
+3
View File
@@ -102,14 +102,17 @@ static int tag_values_to_json(neu_resp_tag_value_t *tags, uint16_t len,
json->tags[i].t = NEU_JSON_INT;
json->tags[i].value.val_int = tag->value.value.i64;
break;
case NEU_TYPE_WORD:
case NEU_TYPE_UINT16:
json->tags[i].t = NEU_JSON_INT;
json->tags[i].value.val_int = tag->value.value.u16;
break;
case NEU_TYPE_DWORD:
case NEU_TYPE_UINT32:
json->tags[i].t = NEU_JSON_INT;
json->tags[i].value.val_int = tag->value.value.u32;
break;
case NEU_TYPE_LWORD:
case NEU_TYPE_UINT64:
json->tags[i].t = NEU_JSON_INT;
json->tags[i].value.val_int = tag->value.value.u64;
+3
View File
@@ -125,6 +125,7 @@ void handle_read_resp(nng_aio *aio, neu_resp_read_group_t *resp)
api_res.tags[i].t = NEU_JSON_INT;
api_res.tags[i].value.val_int = resp->tags[i].value.value.i16;
break;
case NEU_TYPE_WORD:
case NEU_TYPE_UINT16:
api_res.tags[i].t = NEU_JSON_INT;
api_res.tags[i].value.val_int = resp->tags[i].value.value.u16;
@@ -133,6 +134,7 @@ void handle_read_resp(nng_aio *aio, neu_resp_read_group_t *resp)
api_res.tags[i].t = NEU_JSON_INT;
api_res.tags[i].value.val_int = resp->tags[i].value.value.i32;
break;
case NEU_TYPE_DWORD:
case NEU_TYPE_UINT32:
api_res.tags[i].t = NEU_JSON_INT;
api_res.tags[i].value.val_int = resp->tags[i].value.value.u32;
@@ -141,6 +143,7 @@ void handle_read_resp(nng_aio *aio, neu_resp_read_group_t *resp)
api_res.tags[i].t = NEU_JSON_INT;
api_res.tags[i].value.val_int = resp->tags[i].value.value.i64;
break;
case NEU_TYPE_LWORD:
case NEU_TYPE_UINT64:
api_res.tags[i].t = NEU_JSON_INT;
api_res.tags[i].value.val_int = resp->tags[i].value.value.u64;