diff --git a/source/dnode/vnode/src/sma/smaSnapshot.c b/source/dnode/vnode/src/sma/smaSnapshot.c index db9fcde85a3a5d8b6d1a634ddae81fcbed39a3af..34f884f9f95776be10f1416fdf50f99a8fafce6e 100644 --- a/source/dnode/vnode/src/sma/smaSnapshot.c +++ b/source/dnode/vnode/src/sma/smaSnapshot.c @@ -376,7 +376,7 @@ int32_t rsmaSnapWriterClose(SRSmaSnapWriter** ppWriter, int8_t rollback) { if (taosRemoveFile(pWriter->pQTaskFWriter->fname) != 0) { smaWarn("vgId:%d, vnode snapshot rsma writer failed to remove %s since %s", SMA_VID(pWriter->pSma), pWriter->pQTaskFWriter->fname ? pWriter->pQTaskFWriter->fname : "NULL", - terrstr(TAOS_SYSTEM_ERROR(errno))); + tstrerror(TAOS_SYSTEM_ERROR(errno))); } } } else { diff --git a/source/libs/tfs/src/tfs.c b/source/libs/tfs/src/tfs.c index a78d324622c0577b673cbb39f58712a81d4acab6..b8786a85a971b658ebc91b2040c5b7078ac9fbfb 100644 --- a/source/libs/tfs/src/tfs.c +++ b/source/libs/tfs/src/tfs.c @@ -354,7 +354,7 @@ const STfsFile *tfsReaddir(STfsDir *pTfsDir) { char *name = taosGetDirEntryName(pDirEntry); if (strcmp(name, ".") == 0 || strcmp(name, "..") == 0) continue; - if (pTfsDir->dirName == NULL || pTfsDir->dirName[0] == 0) { + if (pTfsDir->dirName[0] == 0) { snprintf(bname, TMPNAME_LEN * 2, "%s", name); } else { snprintf(bname, TMPNAME_LEN * 2, "%s%s%s", pTfsDir->dirName, TD_DIRSEP, name);