Fix ci error.
This commit is contained in:
parent
d778ada8f9
commit
223e0f55c5
|
@ -66,6 +66,7 @@ int32_t taosGetConfigObjSize(SConfigObj *obj) {
|
||||||
if (obj->dtype == CFG_DTYPE_STRING || obj->dtype == CFG_DTYPE_DIR || obj->dtype == CFG_DTYPE_LOCALE ||
|
if (obj->dtype == CFG_DTYPE_STRING || obj->dtype == CFG_DTYPE_DIR || obj->dtype == CFG_DTYPE_LOCALE ||
|
||||||
obj->dtype == CFG_DTYPE_CHARSET || obj->dtype == CFG_DTYPE_TIMEZONE) {
|
obj->dtype == CFG_DTYPE_CHARSET || obj->dtype == CFG_DTYPE_TIMEZONE) {
|
||||||
if (obj->str != NULL) {
|
if (obj->str != NULL) {
|
||||||
|
size += sizeof(int32_t);
|
||||||
size += strlen(obj->str) + 1;
|
size += strlen(obj->str) + 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -758,7 +758,7 @@ SConfigObj *mndInitConfigObj(SConfigItem *pItem) {
|
||||||
case CFG_DTYPE_LOCALE:
|
case CFG_DTYPE_LOCALE:
|
||||||
case CFG_DTYPE_CHARSET:
|
case CFG_DTYPE_CHARSET:
|
||||||
case CFG_DTYPE_TIMEZONE:
|
case CFG_DTYPE_TIMEZONE:
|
||||||
pObj->str = pItem->str;
|
pObj->str = taosStrdup(pItem->str);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return pObj;
|
return pObj;
|
||||||
|
|
|
@ -1145,7 +1145,10 @@ SArray *initVariablesFromItems(SArray *pItems) {
|
||||||
strcpy(info.category, "unknown");
|
strcpy(info.category, "unknown");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
taosArrayPush(pInfos, &info);
|
if (NULL == taosArrayPush(pInfos, &info)) {
|
||||||
|
mError("failed to push info to array while init variables from items,since %s", tstrerror(terrno));
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return pInfos;
|
return pInfos;
|
||||||
|
|
Loading…
Reference in New Issue