From: Michael Tremer Date: Wed, 13 Jan 2021 12:14:46 +0000 (+0000) Subject: libpakfire: util: Make pakfire_string_startswith return 1 on success X-Git-Tag: 0.9.28~1285^2~882 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e3ca618b0f2d64544f0b5686d4f10f15d1b4bd5;p=pakfire.git libpakfire: util: Make pakfire_string_startswith return 1 on success Signed-off-by: Michael Tremer --- diff --git a/src/libpakfire/pakfire.c b/src/libpakfire/pakfire.c index 6b39fd322..fe5c8246c 100644 --- a/src/libpakfire/pakfire.c +++ b/src/libpakfire/pakfire.c @@ -93,7 +93,7 @@ PAKFIRE_EXPORT Pakfire pakfire_create(const char* path, const char* arch) { } // Path must be absolute - if (pakfire_string_startswith(path, "/")) { + if (!pakfire_string_startswith(path, "/")) { errno = -EINVAL; return NULL; } diff --git a/src/libpakfire/util.c b/src/libpakfire/util.c index 38d9d5ec0..c5f8e648c 100644 --- a/src/libpakfire/util.c +++ b/src/libpakfire/util.c @@ -95,8 +95,8 @@ char* pakfire_strdup(const char* s) { return r; } -int pakfire_string_startswith(const char* s, const char* prefix) { - return strncmp(s, prefix, strlen(prefix)); +PAKFIRE_EXPORT int pakfire_string_startswith(const char* s, const char* prefix) { + return !strncmp(s, prefix, strlen(prefix)); } char* pakfire_format_size(double size) { @@ -148,9 +148,8 @@ PAKFIRE_EXPORT char* pakfire_path_join(const char* first, const char* second) { } PAKFIRE_EXPORT const char* pakfire_path_relpath(const char* root, const char* path) { - if (pakfire_string_startswith(path, root) == 0) { + if (pakfire_string_startswith(path, root)) return path + strlen(root); - } return NULL; }