From aabfee472546375ff5a2f532c20ac3a5644ca0b7 Mon Sep 17 00:00:00 2001 From: heppen Date: Tue, 28 May 2024 17:42:15 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(cleancode):=20fix=20build=20?= =?UTF-8?q?warrning?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/inc/pwrbuffer.h | 2 +- common/inc/pwrmsg.h | 2 +- common/src/pwrmsg.c | 4 ++- pwrapic/src/CMakeLists.txt | 3 +- pwrapic/src/pwrsys.c | 4 +-- pwrapic/src/pwrtask.c | 1 - pwrapic/src/sockclient.c | 3 +- pwrapis/src/CMakeLists.txt | 3 +- pwrapis/src/config.c | 57 ++++---------------------------------- pwrapis/src/cpuservice.c | 14 ++++------ pwrapis/src/diskservice.c | 25 +++++++++-------- pwrapis/src/hbmservice.c | 4 ++- pwrapis/src/log.c | 17 +++++++++--- pwrapis/src/main_frame.c | 1 + pwrapis/src/procservice.c | 12 ++++---- pwrapis/src/pwrclient.c | 4 +-- pwrapis/src/server.c | 11 ++++++-- pwrapis/src/taskservice.c | 4 ++- pwrapis/src/utils.c | 27 ++++++++---------- 19 files changed, 84 insertions(+), 114 deletions(-) diff --git a/common/inc/pwrbuffer.h b/common/inc/pwrbuffer.h index a9c1525..589b592 100644 --- a/common/inc/pwrbuffer.h +++ b/common/inc/pwrbuffer.h @@ -61,7 +61,7 @@ static inline int IsFullBuffer(const PwrMsgBuffer *smb) return 0; } int t = (smb->head + 1) % PWR_BUFFER_SIZE; - return t == smb->head; + return t == smb->tail; } ResultWaitingMsgNode *CreateResultWaitingMsgNode(void); diff --git a/common/inc/pwrmsg.h b/common/inc/pwrmsg.h index 180a8f4..8f43a3b 100644 --- a/common/inc/pwrmsg.h +++ b/common/inc/pwrmsg.h @@ -132,7 +132,7 @@ static inline void ReleasePwrMsg(PwrMsg **msg) PwrMsg *ClonePwrMsg(PwrMsg *msg); PwrMsg *CreateReqMsg(enum OperationType optType, uint32_t taskNo, uint32_t dataLen, char *data); -int InitMsgFactory(void); +void InitMsgFactory(void); void DestroyMsgFactory(void); int GenerateMetadataMsg(PwrMsg *metadata, uint32_t sysId, char *data, uint32_t len); int GenerateRspMsg(const PwrMsg *req, PwrMsg *rsp, int rspCode, char *data, int dataLen); diff --git a/common/src/pwrmsg.c b/common/src/pwrmsg.c index dc7cd11..38a57e4 100644 --- a/common/src/pwrmsg.c +++ b/common/src/pwrmsg.c @@ -95,7 +95,7 @@ PwrMsg *ClonePwrMsg(PwrMsg *msg) return c; } -int InitMsgFactory(void) +void InitMsgFactory(void) { g_pid = getpid(); pthread_mutex_init((pthread_mutex_t *)&g_seqLock, NULL); @@ -124,6 +124,8 @@ int GenerateMetadataMsg(PwrMsg *metadata, uint32_t sysId, char *data, uint32_t l metadata->head.dataLen = len; metadata->head.sysId = sysId; metadata->data = data; + + return PWR_SUCCESS; } int GenerateRspMsg(const PwrMsg *req, PwrMsg *rsp, int rspCode, char *data, int dataLen) diff --git a/pwrapic/src/CMakeLists.txt b/pwrapic/src/CMakeLists.txt index fb9586c..f1f9f1a 100644 --- a/pwrapic/src/CMakeLists.txt +++ b/pwrapic/src/CMakeLists.txt @@ -37,5 +37,4 @@ install (FILES "${PROJECT_SOURCE_DIR}/../../common/inc/pwrerr.h" DESTINATION /u # Debug compile mode set(CMAKE_BUILD_TYPE "Debug") -set(CMAKE_CXX_FLAGS_DEBUG "$ENV{CXXFLAGS} -O0 -Wall -g -ggdb") - +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -g -ggdb -Wall -Wextra -Werror") diff --git a/pwrapic/src/pwrsys.c b/pwrapic/src/pwrsys.c index db43d88..bb8070c 100644 --- a/pwrapic/src/pwrsys.c +++ b/pwrapic/src/pwrsys.c @@ -26,9 +26,9 @@ int SetSysPowerState(const int powerState) input.optType = SYS_SET_POWER_STATE; char state[PWR_MAX_NAME_LEN] = {0}; if (powerState == PWR_MEM) { - strncpy(state, "mem", strlen("mem")); + strncpy(state, "mem", strlen("mem") + 1); } else if (powerState == PWR_DISK) { - strncpy(state, "disk", strlen("disk")); + strncpy(state, "disk", strlen("disk") + 1); } size_t dataLen = strlen(state); input.dataLen = dataLen; diff --git a/pwrapic/src/pwrtask.c b/pwrapic/src/pwrtask.c index bf73591..c5e7448 100644 --- a/pwrapic/src/pwrtask.c +++ b/pwrapic/src/pwrtask.c @@ -28,7 +28,6 @@ int CreateDcTask(const PWR_COM_BasicDcTaskInfo *basicDcTaskInfo) input.data = (char *)basicDcTaskInfo; RspOutputParam output; - size_t size = sizeof(int); output.rspBuffSize = NULL; output.rspData = NULL; diff --git a/pwrapic/src/sockclient.c b/pwrapic/src/sockclient.c index 550a15f..3007cd6 100644 --- a/pwrapic/src/sockclient.c +++ b/pwrapic/src/sockclient.c @@ -97,7 +97,7 @@ static int ReadMsg(void *pData, int len) static int WriteMsg(const void *pData, size_t len) { size_t leftLen; - size_t sendLen; + ssize_t sendLen; size_t wrLen = 0; leftLen = len; @@ -341,6 +341,7 @@ static int CreateConnection(void) static void *RunSocketProcess(void *none) { + (void)none; // used to avoid unused parameter warning fd_set recvFdSet; struct timeval tv; while (g_sockThread.keepRunning) { diff --git a/pwrapis/src/CMakeLists.txt b/pwrapis/src/CMakeLists.txt index 93ff2ff..d3af215 100644 --- a/pwrapis/src/CMakeLists.txt +++ b/pwrapis/src/CMakeLists.txt @@ -34,5 +34,4 @@ install (FILES "${PROJECT_SOURCE_DIR}/../pwrapis.service" DESTINATION /usr/lib/s # debug complile mode set(CMAKE_BUILD_TYPE "Debug") -set(CMAKE_CXX_FLAGS_DEBUG "$ENV{CXXFLAGS} -O0 -Wall -g -ggdb") - +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -g -ggdb -Wall -Wextra -Werror") diff --git a/pwrapis/src/config.c b/pwrapis/src/config.c index 581b717..ffbb511 100644 --- a/pwrapis/src/config.c +++ b/pwrapis/src/config.c @@ -211,36 +211,6 @@ static char** UpdateRoleArrayAction(const char *value) return users; } -static int IsSameArray(char **arr1, char **arr2) -{ - if (arr1 == NULL && arr2 == NULL) { - return PWR_TRUE; - } - if (arr1 == NULL || arr2 == NULL) { - return PWR_FALSE; - } - - int len1 = 0; - int len2 = 0; - while (arr1[len1] != NULL && strlen(arr1[len1]) > 0) { - len1++; - } - while (arr2[len2] != NULL && strlen(arr2[len2]) > 0) { - len2++; - } - if (len1 != len2) { - return PWR_FALSE; - } - - for (int i = 0; i < len1; i++) { - if (strcmp(arr1[i], arr2[i]) != 0) { - return PWR_FALSE; - } - } - - return PWR_TRUE; -} - static int UpdateRoleArray(enum CnfItemType type, const char *value) { char** tempRoleArray = UpdateRoleArrayAction(value); @@ -475,6 +445,8 @@ static int HandleInvalidUpdate(char *key, char *value) return PWR_ERR_COMMON; } break; + default: + break; } return PWR_SUCCESS; } @@ -491,7 +463,7 @@ int UpdateConfig(char *key, char *value) Logger(ERROR, MD_NM_CFG, "File_size in config is invalid, current valid value is %d", curFileSize); return PWR_ERR_INVALIDE_PARAM; } - int maxFileSize = actualValue * UNIT_FACTOR - MAX_LINE_LENGTH; + uint64_t maxFileSize = actualValue * UNIT_FACTOR - MAX_LINE_LENGTH; if (maxFileSize != g_logCfg.maxFileSize) { g_logCfg.maxFileSize = maxFileSize; Logger(INFO, MD_NM_CFG, "File_size in config has been modified to %d", actualValue); @@ -503,7 +475,7 @@ int UpdateConfig(char *key, char *value) Logger(ERROR, MD_NM_CFG, "Cmp_cnt in config is invalid, current valid value is %d", g_logCfg.maxCmpCnt); return PWR_ERR_INVALIDE_PARAM; } - if (actualValue != g_logCfg.maxCmpCnt) { + if ((uint64_t)actualValue != g_logCfg.maxCmpCnt) { g_logCfg.maxCmpCnt = actualValue; Logger(INFO, MD_NM_CFG, "Cmp_cnt in config has been modified to %d", actualValue); } @@ -515,7 +487,7 @@ int UpdateConfig(char *key, char *value) Logger(ERROR, MD_NM_CFG, "Log_level in config is invalid, current valid value is %d", curLogLevel); return PWR_ERR_INVALIDE_PARAM; } - if (actualValue != g_logCfg.logLevel) { + if ((uint64_t)actualValue != g_logCfg.logLevel) { UpdateLogLevel(actualValue); Logger(INFO, MD_NM_CFG, "Log_level in config has been modified to %d", actualValue); } @@ -554,25 +526,6 @@ int GetLogLevel(void) return g_logCfg.logLevel; } -static enum LogLevel CauLeve(int level) -{ - enum LogLevel lgLvl; - switch (level) { - case DEBUG: - lgLvl = DEBUG; - break; - case INFO: - lgLvl = INFO; - break; - case WARNING: - lgLvl = WARNING; - break; - default: - lgLvl = ERROR; - } - return lgLvl; -} - int IsAdmin(const char* user) { int i = 0; diff --git a/pwrapis/src/cpuservice.c b/pwrapis/src/cpuservice.c index 1e220c5..5f79f6a 100644 --- a/pwrapis/src/cpuservice.c +++ b/pwrapis/src/cpuservice.c @@ -53,7 +53,7 @@ static void FreqSortByPolicy(PWR_CPU_CurFreq *rstData, int len) } } -int CpuInfoCopy(char *att, char *value, PWR_CPU_Info *rstData) +static void CpuInfoCopy(char *att, char *value, PWR_CPU_Info *rstData) { int attId = GetCpuArrId(att); switch (attId) { @@ -267,7 +267,6 @@ int PerfDataRead(PWR_CPU_PerfData *perfData) return 1; } char buf[PWR_MAX_STRING_LEN] = {0}; - int i = 0; unsigned long cacheMiss = 0; unsigned long ins = 0; unsigned long cycles = 0; @@ -868,7 +867,6 @@ static int ReadCpuIdleCstates(PWR_CPU_Cstate cstates[], int *cstateNum, int maxN int num = 0; struct dirent *dt; char path[MAX_FULL_NAME] = {0}; - char strInt[STR_LEN_FOR_INT] = {0}; int ret = PWR_SUCCESS; while ((dt = readdir(dir)) != NULL && num < maxNum) { if (StrMatch(dt->d_name, CPU_IDLE_CSTATE_DIR_FREFIX) == NULL) { @@ -895,7 +893,7 @@ static int ReadCpuIdleCstates(PWR_CPU_Cstate cstates[], int *cstateNum, int maxN if (sprintf(path, CPU_IDLE_CSTATE_LATENCY, dt->d_name) < 0) { return PWR_ERR_FILE_SPRINTF_FAILED; } - ret = ReadIntFromFile(path, &cstates[num].latency); + ret = ReadIntFromFile(path, (int *)&cstates[num].latency); if (ret != PWR_SUCCESS) { return PWR_ERR_FILE_ACCESS_FAILED; } @@ -929,7 +927,7 @@ static int ReadCpuIdleInfo(PWR_CPU_IdleInfo *idleInfo, int maxNum) if (ret != PWR_SUCCESS) { return ret; } - return ReadCpuIdleCstates(idleInfo->cstates, &idleInfo->cstateNum, maxNum); + return ReadCpuIdleCstates(idleInfo->cstates, (int *)&idleInfo->cstateNum, maxNum); } // public=========================================================================================== @@ -939,7 +937,7 @@ void GetCpuinfo(PwrMsg *req) if (!rstData) { return; } - bzero(rstData, sizeof(rstData)); + bzero(rstData, sizeof(PWR_CPU_Info)); int rspCode = CpuInfoRead(rstData); SendRspToClient(req, rspCode, (char *)rstData, sizeof(PWR_CPU_Info)); } @@ -1289,7 +1287,7 @@ void GetCpuDmaLatency(PwrMsg *req) SendRspToClient(req, PWR_ERR_FILE_ACCESS_FAILED, NULL, 0); return; } - if (fread(latency, sizeof(int), 1, fd) < 0) { + if (fread(latency, sizeof(int), 1, fd) == 0) { (void)fclose(fd); SendRspToClient(req, PWR_ERR_FILE_ACCESS_FAILED, NULL, 0); return; @@ -1321,7 +1319,7 @@ void SetCpuDmaLatency(PwrMsg *req) } } - if (fwrite(latency, sizeof(int), 1, g_cpuDmaLatencyWriteFd) < 0) { + if (fwrite(latency, sizeof(int), 1, g_cpuDmaLatencyWriteFd) == 0) { ret = PWR_ERR_FILE_ACCESS_FAILED; break; } diff --git a/pwrapis/src/diskservice.c b/pwrapis/src/diskservice.c index cb92d98..379bcae 100644 --- a/pwrapis/src/diskservice.c +++ b/pwrapis/src/diskservice.c @@ -38,7 +38,6 @@ static regex_t g_avgquszRegx; static regex_t g_svctmRegx; static regex_t g_utilRegx; static regex_t g_awaitRegx; -static struct ListHead hanlerMap; typedef struct IoHdRef { regex_t* regx; @@ -47,7 +46,6 @@ typedef struct IoHdRef { static const char* GetStatInfo(const char* diskName, char statLine[], int bufLen) { - int res; int majorNum; int minorNum; regex_t prxRgx; @@ -220,8 +218,8 @@ static Ios GetIos(const char* dataName) ios.rdIos = GetFdVal(dataName, R_MEGR_FD_NUM); ios.wrIos = GetFdVal(dataName, W_MEGR_FD_NUM); - ios.dcIos = GetFdVal(dataName, DC_IOS_FD_NUM); - ios.dcIos = ios.dcIos < 0 ? 0 : ios.dcIos; + int64_t dcIosTmp = GetFdVal(dataName, DC_IOS_FD_NUM); + ios.dcIos = dcIosTmp < 0 ? 0 : dcIosTmp; return ios; } @@ -242,8 +240,8 @@ static Sectors GetSectors(const char* dataName) sectors.rdSect = GetFdVal(dataName, RKB_FD_NUM); sectors.wrSect = GetFdVal(dataName, WKB_FD_NUM); - sectors.dcSect = GetFdVal(dataName, DC_SECT_FD_NUM); - sectors.dcSect = sectors.dcSect < 0 ? 0 : sectors.dcSect; + int64_t dcSectTmp = GetFdVal(dataName, DC_SECT_FD_NUM); + sectors.dcSect = dcSectTmp < 0 ? 0 : dcSectTmp; return sectors; } @@ -323,7 +321,7 @@ static CollVal DiskUtil(void* args) pTmKp = args; colVal.collSec = 0; - resVal = GetValPerSec(args, TOL_TK_FD_NUM, UTIL_FACTOR); + resVal = GetValPerSec(pTmKp, TOL_TK_FD_NUM, UTIL_FACTOR); if (sprintf(strVal, "%.5f", resVal) < 0) { colVal.pVal = ERR_VAL; } else { @@ -348,8 +346,8 @@ static Ticks GetTicks(const char* dataName) Ticks ticks; ticks.rdTicks = GetFdVal(dataName, RD_TICKS_FD_NUM); ticks.wrTicks = GetFdVal(dataName, WR_TICKS_FD_NUM); - ticks.dcTicks = GetFdVal(dataName, DC_TICKS_FD_NUM); - ticks.dcTicks = ticks.dcTicks < 0 ? 0 : ticks.dcTicks; + int64_t dcTicksTmp = GetFdVal(dataName, DC_TICKS_FD_NUM); + ticks.dcTicks = dcTicksTmp < 0 ? 0 : dcTicksTmp; return ticks; } @@ -434,7 +432,7 @@ IoHdRef hdArr[] = { static CollHandler GetColHdl(const char* dataName) { - int idx; + size_t idx; size_t len; len = sizeof(hdArr) / sizeof(IoHdRef); @@ -486,7 +484,7 @@ void InitIoColl(void) void ClearIoColl(void) { - int i; + size_t i; size_t length; length = sizeof(hdArr) / sizeof(IoHdRef); @@ -578,20 +576,25 @@ void GetDiskinfo(PwrMsg *req) void GetDiskLoad(PwrMsg *req) { + (void)req; } void GetDiskPowerStatus(PwrMsg *req) { + (void)req; } void SetDiskPowerStatus(PwrMsg *req) { + (void)req; } void GetDiskScsiPolicy(PwrMsg *req) { + (void)req; } void SetDiskScsiPolicy(PwrMsg *req) { + (void)req; } diff --git a/pwrapis/src/hbmservice.c b/pwrapis/src/hbmservice.c index 3d8f48b..2516f75 100644 --- a/pwrapis/src/hbmservice.c +++ b/pwrapis/src/hbmservice.c @@ -51,7 +51,7 @@ static int GetHbmMode(PWR_HBM_SYS_STATE *state) return PWR_ERR_COMMON; } char flat_buf[PWR_MAX_STRING_LEN] = {0}; - if (fgets(cache_buf, PWR_MAX_STRING_LEN, cache_mod_fp) != NULL) { + if (fgets(flat_buf, PWR_MAX_STRING_LEN, flat_mod_fp) != NULL) { *state |= PWR_HBM_CACHE_MOD; } pclose(cache_mod_fp); @@ -106,6 +106,8 @@ static int SetPowerState(int powerState) state_str); EXEC_COMMAND(cmd); } + + return PWR_SUCCESS; } void SetHbmAllPowerState(PwrMsg *req) diff --git a/pwrapis/src/log.c b/pwrapis/src/log.c index 488ef87..c15dd8c 100644 --- a/pwrapis/src/log.c +++ b/pwrapis/src/log.c @@ -69,15 +69,20 @@ static int LogCmpFileFilter(const struct dirent *item) // Release space by deleting the earlier compressed files static void SpaceChkAndDel(void) { - int cnt; - int fileCnt; + uint64_t cnt; + uint64_t fileCnt; const char *fileName = NULL; const char *pTmpPth = NULL; struct dirent **fileList = NULL; char fullPath[MAX_FILE_NAME] = {0}; pTmpPth = GetLogCfg()->logBkp; - fileCnt = scandir(pTmpPth, &fileList, LogCmpFileFilter, alphasort); + int fileCntTmp = scandir(pTmpPth, &fileList, LogCmpFileFilter, alphasort); + if (fileCntTmp < 0) { + perror("scandir error!!!"); + return; + } + fileCnt = (uint64_t)fileCntTmp; cnt = fileCnt > GetLogCfg()->maxCmpCnt ? fileCnt - GetLogCfg()->maxCmpCnt : 0; // Delete old compressed files while (fileCnt--) { @@ -202,9 +207,13 @@ void Logger(enum LogLevel level, const char *moduleName, const char *format, ... return; } GetCurFullTime(curTime, sizeof(curTime) - 1); - ret = sprintf(logLine, "%s %s %s: %s\n", curTime, GetLevelName(level), moduleName, message); + ret = snprintf(logLine, sizeof(logLine), "%s %s %s: %s\n", curTime, GetLevelName(level), moduleName, message); if (ret < 0) { return; + } else if (ret >= (int)sizeof(logLine)) { + memcpy(logLine + sizeof(logLine) - 5, "...", 3); // 添加省略号表示截断 + logLine[sizeof(logLine) - 2] = '\n'; + logLine[sizeof(logLine) - 1] = '\0'; } if (fputs(logLine, g_pFile) < 0) { return; diff --git a/pwrapis/src/main_frame.c b/pwrapis/src/main_frame.c index 03b6309..55978d1 100644 --- a/pwrapis/src/main_frame.c +++ b/pwrapis/src/main_frame.c @@ -53,6 +53,7 @@ static void ClearEnv(void) static void SignalHandler(int none) { + (void)none; // used to avoid unused parameter warning g_keepMainRunning = EXIT; } diff --git a/pwrapis/src/procservice.c b/pwrapis/src/procservice.c index f54055f..7c680c9 100644 --- a/pwrapis/src/procservice.c +++ b/pwrapis/src/procservice.c @@ -77,7 +77,7 @@ static ServiceToString g_serToString[] = { {PWR_PROC_SERVICE_MPCTOOL, "mpctool"}, }; -static int Check_Service_Exist(PWR_PROC_SERVICE_NAME name, char *serviceName) +static int CheckServiceExist(const PWR_PROC_SERVICE_NAME name, char *serviceName) { int i; int count = sizeof(g_serToString) / sizeof(g_serToString[0]); @@ -91,7 +91,7 @@ static int Check_Service_Exist(PWR_PROC_SERVICE_NAME name, char *serviceName) if (i == count) { return PWR_ERR_SERVICE_UNABLE; } - if (sprintf(servicePath, SERVICE_PATH, g_serToString[i].nameString) < 0) { + if (snprintf(servicePath, sizeof(servicePath), SERVICE_PATH, g_serToString[i].nameString) < 0) { return PWR_ERR_FILE_SPRINTF_FAILED; } if (access(servicePath, F_OK) != 0) { @@ -102,7 +102,6 @@ static int Check_Service_Exist(PWR_PROC_SERVICE_NAME name, char *serviceName) static int ReadServiceState(PWR_PROC_ServiceStatus *sStatus, const char *serviceName) { - char state[PWR_MAX_NAME_LEN]; char cmd[PWR_MAX_STRING_LEN] = {0}; char buf[PWR_MAX_STRING_LEN] = {0}; @@ -144,7 +143,6 @@ static int ReadServiceState(PWR_PROC_ServiceStatus *sStatus, const char *service static int ModifyServiceState(const PWR_PROC_ServiceState *sState, const char *serviceName) { char cmd[PWR_MAX_STRING_LEN] = {0}; - char buf[PWR_MAX_STRING_LEN] = {0}; char oper[PWR_MAX_NAME_LEN] = {0}; if (sState->state == PWR_SERVICE_START){ StrCopy(oper, "start", PWR_MAX_NAME_LEN); @@ -299,7 +297,7 @@ static int ReadSmartGridProcsByLevel(PWR_PROC_SMART_GRID_LEVEL level, if (ReadFile(procLevelPath, strLevel, STR_LEN_FOR_INT) != PWR_SUCCESS) { continue; } - if (atoi(strLevel) == level) { + if (atoi(strLevel) == (int)level) { sgProcs->procs[sgProcs->procNum] = (pid_t)atoi(dt->d_name); sgProcs->procNum++; } @@ -760,7 +758,7 @@ void ProcGetServiceState(PwrMsg *req) PWR_PROC_ServiceStatus *sStatus = (PWR_PROC_ServiceStatus *)req->data; size_t size = sizeof(PWR_PROC_ServiceStatus); char serviceName[MAX_SERVICE_LEN] = {0}; - int ret = Check_Service_Exist(sStatus->name, serviceName); + int ret = CheckServiceExist(sStatus->name, serviceName); if (ret != PWR_SUCCESS) { SendRspToClient(req, ret, NULL, 0); } @@ -785,7 +783,7 @@ void ProcSetServiceState(PwrMsg *req) return; } char serviceName[MAX_SERVICE_LEN] = {0}; - int ret = Check_Service_Exist(sState->name, serviceName); + int ret = CheckServiceExist(sState->name, serviceName); if (ret != PWR_SUCCESS) { SendRspToClient(req, ret, NULL, 0); } diff --git a/pwrapis/src/pwrclient.c b/pwrapis/src/pwrclient.c index fc7c27d..5e80e20 100644 --- a/pwrapis/src/pwrclient.c +++ b/pwrapis/src/pwrclient.c @@ -96,7 +96,7 @@ void CloseAllConnections(PwrClient clients[]) int GetFdBySysId(const PwrClient clients[], uint32_t sysId) { for (int i = 0; i < MAX_CLIENT_NUM; i++) { - if (clients[i].sysId == sysId) { + if (clients[i].sysId == (int)sysId) { return clients[i].fd; } } @@ -116,7 +116,7 @@ int GetIdxByFd(const PwrClient clients[], int fd) const char *GetUserNameBySysId(const PwrClient clients[], uint32_t sysId) { for (int i = 0; i < MAX_CLIENT_NUM; i++) { - if (clients[i].sysId == sysId) { + if (clients[i].sysId == (int)sysId) { return clients[i].userName; } } diff --git a/pwrapis/src/server.c b/pwrapis/src/server.c index e3abeae..31ac5de 100644 --- a/pwrapis/src/server.c +++ b/pwrapis/src/server.c @@ -302,7 +302,7 @@ static void ProcessRecvMsgFromClient(int clientIdx) return; } - if (msg->head.sysId != g_pwrClients[clientIdx].sysId) { + if (msg->head.sysId != (uint32_t)g_pwrClients[clientIdx].sysId) { ReleasePwrMsg(&msg); return; } @@ -319,7 +319,7 @@ static void ProcessRecvMsgFromClient(int clientIdx) static int WriteMsg(const void *pData, size_t len, int dstFd) { size_t leftLen; - size_t sendLen; + ssize_t sendLen; size_t wrLen = 0; leftLen = len; @@ -429,6 +429,7 @@ static void ProcessSendMsgToClient(void) */ static void *RunServerSocketProcess(void *none) { + (void)none; // avoid unused parameter warning fd_set recvFdSet; int maxFd = INVALID_FD; struct timeval tv; @@ -468,6 +469,8 @@ static void *RunServerSocketProcess(void *none) } // while CloseAllConnections(g_pwrClients); + + return NULL; } static void WaitForMsg(void) @@ -548,6 +551,7 @@ static void ProcessReqMsg(PwrMsg *req) */ static void *RunServiceProcess(void *none) { + (void)none; // avoid unused parameter warning while (g_serviceThread.keepRunning) { if (IsEmptyBuffer(&g_recvBuff)) { WaitForMsg(); @@ -558,6 +562,8 @@ static void *RunServiceProcess(void *none) } ProcessReqMsg(msg); } // while + + return NULL; } static inline int SendMsg(PwrMsg *msg) @@ -651,6 +657,7 @@ int SendMetadataToClient(uint32_t sysId, char *data, uint32_t len) if (SendMsg(metadata)) { ReleasePwrMsg(&metadata); } + return PWR_SUCCESS; } int SendRspMsg(PwrMsg *rsp) diff --git a/pwrapis/src/taskservice.c b/pwrapis/src/taskservice.c index 577095f..9b8e253 100644 --- a/pwrapis/src/taskservice.c +++ b/pwrapis/src/taskservice.c @@ -256,6 +256,8 @@ static void *RunDcTaskProcess(void *arg) gettimeofday(&before, NULL); actionFunc(task, &before); } + + return NULL; } static int CreateNewTask(const PWR_COM_BasicDcTaskInfo *taskInfo, uint32_t subscriber) @@ -333,7 +335,7 @@ static void FiniAllTask(void) pthread_mutex_unlock(&g_taskListMutex); } -static int DeleteAllTaskByClient(uint32_t subscriber) +static void DeleteAllTaskByClient(uint32_t subscriber) { pthread_mutex_lock(&g_taskListMutex); if (g_taskNum != 0) { diff --git a/pwrapis/src/utils.c b/pwrapis/src/utils.c index a33accd..fd7737e 100644 --- a/pwrapis/src/utils.c +++ b/pwrapis/src/utils.c @@ -105,10 +105,10 @@ const char *GetCurFmtTmStr(const char *fmt, char *strTime, int bufLen) } curTime = GetCurTv(); tmp = localtime_r(&curTime.tv_sec, &tmpTm); - if (strftime(strStdTime, sizeof(strStdTime), fmt, tmp) < 0) { + if (strftime(strStdTime, sizeof(strStdTime), fmt, tmp) == 0) { return NULL; } - if (strlen(strStdTime) > bufLen - 1) { + if ((int)strlen(strStdTime) > bufLen - 1) { return NULL; } strcpy(strTime, strStdTime); @@ -128,14 +128,14 @@ const char *GetCurFullTime(char *fullTime, int bufLen) curTime = GetCurTv(); tmp = localtime_r(&curTime.tv_sec, &tmpTm); - if (strftime(strStdTime, sizeof(strStdTime), "%F %T", tmp) < 0) { + if (strftime(strStdTime, sizeof(strStdTime), "%F %T", tmp) == 0) { return NULL; } res = snprintf(strTime, sizeof(strTime) - 1, "%s.%ld", strStdTime, curTime.tv_usec / MS_TO_SEC); if (res < 0) { return NULL; } - if (strlen(strTime) > bufLen - 1) { + if ((int)strlen(strTime) > bufLen - 1) { return NULL; } strcpy(fullTime, strTime); @@ -263,7 +263,7 @@ const char *GetNthField(const char *src, const char *sep, int nth, char *pField, const char *ps = src; const char *ptail = NULL; - if (src == NULL || sep == NULL || pField == NULL || nth < 1 || bufLen < 0) { + if (src == NULL || sep == NULL || pField == NULL || nth < 1) { return NULL; } ptail = src + strlen(src); @@ -300,7 +300,7 @@ const char *GetNthLine(const char *fileName, int nth, char *lineBuf, size_t bufL const char *pRes = NULL; char line[MAX_LINE_NUM] = {0}; - if (fileName == NULL || nth < 1 || bufLen < 0) { + if (fileName == NULL || nth < 1) { return NULL; } if (access(fileName, F_OK | R_OK) != 0) { @@ -335,9 +335,6 @@ const char *GetVal(struct FieldLocation fdLt, char *valBuf, size_t bufLen) const char *pRes = NULL; char lineBuf[MAX_LINE_NUM] = {0}; - if (bufLen < 0) { - return NULL; - } pRes = GetNthLine(fdLt.fileName, fdLt.lineNum, lineBuf, sizeof(lineBuf) - 1); if (pRes == NULL) { return NULL; @@ -544,7 +541,7 @@ const char *GetMatchN(const char *fileName, regex_t *pRegex, int n, char *row, i return NULL; } if (cnt == n) { - if (strlen(line) > bufLen - 1) { + if ((int)strlen(line) > bufLen - 1) { return NULL; } else { strcpy(row, line); @@ -638,7 +635,7 @@ int GetFileCrc32Val(const char *fileName, unsigned int *fileCrc) int IsNumStr(const char *pStr) { size_t len; - int idx; + size_t idx; if (pStr == NULL) { return 0; } @@ -838,7 +835,7 @@ const char *StrJoin(char **strArr, int itemNum, const char *joinStr, char *buf, pos += (fieldLen + sepLen); } strcat(pos, strArr[idx]); - if (strlen(tmpBuf) > bufLen) { + if ((int)strlen(tmpBuf) > bufLen) { return NULL; } strcpy(buf, tmpBuf); @@ -874,7 +871,7 @@ void DeleteChar(char str[], char a) { size_t strLength = strlen(str); int point = 0; - for (int i = 0; i < strLength; i++) { + for (size_t i = 0; i < strLength; i++) { if ((str[i] == a)) { continue; } else { @@ -978,7 +975,7 @@ int WriteFile(const char *strInfo, const char *buf, int bufLen) Logger(ERROR, MD_NM_OTHS, "Open file[%s] failed. errno:%d, %s", strInfo, errno, strerror(errno)); return PWR_ERR_FILE_OPEN_FAILED; } - if (fprintf(fp, "%s", buf) < 0) { + if (fwrite(buf, 1, bufLen, fp) != (size_t)bufLen) { Logger(ERROR, MD_NM_OTHS, "Write file[%s] failed. errno:%d, %s", strInfo, errno, strerror(errno)); fclose(fp); return PWR_ERR_FILE_FPRINT_FAILED; @@ -1044,7 +1041,7 @@ int GetMd5(const char *filename, char *md5) pclose(fp); return PWR_ERR_COMMON; } - strncpy(md5, buf, sizeof(buf)); + strncpy(md5, buf, MD5_LEN); pclose(fp); return PWR_SUCCESS; } -- Gitee