diff options
| author | Scott Mayhew <smayhew@redhat.com> | 2020-07-15 13:53:04 -0400 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2020-07-17 09:51:23 -0400 |
| commit | 0794a85fa03aec7d06594e1f9f5143282b0a6728 (patch) | |
| tree | 279c7f36a66e8616648b8216d57d299d0624b913 | |
| parent | 213050a920d7d675eca24bc33262e55f184498ab (diff) | |
| download | nfs-utils-0794a85fa03aec7d06594e1f9f5143282b0a6728.tar.gz | |
nfsdcld: Fix a few Coverity Scan CLANG_WARNING errors
Signed-off-by: Scott Mayhew <smayhew@redhat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
| -rw-r--r-- | utils/nfsdcld/nfsdcld.c | 6 | ||||
| -rw-r--r-- | utils/nfsdcld/sqlite.c | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/utils/nfsdcld/nfsdcld.c b/utils/nfsdcld/nfsdcld.c index 69e1cb27..6cefcf24 100644 --- a/utils/nfsdcld/nfsdcld.c +++ b/utils/nfsdcld/nfsdcld.c @@ -255,11 +255,12 @@ cld_inotify_setup(void) xlog_err("%s: inotify_add_watch failed: %m", __func__); ret = -errno; goto out_err; - } + } else + ret = 0; out_free: free(dirc); - return 0; + return ret; out_err: close(inotify_fd); goto out_free; @@ -799,6 +800,7 @@ main(int argc, char **argv) break; default: usage(progname); + free(progname); return 0; } } diff --git a/utils/nfsdcld/sqlite.c b/utils/nfsdcld/sqlite.c index b6d8f36e..e2586c39 100644 --- a/utils/nfsdcld/sqlite.c +++ b/utils/nfsdcld/sqlite.c @@ -830,7 +830,6 @@ sqlite_prepare_dbh(const char *topdir) switch (ret) { case CLD_SQLITE_LATEST_SCHEMA_VERSION: /* DB is already set up. Do nothing */ - ret = 0; break; case 3: /* Old DB -- update to new schema */ @@ -867,6 +866,8 @@ sqlite_prepare_dbh(const char *topdir) } ret = sqlite_startup_query_grace(); + if (ret) + goto out_close; ret = sqlite_query_first_time(&first_time); if (ret) |