diff --git a/pwrapis/src/cpuservice.c b/pwrapis/src/cpuservice.c index 5f79f6a7670d5d45e939a1b17603ac3d679b4cfe..2d4d21afa829c22be7d487b6068e51ac8e9b98e0 100644 --- a/pwrapis/src/cpuservice.c +++ b/pwrapis/src/cpuservice.c @@ -271,10 +271,6 @@ int PerfDataRead(PWR_CPU_PerfData *perfData) unsigned long ins = 0; unsigned long cycles = 0; while (fgets(buf, sizeof(buf) - 1, fp) != NULL) { - if (buf == NULL) { - pclose(fp); - return 1; - } DeleteChar(buf, '\n'); DeleteChar(buf, ' '); DeleteChar(buf, ','); @@ -292,7 +288,7 @@ int PerfDataRead(PWR_CPU_PerfData *perfData) } perfData->llcMiss = (double)cacheMiss / ins; perfData->ipc = (double)ins / cycles; - pclose(fp); + fclose(fp); remove("perf.txt"); return PWR_SUCCESS; } diff --git a/pwrapis/src/log.c b/pwrapis/src/log.c index c15dd8c3e76eef53ce16c4c58ffa4c35331fdff0..60592d52675bce3138cb2784da4c0dde79ecf48a 100644 --- a/pwrapis/src/log.c +++ b/pwrapis/src/log.c @@ -88,7 +88,7 @@ static void SpaceChkAndDel(void) while (fileCnt--) { if (fileCnt < cnt) { fileName = fileList[fileCnt]->d_name; - if (sprintf(fullPath, "%s/%s", GetLogCfg()->logBkp, fileName) < 0) { + if (snprintf(fullPath, sizeof(fullPath), "%s/%s", GetLogCfg()->logBkp, fileName) < 0) { perror("set full path error!!!"); } if (unlink(fullPath) != 0) { diff --git a/pwrapis/src/procservice.c b/pwrapis/src/procservice.c index 7c680c9c5f6e08aaad750f7f0d7da3bcbea32582..627c3787046ed14cf707039e8a2efd410bf868d1 100644 --- a/pwrapis/src/procservice.c +++ b/pwrapis/src/procservice.c @@ -115,7 +115,7 @@ static int ReadServiceState(PWR_PROC_ServiceStatus *sStatus, const char *service } if (fgets(buf, sizeof(buf) - 1, fp) == NULL) { - fclose(fp); + pclose(fp); return PWR_ERR_COMMON; } DeleteChar(buf, '\n'); @@ -136,7 +136,7 @@ static int ReadServiceState(PWR_PROC_ServiceStatus *sStatus, const char *service sStatus->status = PWR_PROC_SRV_ST_UNKNOWN; } - fclose(fp); + pclose(fp); return PWR_SUCCESS; } @@ -158,7 +158,7 @@ static int ModifyServiceState(const PWR_PROC_ServiceState *sState, const char *s if (fp == NULL) { return PWR_ERR_SYS_EXCEPTION; } - fclose(fp); + pclose(fp); return PWR_SUCCESS; }