From ba1166932467b7379d5af7d415c7fac34c8a2c4a Mon Sep 17 00:00:00 2001 From: huangxin Date: Tue, 18 Apr 2023 09:01:15 +0800 Subject: [PATCH] =?UTF-8?q?OCT=201.=20=E6=9B=B4=E6=AD=A3ARRAY=5FSIZE?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- srcs/libs/protocol/protocol.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/srcs/libs/protocol/protocol.c b/srcs/libs/protocol/protocol.c index 3c7c92f..b87806d 100644 --- a/srcs/libs/protocol/protocol.c +++ b/srcs/libs/protocol/protocol.c @@ -12,6 +12,7 @@ #include "zlog_module.h" #ifdef JSON_SCHEMA_ON #include "json_schema/jsoncdaccord.h" +#include "common.h" #endif #define CURRENT_PROTOCOL_VERSION (1) @@ -30,14 +31,14 @@ typedef struct { } JSON_SCHEMA_CTX, *PJSON_SCHEMA_CTX; static JSON_SCHEMA_CTX g_json_sch[] = { - {"{\"type\":\"object\",\"required\":[\"ver\"]}", "Missing required field [ver]" }, - {"{\"type\":\"object\",\"required\":[\"cryptoType\"]}", "Missing required field [cryptoType]" }, - {"{\"type\":\"object\",\"required\":[\"timeStamp\"]}", "Missing required field [timeStamp]" }, - {"{\"type\":\"object\",\"required\":[\"msgContent\"]}", "Missing required field [msgContent]" }, - {"{\"properties\":{\"ver\":{\"type\":\"integer\"}}}", "[ver] should be an integer value" }, - {"{\"properties\":{\"cryptoType\":{\"type\":\"integer\"}}}", "[cryptoType] should be an integer value"}, - {"{\"properties\":{\"cryptoType\":{\"minimum\":0,\"maximum\":4}}}", "Undefined type in field [cryptoType]" }, - {"{\"properties\":{\"timeStamp\":{\"type\":\"integer\"}}}", "[timeStamp] should be an integer value" }, + {"{\"type\":\"object\",\"required\":[\"ver\"]}", "Missing required field [ver]" }, + {"{\"type\":\"object\",\"required\":[\"cryptoType\"]}", "Missing required field [cryptoType]" }, + {"{\"type\":\"object\",\"required\":[\"timeStamp\"]}", "Missing required field [timeStamp]" }, + {"{\"type\":\"object\",\"required\":[\"msgContent\"]}", "Missing required field [msgContent]" }, + {"{\"properties\":{\"ver\":{\"type\":\"integer\"}}}", "[ver] should be an integer value" }, + {"{\"properties\":{\"cryptoType\":{\"type\":\"integer\"}}}", "[cryptoType] should be an integer value"}, + {"{\"properties\":{\"cryptoType\":{\"minimum\":0,\"maximum\":4}}}", "Undefined type in field [cryptoType]" }, + {"{\"properties\":{\"timeStamp\":{\"type\":\"integer\"}}}", "[timeStamp] should be an integer value" }, }; const char *proto_schema_validation(const char *pJsonStr) { @@ -115,7 +116,7 @@ const char *proto_decode_context(const char *pString, unsigned int *pVer, unsign char *pMsgContent = NULL; cJSON *pRoot; #ifdef JSON_SCHEMA_ON - const char *pSchJson; + const char *pSchJson; #endif if (pErrCode == NULL) {