From b559a941bd0f554bdf4dc46fca30d737e959ce5d Mon Sep 17 00:00:00 2001 From: Kemin <541416002@qq.com> Date: Thu, 28 Jul 2022 18:15:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E5=91=8A=E8=AD=A6=E5=87=BD=E6=95=B0=E5=BD=A2=E5=8F=82=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../services/core/adapter/cert_adapter.c | 16 ++++++++-------- .../services/core/adapter/cert_adapter_mock.c | 16 ++++++++-------- .../services/core/adapter/cert_adapter_os.c | 17 ++++++++--------- .../services/core/cert/cert_service.c | 6 +++--- .../services/core/cert/cert_service_active.c | 2 +- .../services/core/cert/cert_service_auth.c | 8 ++++---- .../services/core/cert/cert_service_challenge.c | 2 +- .../services/core/cert/cert_service_device.c | 14 +++++++------- cert_mgr_service/services/core/cert_entry.c | 2 +- cert_mgr_service/services/core/cert_entry.h | 2 +- .../core/include/adapter/cert_adapter.h | 16 ++++++++-------- .../core/include/adapter/cert_adapter_mock.h | 16 ++++++++-------- .../core/include/adapter/cert_adapter_os.h | 16 ++++++++-------- .../services/core/include/cert/cert_service.h | 2 +- .../core/include/cert/cert_service_auth.h | 8 ++++---- .../core/include/cert/cert_service_challenge.h | 2 +- .../core/include/cert/cert_service_device.h | 12 ++++++------ .../core/include/network/cert_network.h | 2 +- .../services/core/include/utils/cert_utils.h | 4 ++-- .../core/include/utils/cert_utils_memleak.h | 6 +++--- .../core/include/utils/cert_utils_timer.h | 2 +- .../services/core/network/cert_network.c | 2 +- .../services/core/utils/cert_utils.c | 2 +- .../services/core/utils/cert_utils_memleak.c | 6 +++--- 24 files changed, 90 insertions(+), 91 deletions(-) diff --git a/cert_mgr_service/services/core/adapter/cert_adapter.c b/cert_mgr_service/services/core/adapter/cert_adapter.c index b92cd38..bf77302 100644 --- a/cert_mgr_service/services/core/adapter/cert_adapter.c +++ b/cert_mgr_service/services/core/adapter/cert_adapter.c @@ -147,7 +147,7 @@ int32_t CertGetProductKey(uint8_t productId[], uint32_t len) return OEMGetProductKey((char*)productId, len); } -char* CertGetVersionId() +char* CertGetVersionId(void) { if (CERT_MOCK_DEVICE_STUB_FLAG) { return OsGetVersionIdStub(); @@ -155,7 +155,7 @@ char* CertGetVersionId() return OsGetVersionId(); } -char* CertGetBuildRootHash() +char* CertGetBuildRootHash(void) { if (CERT_MOCK_DEVICE_STUB_FLAG) { return OsGetBuildRootHashStub(); @@ -163,7 +163,7 @@ char* CertGetBuildRootHash() return OsGetBuildRootHash(); } -char* CertGetDisplayVersion() +char* CertGetDisplayVersion(void) { if (CERT_MOCK_DEVICE_STUB_FLAG) { return OsGetDisplayVersionStub(); @@ -171,7 +171,7 @@ char* CertGetDisplayVersion() return OsGetDisplayVersion(); } -char* CertGetManufacture() +char* CertGetManufacture(void) { if (CERT_MOCK_DEVICE_STUB_FLAG) { return OsGetManufactureStub(); @@ -179,7 +179,7 @@ char* CertGetManufacture() return OsGetManufacture(); } -char* CertGetProductModel() +char* CertGetProductModel(void) { if (CERT_MOCK_DEVICE_STUB_FLAG) { return OsGetProductModelStub(); @@ -187,7 +187,7 @@ char* CertGetProductModel() return OsGetProductModel(); } -char* CertGetBrand() +char* CertGetBrand(void) { if (CERT_MOCK_DEVICE_STUB_FLAG) { return OsGetBrandStub(); @@ -195,7 +195,7 @@ char* CertGetBrand() return OsGetBrand(); } -char* CertGetSecurityPatchTag() +char* CertGetSecurityPatchTag(void) { if (CERT_MOCK_DEVICE_STUB_FLAG) { return OsGetSecurityPatchTagStub(); @@ -203,7 +203,7 @@ char* CertGetSecurityPatchTag() return OsGetSecurityPatchTag(); } -char* CertGetUdid() +char* CertGetUdid(void) { if (CERT_MOCK_DEVICE_STUB_FLAG) { return OsGetUdidStub(); diff --git a/cert_mgr_service/services/core/adapter/cert_adapter_mock.c b/cert_mgr_service/services/core/adapter/cert_adapter_mock.c index 612d62a..4a559d1 100644 --- a/cert_mgr_service/services/core/adapter/cert_adapter_mock.c +++ b/cert_mgr_service/services/core/adapter/cert_adapter_mock.c @@ -104,42 +104,42 @@ static char* GetDeviceParaStub(const char* key) return value; } -char* OsGetVersionIdStub() +char* OsGetVersionIdStub(void) { return GetDeviceParaStub("versionId"); } -char* OsGetBuildRootHashStub() +char* OsGetBuildRootHashStub(void) { return GetDeviceParaStub("buildRootHash"); } -char* OsGetDisplayVersionStub() +char* OsGetDisplayVersionStub(void) { return GetDeviceParaStub("displayVersion"); } -char* OsGetManufactureStub() +char* OsGetManufactureStub(void) { return GetDeviceParaStub("manufacture"); } -char* OsGetProductModelStub() +char* OsGetProductModelStub(void) { return GetDeviceParaStub("productModel"); } -char* OsGetBrandStub() +char* OsGetBrandStub(void) { return GetDeviceParaStub("brand"); } -char* OsGetSecurityPatchTagStub() +char* OsGetSecurityPatchTagStub(void) { return GetDeviceParaStub("securityPatchTag"); } -char* OsGetUdidStub() +char* OsGetUdidStub(void) { char* manufacture = NULL; char* model = NULL; diff --git a/cert_mgr_service/services/core/adapter/cert_adapter_os.c b/cert_mgr_service/services/core/adapter/cert_adapter_os.c index 648e48a..36a8a28 100644 --- a/cert_mgr_service/services/core/adapter/cert_adapter_os.c +++ b/cert_mgr_service/services/core/adapter/cert_adapter_os.c @@ -16,45 +16,44 @@ #include "parameter.h" #include "cert_type.h" #include "cert_utils.h" -#include "cert_utils_log.h" #include "cert_adapter_os.h" -char* OsGetVersionId() +char* OsGetVersionId(void) { return CertStrdup(GetVersionId()); } -char* OsGetBuildRootHash() +char* OsGetBuildRootHash(void) { return CertStrdup(GetBuildRootHash()); } -char* OsGetDisplayVersion() +char* OsGetDisplayVersion(void) { return CertStrdup(GetDisplayVersion()); } -char* OsGetManufacture() +char* OsGetManufacture(void) { return CertStrdup(GetManufacture()); } -char* OsGetProductModel() +char* OsGetProductModel(void) { return CertStrdup(GetProductModel()); } -char* OsGetBrand() +char* OsGetBrand(void) { return CertStrdup(GetBrand()); } -char* OsGetSecurityPatchTag() +char* OsGetSecurityPatchTag(void) { return CertStrdup(GetSecurityPatchTag()); } -char* OsGetUdid() +char* OsGetUdid(void) { char udid[UDID_STRING_LEN + 1] = {0}; if (memset_s(udid, sizeof(udid), 0, sizeof(udid)) != 0) { diff --git a/cert_mgr_service/services/core/cert/cert_service.c b/cert_mgr_service/services/core/cert/cert_service.c index a297fa8..06d05fb 100644 --- a/cert_mgr_service/services/core/cert/cert_service.c +++ b/cert_mgr_service/services/core/cert/cert_service.c @@ -32,7 +32,7 @@ pthread_mutex_t g_mtx_certmgr = PTHREAD_MUTEX_INITIALIZER; -static int32_t ResetDevice() +static int32_t ResetDevice(void) { CERT_LOG_DEBUG("[ResetDevice] Begin."); int32_t ret; @@ -167,7 +167,7 @@ static int32_t ActiveToken(AuthResult* authResult) return ret; } -static int32_t ProcCertImpl() +static int32_t ProcCertImpl(void) { CERT_LOG_DEBUG("[ProcCertImpl] Proc cert begin."); int32_t ret = InitSysData(); // 初始化系统参数 @@ -247,7 +247,7 @@ static int32_t ProcCertImpl() return ret; } -int32_t ProcCert() +int32_t ProcCert(void) { pthread_mutex_lock(&g_mtx_certmgr); PrintCurrentTime(); diff --git a/cert_mgr_service/services/core/cert/cert_service_active.c b/cert_mgr_service/services/core/cert/cert_service_active.c index 7b6b450..e23fb6b 100644 --- a/cert_mgr_service/services/core/cert/cert_service_active.c +++ b/cert_mgr_service/services/core/cert/cert_service_active.c @@ -96,7 +96,7 @@ int32_t ParseActiveResult(const char* jsonStr) CERT_LOG_ERROR("[ParseActiveResult] Invalid parameter"); return CERT_ERR; } - int32_t errorCode = (int32_t) GetObjectItemValueNumber(jsonStr, "errcode"); + int32_t errorCode = (int32_t)GetObjectItemValueNumber(jsonStr, "errcode"); if (isnan(errorCode)) { CERT_LOG_ERROR("[ParseActiveResult] errorCode is nan."); return CERT_ERR; diff --git a/cert_mgr_service/services/core/cert/cert_service_auth.c b/cert_mgr_service/services/core/cert/cert_service_auth.c index d113ad6..149ec2f 100644 --- a/cert_mgr_service/services/core/cert/cert_service_auth.c +++ b/cert_mgr_service/services/core/cert/cert_service_auth.c @@ -26,7 +26,7 @@ #include "cert_adapter_mock.h" #include "cert_service_auth.h" -bool IsAuthStatusChg() +bool IsAuthStatusChg(void) { CERT_LOG_DEBUG("[IsAuthStatusChg] Begin."); char* authStatusBase64 = NULL; @@ -332,7 +332,7 @@ int32_t CheckAuthResult(AuthStatus* authStatus, uint64_t currentTime) return CERT_OK; } -uint64_t GetCurrentTime() +uint64_t GetCurrentTime(void) { CERT_LOG_DEBUG("[GetCurrentTime] Begin."); ChallengeResult* challengeResult = NULL; @@ -431,7 +431,7 @@ int32_t DecodeAuthStatus(const char* infoByBase64, AuthStatus* authStats) return ret; } -AuthStatus* CreateAuthStatus() +AuthStatus* CreateAuthStatus(void) { AuthStatus* authStatus = (AuthStatus *)CERT_MEM_MALLOC(sizeof(AuthStatus)); if (authStatus == NULL) { @@ -459,7 +459,7 @@ void DestroyAuthStatus(AuthStatus** authStat) *authStat = NULL; } -AuthResult* CreateAuthResult() +AuthResult* CreateAuthResult(void) { AuthResult* authResult = (AuthResult *)CERT_MEM_MALLOC(sizeof(AuthResult)); if (authResult == NULL) { diff --git a/cert_mgr_service/services/core/cert/cert_service_challenge.c b/cert_mgr_service/services/core/cert/cert_service_challenge.c index 900e070..be9b4c2 100644 --- a/cert_mgr_service/services/core/cert/cert_service_challenge.c +++ b/cert_mgr_service/services/core/cert/cert_service_challenge.c @@ -23,7 +23,7 @@ #include "cert_adapter_mock.h" #include "cert_service_challenge.h" -ChallengeResult* CreateChallengeResult() +ChallengeResult* CreateChallengeResult(void) { ChallengeResult* challengeResult = (ChallengeResult *)CERT_MEM_MALLOC(sizeof(ChallengeResult)); if (challengeResult == NULL) { diff --git a/cert_mgr_service/services/core/cert/cert_service_device.c b/cert_mgr_service/services/core/cert/cert_service_device.c index b880572..c7e009b 100644 --- a/cert_mgr_service/services/core/cert/cert_service_device.c +++ b/cert_mgr_service/services/core/cert/cert_service_device.c @@ -70,12 +70,12 @@ static int32_t SetSysData(SYS_DEV_TYPE_E type) return CERT_OK; } -static bool IsSysDataEmpty() +static bool IsSysDataEmpty(void) { return (g_devSysInfos[0] == NULL); } -static void PrintDevSysInfo() +static void PrintDevSysInfo(void) { CERT_LOG_INFO("------g_devSysInfos--------"); if (IsSysDataEmpty()) { @@ -96,7 +96,7 @@ static void PrintDevSysInfo() CERT_LOG_INFO("--------------------------"); } -int32_t InitSysData() +int32_t InitSysData(void) { CERT_LOG_DEBUG("[InitSysData] Begin."); @@ -117,7 +117,7 @@ int32_t InitSysData() return CERT_OK; } -void DestroySysData() +void DestroySysData(void) { if (IsSysDataEmpty()) { return; @@ -138,17 +138,17 @@ char* StrdupDevInfo(SYS_DEV_TYPE_E devType) return CertStrdup(g_devSysInfos[devType]); } -char* GetAppId() +char* GetAppId(void) { return CertStrdup("105625431"); } -char* GetTenantId() +char* GetTenantId(void) { return CertStrdup("OpenHarmony"); } -char* GetRandomUuid() +char* GetRandomUuid(void) { char* buff = (char *)CERT_MEM_MALLOC(RAND_UUID_LEN + 1); if (buff == NULL) { diff --git a/cert_mgr_service/services/core/cert_entry.c b/cert_mgr_service/services/core/cert_entry.c index f48315e..0336422 100644 --- a/cert_mgr_service/services/core/cert_entry.c +++ b/cert_mgr_service/services/core/cert_entry.c @@ -19,7 +19,7 @@ #include "cert_service.h" #include "cert_entry.h" -int32_t CertTask() +int32_t CertTask(void) { CERT_LOG_INFO("[CertTask] Begin."); // 执行主流程代码 diff --git a/cert_mgr_service/services/core/cert_entry.h b/cert_mgr_service/services/core/cert_entry.h index 702cda1..23b4a47 100644 --- a/cert_mgr_service/services/core/cert_entry.h +++ b/cert_mgr_service/services/core/cert_entry.h @@ -23,7 +23,7 @@ extern "C" { #endif /* __cplusplus */ -int32_t CertTask(); +int32_t CertTask(void); int32_t QueryCert(int32_t* authResult, int32_t* softwareResult, char** ticket); diff --git a/cert_mgr_service/services/core/include/adapter/cert_adapter.h b/cert_mgr_service/services/core/include/adapter/cert_adapter.h index a761e0d..15cb4db 100644 --- a/cert_mgr_service/services/core/include/adapter/cert_adapter.h +++ b/cert_mgr_service/services/core/include/adapter/cert_adapter.h @@ -26,21 +26,21 @@ extern "C" { #endif #endif /* __cplusplus */ -char* CertGetVersionId(); +char* CertGetVersionId(void); -char* CertGetBuildRootHash(); +char* CertGetBuildRootHash(void); -char* CertGetDisplayVersion(); +char* CertGetDisplayVersion(void); -char* CertGetManufacture(); +char* CertGetManufacture(void); -char* CertGetProductModel(); +char* CertGetProductModel(void); -char* CertGetBrand(); +char* CertGetBrand(void); -char* CertGetSecurityPatchTag(); +char* CertGetSecurityPatchTag(void); -char* CertGetUdid(); +char* CertGetUdid(void); int32_t CertWriteTicket(const TicketInfo* ticketInfo); diff --git a/cert_mgr_service/services/core/include/adapter/cert_adapter_mock.h b/cert_mgr_service/services/core/include/adapter/cert_adapter_mock.h index 06d832b..2ca320e 100644 --- a/cert_mgr_service/services/core/include/adapter/cert_adapter_mock.h +++ b/cert_mgr_service/services/core/include/adapter/cert_adapter_mock.h @@ -51,21 +51,21 @@ int32_t SendChallMsgStub(CERT_ACTION_TYPE actionType, char** respMsg); int32_t SendCertMsgStub(CERT_ACTION_TYPE actionType, char** respMsg); -char* OsGetVersionIdStub(); +char* OsGetVersionIdStub(void); -char* OsGetBuildRootHashStub(); +char* OsGetBuildRootHashStub(void); -char* OsGetDisplayVersionStub(); +char* OsGetDisplayVersionStub(void); -char* OsGetManufactureStub(); +char* OsGetManufactureStub(void); -char* OsGetProductModelStub(); +char* OsGetProductModelStub(void); -char* OsGetBrandStub(); +char* OsGetBrandStub(void); -char* OsGetSecurityPatchTagStub(); +char* OsGetSecurityPatchTagStub(void); -char* OsGetUdidStub(); +char* OsGetUdidStub(void); #ifdef __cplusplus diff --git a/cert_mgr_service/services/core/include/adapter/cert_adapter_os.h b/cert_mgr_service/services/core/include/adapter/cert_adapter_os.h index 87d8837..49b35aa 100644 --- a/cert_mgr_service/services/core/include/adapter/cert_adapter_os.h +++ b/cert_mgr_service/services/core/include/adapter/cert_adapter_os.h @@ -22,21 +22,21 @@ extern "C" { #endif #endif /* __cplusplus */ -char* OsGetVersionId(); +char* OsGetVersionId(void); -char* OsGetBuildRootHash(); +char* OsGetBuildRootHash(void); -char* OsGetDisplayVersion(); +char* OsGetDisplayVersion(void); -char* OsGetManufacture(); +char* OsGetManufacture(void); -char* OsGetProductModel(); +char* OsGetProductModel(void); -char* OsGetBrand(); +char* OsGetBrand(void); -char* OsGetSecurityPatchTag(); +char* OsGetSecurityPatchTag(void); -char* OsGetUdid(); +char* OsGetUdid(void); int32_t OsSetParameter(const char *key, const char *value); diff --git a/cert_mgr_service/services/core/include/cert/cert_service.h b/cert_mgr_service/services/core/include/cert/cert_service.h index 99c301c..d82f916 100644 --- a/cert_mgr_service/services/core/include/cert/cert_service.h +++ b/cert_mgr_service/services/core/include/cert/cert_service.h @@ -23,7 +23,7 @@ extern "C" { #endif /* __cplusplus */ -int32_t ProcCert(); +int32_t ProcCert(void); int32_t QueryCertStatus(int32_t* authResult, int32_t* softwareResult, char** ticket); diff --git a/cert_mgr_service/services/core/include/cert/cert_service_auth.h b/cert_mgr_service/services/core/include/cert/cert_service_auth.h index 1ec8c28..1567a51 100644 --- a/cert_mgr_service/services/core/include/cert/cert_service_auth.h +++ b/cert_mgr_service/services/core/include/cert/cert_service_auth.h @@ -24,7 +24,7 @@ extern "C" { #endif #endif /* __cplusplus */ -bool IsAuthStatusChg(); +bool IsAuthStatusChg(void); int32_t FlushAuthResult(const char* ticket, const char* authStatus); @@ -34,15 +34,15 @@ int32_t GetAuthStatus(char** result); int32_t CheckVersionChanged(AuthStatus* authStatus); -uint64_t GetCurrentTime(); +uint64_t GetCurrentTime(void); int32_t CheckAuthResult(AuthStatus* authStatus, uint64_t currentTime); -AuthStatus* CreateAuthStatus(); +AuthStatus* CreateAuthStatus(void); void DestroyAuthStatus(AuthStatus** authStats); -AuthResult* CreateAuthResult(); +AuthResult* CreateAuthResult(void); void DestroyAuthResult(AuthResult** authResult); diff --git a/cert_mgr_service/services/core/include/cert/cert_service_challenge.h b/cert_mgr_service/services/core/include/cert/cert_service_challenge.h index aa93bcb..e781cfc 100644 --- a/cert_mgr_service/services/core/include/cert/cert_service_challenge.h +++ b/cert_mgr_service/services/core/include/cert/cert_service_challenge.h @@ -22,7 +22,7 @@ extern "C" { #endif #endif /* __cplusplus */ -ChallengeResult* CreateChallengeResult(); +ChallengeResult* CreateChallengeResult(void); void DestroyChallengeResult(ChallengeResult** challengeResult); diff --git a/cert_mgr_service/services/core/include/cert/cert_service_device.h b/cert_mgr_service/services/core/include/cert/cert_service_device.h index 1132a2e..b4474e8 100644 --- a/cert_mgr_service/services/core/include/cert/cert_service_device.h +++ b/cert_mgr_service/services/core/include/cert/cert_service_device.h @@ -46,19 +46,19 @@ typedef enum { FOURTH_CASE = 4, } SYS_DEV_CASE_TYPE; -typedef char* (*SetDataFunc)(); +typedef char* (*SetDataFunc)(void); -int32_t InitSysData(); +int32_t InitSysData(void); -void DestroySysData(); +void DestroySysData(void); char* StrdupDevInfo(SYS_DEV_TYPE_E devType); -char* GetRandomUuid(); +char* GetRandomUuid(void); -char* GetAppId(); +char* GetAppId(void); -char* GetTenantId(); +char* GetTenantId(void); #ifdef __cplusplus #if __cplusplus diff --git a/cert_mgr_service/services/core/include/network/cert_network.h b/cert_mgr_service/services/core/include/network/cert_network.h index 7905b3d..b39a0d2 100644 --- a/cert_mgr_service/services/core/include/network/cert_network.h +++ b/cert_mgr_service/services/core/include/network/cert_network.h @@ -72,7 +72,7 @@ Content-Length: %d\r\n\r\n") (httpPacket).reqXclientID, (httpPacket).reqXtraceID, \ (httpPacket).reqXappID, (httpPacket).reqXtenantID, (httpPacket).reqContentLength -DevicePacket* CreateDevicePacket(); +DevicePacket* CreateDevicePacket(void); void DestroyDevicePacket(DevicePacket** devicePacket); diff --git a/cert_mgr_service/services/core/include/utils/cert_utils.h b/cert_mgr_service/services/core/include/utils/cert_utils.h index 5fbdd32..c12ff69 100644 --- a/cert_mgr_service/services/core/include/utils/cert_utils.h +++ b/cert_mgr_service/services/core/include/utils/cert_utils.h @@ -37,13 +37,13 @@ void *CertMemAlloc(uint32_t size, const char* file, uint32_t line, const char* f #define ABS(x) ((x) >= 0 ? (x) : (-x)) -int32_t GetRandomNum(); +int32_t GetRandomNum(void); char* CertStrdup(const char* input); void URLSafeBase64ToBase64(const char* input, size_t inputLen, uint8_t** output, size_t* outputLen); -void PrintCurrentTime(); +void PrintCurrentTime(void); int32_t ToLowerStr(char* str, int len); diff --git a/cert_mgr_service/services/core/include/utils/cert_utils_memleak.h b/cert_mgr_service/services/core/include/utils/cert_utils_memleak.h index 8b10499..cdb2104 100644 --- a/cert_mgr_service/services/core/include/utils/cert_utils_memleak.h +++ b/cert_mgr_service/services/core/include/utils/cert_utils_memleak.h @@ -39,15 +39,15 @@ typedef struct { char* func; } MemNode; -int32_t InitMemNodeList(); +int32_t InitMemNodeList(void); -int32_t DestroyMemNodeList(); +int32_t DestroyMemNodeList(void); int32_t AddMemInfo(void* addr, const char* file, uint32_t line, const char* func); int32_t RemoveMemInfo(void* addr); -void PrintMemNodeList(); +void PrintMemNodeList(void); #ifdef __cplusplus #if __cplusplus diff --git a/cert_mgr_service/services/core/include/utils/cert_utils_timer.h b/cert_mgr_service/services/core/include/utils/cert_utils_timer.h index 9b261b7..d2f4557 100644 --- a/cert_mgr_service/services/core/include/utils/cert_utils_timer.h +++ b/cert_mgr_service/services/core/include/utils/cert_utils_timer.h @@ -27,7 +27,7 @@ extern "C" { #endif #endif /* __cplusplus */ -typedef int32_t (*TimerCallbackFunc)(); +typedef int32_t (*TimerCallbackFunc)(void); #define LOSCFG_BASE_CORE_MS_PRE_SECOND 1000 #define OS_SYS_NS_PER_SECOND 1000000000 #define EXPIRED_INTERVAL 86400000 diff --git a/cert_mgr_service/services/core/network/cert_network.c b/cert_mgr_service/services/core/network/cert_network.c index 3f3d9b5..075edb3 100644 --- a/cert_mgr_service/services/core/network/cert_network.c +++ b/cert_mgr_service/services/core/network/cert_network.c @@ -65,7 +65,7 @@ char *g_uriPath[CERT_ACTION_MAX] = { "/wisedevice/device-policy/v3/token/activate", }; -DevicePacket* CreateDevicePacket() +DevicePacket* CreateDevicePacket(void) { DevicePacket* devicePacket = (DevicePacket *)CERT_MEM_MALLOC(sizeof(DevicePacket)); if (devicePacket == NULL) { diff --git a/cert_mgr_service/services/core/utils/cert_utils.c b/cert_mgr_service/services/core/utils/cert_utils.c index a77cf01..00c6425 100644 --- a/cert_mgr_service/services/core/utils/cert_utils.c +++ b/cert_mgr_service/services/core/utils/cert_utils.c @@ -131,7 +131,7 @@ int32_t AnonymiseStr(char* str) return ret; } -void PrintCurrentTime() +void PrintCurrentTime(void) { time_t timet; time(&timet); diff --git a/cert_mgr_service/services/core/utils/cert_utils_memleak.c b/cert_mgr_service/services/core/utils/cert_utils_memleak.c index 0534075..a1ba3ff 100644 --- a/cert_mgr_service/services/core/utils/cert_utils_memleak.c +++ b/cert_mgr_service/services/core/utils/cert_utils_memleak.c @@ -38,7 +38,7 @@ const uint32_t MAX_MEM_NODE_LIST_LENGTH = 2048; List *g_memNodeList = NULL; -int32_t InitMemNodeList() +int32_t InitMemNodeList(void) { if (g_memNodeList != NULL) { CERT_LOG_ERROR("[InitMemNodeList] g_memNodeList is not null"); @@ -77,7 +77,7 @@ static void FreeMemNode(ListNode** node) *node = NULL; } -int32_t DestroyMemNodeList() +int32_t DestroyMemNodeList(void) { List* list = g_memNodeList; if (list == NULL) { @@ -225,7 +225,7 @@ static void PrintMemNode(MemNode *data) data->addr, data->func, data->file, data->line); } -void PrintMemNodeList() +void PrintMemNodeList(void) { List* list = g_memNodeList; CERT_LOG_DEBUG("[PrintMemNodeList] ---Print mem node list begin.---"); -- Gitee From 1da1b9256d6fedbc2be44e2a5334ae1c72f1cd7a Mon Sep 17 00:00:00 2001 From: Kemin <541416002@qq.com> Date: Fri, 29 Jul 2022 16:30:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=90=8C=E6=AD=A5develop=E5=88=86=E6=94=AF?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=BD=91=E7=BB=9C=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A4=B4=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../services/core/include/network/cert_network.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cert_mgr_service/services/core/include/network/cert_network.h b/cert_mgr_service/services/core/include/network/cert_network.h index b39a0d2..423be0b 100644 --- a/cert_mgr_service/services/core/include/network/cert_network.h +++ b/cert_mgr_service/services/core/include/network/cert_network.h @@ -33,14 +33,14 @@ extern "C" { #define HTTP_OK 200 -#define HTTPS_NETWORK_PORT 443 +#define HTTPS_NETWORK_PORT "443" #define HTTPS_NETWORK_HEADER_MAXLEN 512 // Headers的最大长度 #define HTTPS_NETWORK_RESPONSE_MAXLEN 2048 // Response返回值的最大长度 #define HTTPS_NETWORK_SHA256_LEN 128 #define HTTPS_NETWORK_BUFFER_LEN (1024 * 240) typedef struct HttpPacketStruct { - int32_t reqPort; + char *reqPort; char *reqHost; char *reqMethod; char *reqXclientID; @@ -59,7 +59,7 @@ typedef enum { } CERT_HTTPHEAD_TYPE; #define HTTPS_POST_FORMAT ("POST %s HTTP/1.0\r\n\ -Host: %s:%d\r\n\ +Host: %s:%s\r\n\ x-clientid: %s\r\n\ x-traceId: %s\r\n\ x-appid: %s\r\n\ -- Gitee