From 8674de3999821b793f5cfd1c9a2eb701b4dedd3c Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 4 Nov 2022 08:44:17 +0000 Subject: [PATCH] string: Move function to check for URL out of request Signed-off-by: Michael Tremer --- src/libpakfire/include/pakfire/string.h | 2 ++ src/libpakfire/request.c | 18 +----------------- src/libpakfire/string.c | 16 ++++++++++++++++ 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/libpakfire/include/pakfire/string.h b/src/libpakfire/include/pakfire/string.h index 2fc1ed96e..603ae6c1f 100644 --- a/src/libpakfire/include/pakfire/string.h +++ b/src/libpakfire/include/pakfire/string.h @@ -68,6 +68,8 @@ int __pakfire_strftime_now(char* buffer, const size_t length, const char* format size_t pakfire_string_parse_bytes(const char* s); +int pakfire_string_is_url(const char* s); + #endif #endif /* PAKFIRE_STRING_H */ diff --git a/src/libpakfire/request.c b/src/libpakfire/request.c index e18a2d7bc..b9f1b5706 100644 --- a/src/libpakfire/request.c +++ b/src/libpakfire/request.c @@ -269,22 +269,6 @@ static int pakfire_request_is_file(const char* what) { return pakfire_string_endswith(what, ".pfm"); } -static int pakfire_request_is_url(const char* what) { - static const char* known_schemas[] = { - "https://", - "http://", - "file://", - NULL, - }; - - for (const char** schema = known_schemas; *schema; schema++) { - if (pakfire_string_startswith(what, *schema)) - return 1; - } - - return 0; -} - static int pakfire_request_add_package(struct pakfire_request* request, int action, struct pakfire_package* pkg, int flags) { // Get the solvable ID @@ -457,7 +441,7 @@ static int pakfire_request_add(struct pakfire_request* request, int action, what++; // Download and add any remote files - if (pakfire_request_is_url(what)) + if (pakfire_string_is_url(what)) return pakfire_request_add_url(request, action, what, extra_flags); // Add any local files diff --git a/src/libpakfire/string.c b/src/libpakfire/string.c index c213215da..d03c8a40e 100644 --- a/src/libpakfire/string.c +++ b/src/libpakfire/string.c @@ -413,3 +413,19 @@ ERROR: errno = EINVAL; return 0; } + +int pakfire_string_is_url(const char* s) { + static const char* known_schemas[] = { + "https://", + "http://", + "file://", + NULL, + }; + + for (const char** schema = known_schemas; *schema; schema++) { + if (pakfire_string_startswith(s, *schema)) + return 1; + } + + return 0; +} -- 2.39.5