提交 70c133a1 编写于 作者: D dapan1121

Merge remote-tracking branch 'origin/refact/submit_req' into refact/submit_req.0

......@@ -2158,10 +2158,10 @@ _exit:
int32_t tPutColData(uint8_t *pBuf, SColData *pColData) {
int32_t n = 0;
n += tPutI16v(pBuf + n, pColData->cid);
n += tPutI8(pBuf + n, pColData->type);
n += tPutI32v(pBuf + n, pColData->nVal);
n += tPutI8(pBuf + n, pColData->flag);
n += tPutI16v(pBuf ? pBuf + n : NULL, pColData->cid);
n += tPutI8(pBuf ? pBuf + n : NULL, pColData->type);
n += tPutI32v(pBuf ? pBuf + n : NULL, pColData->nVal);
n += tPutI8(pBuf ? pBuf + n : NULL, pColData->flag);
// bitmap
switch (pColData->flag) {
......@@ -2185,7 +2185,7 @@ int32_t tPutColData(uint8_t *pBuf, SColData *pColData) {
if (pBuf) memcpy(pBuf + n, pColData->aOffset, pColData->nVal << 2);
n += (pColData->nVal << 2);
n += tPutI32v(pBuf + n, pColData->nData);
n += tPutI32v(pBuf ? pBuf + n : NULL, pColData->nData);
if (pBuf) memcpy(pBuf + n, pColData->pData, pColData->nData);
n += pColData->nData;
} else {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册