diff --git a/src/sync/src/syncMain.c b/src/sync/src/syncMain.c index d0dc2912573c744c6faec9f34b1740324c7e2bb9..ac79b486061c191506e527e031e93069759abbb0 100644 --- a/src/sync/src/syncMain.c +++ b/src/sync/src/syncMain.c @@ -949,9 +949,10 @@ static int32_t syncProcessPeerMsg(void *param, void *buffer) { static void syncSendPeersStatusMsgToPeer(SSyncPeer *pPeer, char ack, int8_t type, uint16_t tranId) { if (pPeer->peerFd < 0 || pPeer->ip == 0) return; - SSyncNode *pNode = pPeer->pSyncNode; - SPeersStatus msg = {0}; + SSyncNode * pNode = pPeer->pSyncNode; + SPeersStatus msg; + memset(&msg, 0, sizeof(SPeersStatus)); syncBuildPeersStatus(&msg, pNode->vgId); msg.role = nodeRole; diff --git a/src/sync/src/syncMsg.c b/src/sync/src/syncMsg.c index 6e1dea854b41e35176da36afbb81c8c42397e744..034f9a98a70c7373b74a84d24d478b52d7bf4df9 100644 --- a/src/sync/src/syncMsg.c +++ b/src/sync/src/syncMsg.c @@ -88,7 +88,6 @@ void syncBuildSyncDataMsg(SSyncMsg *pMsg, int32_t vgId) { syncBuildMsg(pMsg, vgI void syncBuildSyncSetupMsg(SSyncMsg *pMsg, int32_t vgId) { syncBuildMsg(pMsg, vgId, TAOS_SMSG_SETUP); } void syncBuildPeersStatus(SPeersStatus *pMsg, int32_t vgId) { - memset(pMsg, 0, sizeof(SPeersStatus)); pMsg->head.type = TAOS_SMSG_STATUS; pMsg->head.vgId = vgId; pMsg->head.len = sizeof(SPeersStatus) - sizeof(SSyncHead); @@ -96,7 +95,6 @@ void syncBuildPeersStatus(SPeersStatus *pMsg, int32_t vgId) { } void syncBuildFileAck(SFileAck *pMsg, int32_t vgId) { - memset(pMsg, 0, sizeof(SFileAck)); pMsg->head.type = TAOS_SMSG_SYNC_FILE_RSP; pMsg->head.vgId = vgId; pMsg->head.len = sizeof(SFileAck) - sizeof(SSyncHead); @@ -104,7 +102,6 @@ void syncBuildFileAck(SFileAck *pMsg, int32_t vgId) { } void syncBuildFileInfo(SFileInfo *pMsg, int32_t vgId) { - memset(pMsg, 0, sizeof(SFileInfo)); pMsg->head.type = TAOS_SMSG_SYNC_FILE; pMsg->head.vgId = vgId; pMsg->head.len = sizeof(SFileInfo) - sizeof(SSyncHead); diff --git a/src/sync/src/syncRestore.c b/src/sync/src/syncRestore.c index 088215ecc76164f7315aef7f6c570c0d55f26d9c..27570ce8f28e56db8b59f63420ec314ff3ed3a33 100644 --- a/src/sync/src/syncRestore.c +++ b/src/sync/src/syncRestore.c @@ -100,6 +100,7 @@ static int32_t syncRestoreFile(SSyncPeer *pPeer, uint64_t *fversion) { &sinfo.fversion); // if file not there or magic is not the same, file shall be synced + memset(&fileAck, 0, sizeof(SFileAck)); syncBuildFileAck(&fileAck, pNode->vgId); fileAck.sync = (sinfo.magic != minfo.magic || sinfo.name[0] == 0) ? 1 : 0;