diff --git a/pwrapic/test/procapitest.c b/pwrapic/test/procapitest.c
index 1f3e760b8adf3cb0db3b357f46430879f15c439d..7dea2e8db0f9956da0a498be6d119e9936419875 100644
--- a/pwrapic/test/procapitest.c
+++ b/pwrapic/test/procapitest.c
@@ -80,11 +80,11 @@ static void TEST_PWR_PROC_AddAndDelWattProcs(void)
     bzero(procs, sizeof(procs));
     ret = PWR_PROC_GetWattProcs(procs, &num);
     printf("PWR_PROC_GetWattProcs: ret:%d num:%d\n", ret, num);
-    for (int i = 0; i < TEST_PID_NUM; i++) {
+    for (int i = 0; i < num; i++) {
         printf("\tPWR_PROC_GetWattProcs. procs%d: %d.\n", i, procs[i]);
     }
 
-    ret = PWR_PROC_DelWattProcs(procs, num - 1);
+    ret = PWR_PROC_DelWattProcs(procs, num);
     printf("PWR_PROC_DelWattProcs: ret:%d\n", ret);
     bzero(procs, sizeof(procs));
     (void)PWR_PROC_GetWattProcs(procs, &num);
diff --git a/pwrapis/src/procservice.c b/pwrapis/src/procservice.c
index fe4fa98d1b60cdab2bcff49f724b0db1f6f8dac2..b05814bf8827ef1bceadb32391a3048758e046f7 100644
--- a/pwrapis/src/procservice.c
+++ b/pwrapis/src/procservice.c
@@ -322,7 +322,7 @@ static int WriteSmartGridProcsLevel(const PWR_PROC_SmartGridProcs *sgProcs)
         if (sprintf(procLevelPath, SMART_GRID_LEVEL_PATH_D, sgProcs->procs[i]) < 0) {
             return PWR_ERR_FILE_SPRINTF_FAILED;
         }
-        (void)WriteFile(procLevelPath, strLevel, STR_LEN_FOR_INT);
+        (void)WriteFile(procLevelPath, strLevel, strlen(strLevel));
     }
     return PWR_SUCCESS;
 }
@@ -409,7 +409,7 @@ static int WriteSmartGridGov(PWR_PROC_SmartGridGov *sgGov)
         if (sprintf(gov, "0-%s", sgGov->sgLevel0Gov) < 0) {
             return PWR_ERR_FILE_SPRINTF_FAILED;
         }
-        int ret = WriteFile(SMART_GRID_GOV_PATH, gov, EXT_GOV_NAME_LEN);
+        int ret = WriteFile(SMART_GRID_GOV_PATH, gov, strlen(gov));
         if (ret != PWR_SUCCESS) {
             return ret;
         }
@@ -419,7 +419,7 @@ static int WriteSmartGridGov(PWR_PROC_SmartGridGov *sgGov)
         if (sprintf(gov, "1-%s", sgGov->sgLevel1Gov) < 0) {
             return PWR_ERR_FILE_SPRINTF_FAILED;
         }
-        return WriteFile(SMART_GRID_GOV_PATH, gov, EXT_GOV_NAME_LEN);
+        return WriteFile(SMART_GRID_GOV_PATH, gov, strlen(gov));
     }
     return PWR_SUCCESS;
 }
@@ -676,7 +676,7 @@ void ProcSetSmartGridState(PwrMsg *req)
             ret = PWR_ERR_SYS_EXCEPTION;
             break;
         }
-        ret = WriteFile(SMART_GRID_STATE_PATH, buff, PWR_STATE_LEN);
+        ret = WriteFile(SMART_GRID_STATE_PATH, buff, strlen(buff));
     } while (PWR_FALSE);
 
     SendRspToClient(req, ret, NULL, 0);