From cefc1d78544f90ffa0d665f823ef8263aec64fe9 Mon Sep 17 00:00:00 2001 From: Luca BRUNO Date: Thu, 25 Nov 2021 15:04:09 +0000 Subject: [PATCH] lib: misc static analysis fixes This fixes a few warnings from coverity, none of which really interesting. --- src/libostree/ostree-fetcher-curl.c | 4 ++-- src/libostree/ostree-repo-commit.c | 2 +- tests/test-commit-sign-sh-ext.c | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/libostree/ostree-fetcher-curl.c b/src/libostree/ostree-fetcher-curl.c index d6534b463e..96f137dfc8 100644 --- a/src/libostree/ostree-fetcher-curl.c +++ b/src/libostree/ostree-fetcher-curl.c @@ -770,8 +770,8 @@ initiate_next_curl_request (FetcherRequest *req, curl_easy_setopt (req->easy, CURLOPT_URL, uri); } - curl_easy_setopt (req->easy, CURLOPT_USERAGENT, - self->custom_user_agent ?: OSTREE_FETCHER_USERAGENT_STRING); + (void) curl_easy_setopt (req->easy, CURLOPT_USERAGENT, + self->custom_user_agent ?: OSTREE_FETCHER_USERAGENT_STRING); /* Set caching request headers */ if (req->if_none_match != NULL) diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c index 8ac963e746..0e830a6fbd 100644 --- a/src/libostree/ostree-repo-commit.c +++ b/src/libostree/ostree-repo-commit.c @@ -1683,8 +1683,8 @@ ostree_repo_prepare_transaction (OstreeRepo *self, /* Set up to abort the transaction if we return early from this function. * This needs to be manually built here due to a circular dependency. */ g_autoptr(OstreeRepoAutoTransaction) txn = g_malloc(sizeof(OstreeRepoAutoTransaction)); + g_assert (txn != NULL); txn->repo = self; - (void) txn; /* Add use to silence static analysis */ memset (&self->txn.stats, 0, sizeof (OstreeRepoTransactionStats)); diff --git a/tests/test-commit-sign-sh-ext.c b/tests/test-commit-sign-sh-ext.c index b5c5dcc65f..173a0c6d47 100644 --- a/tests/test-commit-sign-sh-ext.c +++ b/tests/test-commit-sign-sh-ext.c @@ -44,6 +44,7 @@ corrupt (GBytes *input) g_assert_cmpint (len, >, 0); g_assert_cmpint (len, <, G_MAXINT); g_autofree char *newbuf = g_memdup (buf, len); + g_assert (newbuf != NULL); int o = g_random_int_range (0, len); newbuf[o] = (newbuf[0] + 1);