From: Michael Tremer Date: Thu, 30 Sep 2021 14:46:20 +0000 (+0000) Subject: repo: Make repo name check function more generic X-Git-Tag: 0.9.28~915 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=866aa605b41c167bba0b3400d04cdee77bcd59b6;p=pakfire.git repo: Make repo name check function more generic Signed-off-by: Michael Tremer --- diff --git a/src/libpakfire/include/pakfire/repo.h b/src/libpakfire/include/pakfire/repo.h index adf9d26c9..d925623d2 100644 --- a/src/libpakfire/include/pakfire/repo.h +++ b/src/libpakfire/include/pakfire/repo.h @@ -108,7 +108,7 @@ int pakfire_repo_compose(struct pakfire* pakfire, const char* path, int flags, #define PAKFIRE_REPO_LOCAL_PRIORITY 1000 #define PAKFIRE_REPO_SYSTEM "@system" -int pakfire_repo_is_dummy(struct pakfire_repo* repo); +int pakfire_repo_name_equals(struct pakfire_repo* repo, const char* name); int pakfire_repo_import(struct pakfire* pakfire, struct pakfire_config* config); const char* pakfire_repo_get_path(struct pakfire_repo* repo); diff --git a/src/libpakfire/package.c b/src/libpakfire/package.c index 490d13834..a5e0f07dc 100644 --- a/src/libpakfire/package.c +++ b/src/libpakfire/package.c @@ -977,7 +977,7 @@ PAKFIRE_EXPORT char* pakfire_package_dump(struct pakfire_package* pkg, int flags // Repository struct pakfire_repo* repo = pakfire_package_get_repo(pkg); if (repo) { - if (!pakfire_repo_is_dummy(repo)) { + if (!pakfire_repo_name_equals(repo, PAKFIRE_REPO_DUMMY)) { const char* repo_name = pakfire_repo_get_name(repo); pakfire_package_dump_add_line(&string, _("Repo"), repo_name); } diff --git a/src/libpakfire/repo.c b/src/libpakfire/repo.c index 642bde7da..39765388b 100644 --- a/src/libpakfire/repo.c +++ b/src/libpakfire/repo.c @@ -85,12 +85,12 @@ static int pakfire_repo_is_internal(struct pakfire_repo* repo) { return (*name == '@'); } -int pakfire_repo_is_dummy(struct pakfire_repo* repo) { - const char* name = pakfire_repo_get_name(repo); - if (!name) +int pakfire_repo_name_equals(struct pakfire_repo* repo, const char* name) { + const char* n = pakfire_repo_get_name(repo); + if (!n) return 0; - return strcmp(name, PAKFIRE_REPO_DUMMY) == 0; + return strcmp(n, name) == 0; } static int pakfire_repo_retrieve(