From e80c5f3282bf399e61625d99a6e9597a1dba94df Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Mon, 17 Aug 2020 14:44:50 +0800 Subject: [PATCH] fix part of coverity scan problem --- src/tsdb/src/tsdbFile.c | 4 +++- src/tsdb/src/tsdbMemTable.c | 4 ++-- src/util/src/tkvstore.c | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/tsdb/src/tsdbFile.c b/src/tsdb/src/tsdbFile.c index d960dfb7ba..154d728024 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 2df8ff26bd..f6a7f1b35c 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 9fab4a5936..6f7b2ffb88 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; -- GitLab