意见修改

Signed-off-by: songdawei <songdawei1@huawei.com>

common/shm_utils.cpp

@@ -90,7 +90,9 @@ int waitDataWithCode(char* code, char* data)
     while (i < timeout) {
         if (readDataFromShm(str) == 0) {
             if (strncmp(code, str, CODE_HEAD) == 0) {
-                strncpy_s(data, sizeof(data), str + STR_KEY, 1);
+                if (strncpy_s(data, strlen(data), str + STR_KEY, 1) != EOK) {
+                    return -1;
+                }
                 return 0;
             }
         }
@@ -109,8 +111,7 @@ int writeCodeDataToShm(int code, char* buf)
     if (str2 == nullptr) {
         return -1;
     }
-    errno_t eret = strcpy_s(str, strlen(codeStr) + 1, codeStr);
-    if (eret != EOK) {
+    if (strcpy_s(str, strlen(codeStr) + 1, codeStr) != EOK) {
         return -1;
     }
     strcat(str, ":");
@@ -152,7 +153,7 @@ int disconnectShm(void)
 
 int deleteShm(void)
 {
-    if (shmctl(shmid, IPC_RMID, 0) == -1) {
+    if (shmctl(shmid, IPC_RMID, nullptr) == -1) {
         return -1;
     }
     return 0;

distributeddatamgr/distributed_kv_store/disdata_func_test.cpp

@@ -144,9 +144,10 @@ void DistributedKvDataManagerTest::SetUp(void)
     if (str == nullptr) {
         return;
     }
-    errno_t eret = strcpy_s(code, strlen(str) + 1, str);
-    EXPECT_EQ(eret, EOK);
 
+    if (strcpy_s(code, strlen(str) + 1, str) != EOK) {
+        return;
+    }
     memset_s(str, MAX_DATA_LENGTH, 0, MAX_DATA_LENGTH);
     waitDataWithCode(code, str);
     free(str);
@@ -164,13 +165,16 @@ void DistributedKvDataManagerTest::SetUp(void)
     writeCodeDataToShm(CTRL_CODE_DATAMGR_CREATE_KV, str);
 
     memset_s(str, MAX_DATA_LENGTH, 0, MAX_DATA_LENGTH);
-    memset_s(code, sizeof(code), 0, CODE_LEN_TEN);
+    if (memset_s(code, strlen(code), 0, CODE_LEN_TEN) != EOK) {
+        return;
+    }
     Int2String(CTRL_CODE_RESULT_TYPE, str);
     if (str == nullptr) {
         return;
     }
-    eret = strcpy_s(code, strlen(str) + 1, str);
-    EXPECT_EQ(eret, EOK);
+    if (strcpy_s(code, strlen(str) + 1, str) != EOK) {
+        return;
+    }
     waitDataWithCode(code, str);
     free(str);
 }
@@ -222,6 +226,7 @@ HWTEST_F(DistributedKvDataManagerTest, DistribitedKvDataManager_Sync_Push_0100,
     std::vector<std::string> deviceList;
     for (const auto& device : remoteDevice) {
         std::cout << "start sync" << device.deviceId << std::endl;
+        LOG("start sync device.deviceId = %s", device.deviceId.c_str());
         deviceList.push_back(device.deviceId);
     }
     status = DisKvTest::KvStorePtr->Sync(deviceList, SyncMode::PUSH);

distributeddatamgr/process_common/process_msg.cpp

@@ -36,7 +36,7 @@ const int STR_VALUE = 23;
 const int RESULR_TWO = 2;
 const int RESULT_OK = 0;
 const int RESULT_ERR = 1;
-
+namespace disTest {
 class DisKvTest {
 public:
     static DistributedKvDataManager manager;
@@ -49,7 +49,9 @@ public:
     static AppId appId;
     static StoreId storeIdTest;
 };
+}; // namespace disTest
 
+using namespace disTest;
 DistributedKvDataManager DisKvTest::manager;
 std::shared_ptr<SingleKvStore> DisKvTest::KvStorePtr = nullptr; // declare kvstore instance.
 Status DisKvTest::statusGetKvStore = Status::ERROR;
@@ -90,7 +92,7 @@ char* getRealData(char* str, char* delims)
     return second;
 }
 
-void getParam(char* putData, char ret[][MAX_DATA_LENGTH])
+void getParam(char* putData, char ret[][1024])
 {
     char str[MAX_DATA_LENGTH] = { 0 };
     if (putData == nullptr) {
@@ -133,24 +135,18 @@ int ProcessDataMgr(int code, char* recvData)
     }
 
     switch (code) {
-        case CTRL_CODE_DATAMGR_GET_DATA: {
+        case CTRL_CODE_DATAMGR_GET_DATA:
             return processGetData(recvData);
-        } break;
-        case CTRL_CODE_DATAMGR_GET_DATA_REPLY: {
+        case CTRL_CODE_DATAMGR_GET_DATA_REPLY:
             return RESULT_OK;
-        } break;
-        case CTRL_CODE_DATAMGR_CREATE_KV: {
+        case CTRL_CODE_DATAMGR_CREATE_KV:
             return processCreateKv(recvData);
-        } break;
-        case CTRL_CODE_DATAMGR_DELETE_KV: {
+        case CTRL_CODE_DATAMGR_DELETE_KV:
             return processDeleteKv(recvData);
-        } break;
-        case CTRL_CODE_DATAMGR_PUT_DATA: {
+        case CTRL_CODE_DATAMGR_PUT_DATA:
             return processPutData(recvData);
-        }
-        case CTRL_CODE_DATAMGR_DELETE_DATA: {
+        case CTRL_CODE_DATAMGR_DELETE_DATA:
             return processDeletetData(recvData);
-        } break;
         default:
             break;
     }

distributeddatamgr/process_common/process_msg.h

@@ -71,6 +71,6 @@ int processPutData(char* putData);
 int processCreateKv(char* putData);
 int processDeleteKv(char* putData);
 char* getRealData(char* str, char* delims);
-void getParam(char* str, char ret[][1024]);
+void getParam(char* putData, char ret[][1024]);
 void initKvstoreId(void);
 #endif