diff --git a/src/tsdb/src/tsdbFile.c b/src/tsdb/src/tsdbFile.c index d960dfb7babcc795ac581d2d3bbf7aa77b05596f..154d7280241ed1501b2058485e6863dd3055c10f 100644 --- a/src/tsdb/src/tsdbFile.c +++ b/src/tsdb/src/tsdbFile.c @@ -132,7 +132,7 @@ int tsdbOpenFileH(STsdbRepo *pRepo) { char *fname = malloc(strlen(tDataDir) + strlen(dp->d_name) + 2); if (fname == NULL) goto _err; sprintf(fname, "%s/%s", tDataDir, dp->d_name); - remove(fname); + (void)remove(fname); free(fname); } else if (code == REG_NOMATCH) { tsdbError("vgId:%d invalid file %s exists, ignore it", REPO_ID(pRepo), dp->d_name); @@ -447,6 +447,8 @@ void tsdbGetFileInfoImpl(char *fname, uint32_t *magic, int32_t *size) { *magic = info.magic; *size = (int32_t)offset; + return; + _err: if (fd >= 0) close(fd); *magic = TSDB_FILE_INIT_MAGIC; diff --git a/src/tsdb/src/tsdbMemTable.c b/src/tsdb/src/tsdbMemTable.c index 2df8ff26bd3874502698c7181d2dc1d532afa91e..f6a7f1b35cf7992b3bb9ccdab5892418c8174eb1 100644 --- a/src/tsdb/src/tsdbMemTable.c +++ b/src/tsdb/src/tsdbMemTable.c @@ -683,11 +683,11 @@ static int tsdbCommitToFile(STsdbRepo *pRepo, int fid, SCommitIter *iters, SRWHe pthread_rwlock_wrlock(&(pFileH->fhlock)); - rename(helperNewHeadF(pHelper)->fname, helperHeadF(pHelper)->fname); + (void)rename(helperNewHeadF(pHelper)->fname, helperHeadF(pHelper)->fname); pGroup->files[TSDB_FILE_TYPE_HEAD].info = helperNewHeadF(pHelper)->info; if (newLast) { - rename(helperNewLastF(pHelper)->fname, helperLastF(pHelper)->fname); + (void)rename(helperNewLastF(pHelper)->fname, helperLastF(pHelper)->fname); pGroup->files[TSDB_FILE_TYPE_LAST].info = helperNewLastF(pHelper)->info; } else { pGroup->files[TSDB_FILE_TYPE_LAST].info = helperLastF(pHelper)->info; diff --git a/src/util/src/tkvstore.c b/src/util/src/tkvstore.c index 9fab4a593606b8806afd4d6745753277c0e6fa29..6f7b2ffb88c1e86593743277202b106fc0b1bec8 100644 --- a/src/util/src/tkvstore.c +++ b/src/util/src/tkvstore.c @@ -351,6 +351,8 @@ void tsdbGetStoreInfo(char *fname, uint32_t *magic, int32_t *size) { *magic = info.magic; *size = (int32_t)offset; + return; + _err: if (fd >= 0) close(fd); *magic = TD_KVSTORE_INIT_MAGIC;