diff options
author | Colin Walters <walters@verbum.org> | 2021-12-21 14:23:12 -0500 |
---|---|---|
committer | Colin Walters <walters@verbum.org> | 2021-12-21 15:13:56 -0500 |
commit | 27c14f2be63e959d486fd9d91231e493f27739ba (patch) | |
tree | 4e89911d011d24db5963a8742599cac9a1490617 | |
parent | 998863e74d18ced5b2faecd1e817b8d2d24ecb5c (diff) | |
download | ostree-27c14f2be63e959d486fd9d91231e493f27739ba.tar.gz |
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.
-rw-r--r-- | src/libostree/ostree-soup-uri.c | 45 |
1 files changed, 0 insertions, 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) */ |