From 27c14f2be63e959d486fd9d91231e493f27739ba Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 21 Dec 2021 14:23:12 -0500 Subject: soup-uri: Fix clang-analyzer warning by dropping dead code Fixes `Argument with 'nonnull' attribute passed null` by making the code not exist at all anymore. In upstream libsoup this code is gone too; it uses `GUri` from glib which we probably could now too, but one thing at a time. --- src/libostree/ostree-soup-uri.c | 45 ----------------------------------------- 1 file changed, 45 deletions(-) diff --git a/src/libostree/ostree-soup-uri.c b/src/libostree/ostree-soup-uri.c index ba14e5c6..bfc5dd1a 100644 --- a/src/libostree/ostree-soup-uri.c +++ b/src/libostree/ostree-soup-uri.c @@ -16,8 +16,6 @@ char *soup_uri_decoded_copy (const char *str, int length, int *decoded_length); char *soup_uri_to_string_internal (SoupURI *uri, gboolean just_path_and_query, gboolean force_port); -gboolean soup_uri_is_http (SoupURI *uri, char **aliases); -gboolean soup_uri_is_https (SoupURI *uri, char **aliases); /* OSTREECHANGE: import soup-misc's char helpers */ #define SOUP_CHAR_URI_PERCENT_ENCODED 0x01 @@ -1436,48 +1434,5 @@ soup_uri_host_equal (gconstpointer v1, gconstpointer v2) return g_ascii_strcasecmp (one->host, two->host) == 0; } -gboolean -soup_uri_is_http (SoupURI *uri, char **aliases) -{ - int i; - - if (uri->scheme == SOUP_URI_SCHEME_HTTP) - return TRUE; - else if (uri->scheme == SOUP_URI_SCHEME_HTTPS) - return FALSE; - else if (!aliases) - return FALSE; - - for (i = 0; aliases[i]; i++) { - if (uri->scheme == aliases[i]) - return TRUE; - } - - if (!aliases[1] && !strcmp (aliases[0], "*")) - return TRUE; - else - return FALSE; -} - -gboolean -soup_uri_is_https (SoupURI *uri, char **aliases) -{ - int i; - - if (uri->scheme == SOUP_URI_SCHEME_HTTPS) - return TRUE; - else if (uri->scheme == SOUP_URI_SCHEME_HTTP) - return FALSE; - else if (!aliases) - return FALSE; - - for (i = 0; aliases[i]; i++) { - if (uri->scheme == aliases[i]) - return TRUE; - } - - return FALSE; -} - /* OSTREECHANGE: drop boxed type definition */ /* G_DEFINE_BOXED_TYPE (SoupURI, soup_uri, soup_uri_copy, soup_uri_free) */ -- cgit v1.2.1 From d2f5a0476f37973d2027029662f41413d2d8e243 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 21 Dec 2021 14:24:03 -0500 Subject: tests: Fix clang-analyzer not seeing through `g_error()` Basically due to the glib structured logging rework we lost the `noreturn` attribute on `g_error()`. This is fixed in glib as of https://gitlab.gnome.org/GNOME/glib/-/commit/f97ff20adf4eb7b952dd83e2c13046fe9e282f50 But we might as well just throw an error here. --- tests/test-commit-sign-sh-ext.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/test-commit-sign-sh-ext.c b/tests/test-commit-sign-sh-ext.c index dee22573..6dc287d9 100644 --- a/tests/test-commit-sign-sh-ext.c +++ b/tests/test-commit-sign-sh-ext.c @@ -80,26 +80,26 @@ run (GError **error) if (ostree_repo_signature_verify_commit_data (repo, "origin", commit_bytes, detached_meta_bytes, OSTREE_REPO_VERIFY_FLAGS_NO_GPG | OSTREE_REPO_VERIFY_FLAGS_NO_SIGNAPI, &verify_report, error)) - g_error ("Should not have validated"); + return glnx_throw (error, "Should not have validated"); assert_error_contains (error, "No commit verification types enabled"); // No signatures g_autoptr(GBytes) empty = g_bytes_new_static ("", 0); if (ostree_repo_signature_verify_commit_data (repo, "origin", commit_bytes, empty, 0, &verify_report, error)) - g_error ("Should not have validated"); + return glnx_throw (error, "Should not have validated"); assert_error_contains (error, "no signatures found"); // No such remote if (ostree_repo_signature_verify_commit_data (repo, "nosuchremote", commit_bytes, detached_meta_bytes, 0, &verify_report, error)) - g_error ("Should not have validated"); + return glnx_throw (error, "Should not have validated"); assert_error_contains (error, "Remote \"nosuchremote\" not found"); // Corrupted commit g_autoptr(GBytes) corrupted_commit = corrupt (commit_bytes); if (ostree_repo_signature_verify_commit_data (repo, "origin", corrupted_commit, detached_meta_bytes, 0, &verify_report, error)) - g_error ("Should not have validated"); + return glnx_throw (error, "Should not have validated"); assert_error_contains (error, "BAD signature"); return TRUE; -- cgit v1.2.1