Merge pull request #2490 from lucab/ups/static-fixes

ostreedev · Nov 26, 2021 · 267ca93 · 267ca93
2 parents 2dc6ec7 + cefc1d7
commit 267ca93
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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);