]> git.ipfire.org Git - pakfire.git/commitdiff
repo: Make repo name check function more generic
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 30 Sep 2021 14:46:20 +0000 (14:46 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 30 Sep 2021 14:46:20 +0000 (14:46 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/libpakfire/include/pakfire/repo.h
src/libpakfire/package.c
src/libpakfire/repo.c

index adf9d26c979291a0c0b718a318590896a2fc72f0..d925623d265bbbf15132ab5bd618f9e7d8baa2a2 100644 (file)
@@ -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);
index 490d13834d0afdd34515cb4548cb1426d472af65..a5e0f07dc99b8db4dc86c8f9ac6540d29551945b 100644 (file)
@@ -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);
                }
index 642bde7dacbe7a1ca8c7e0f8f906a63d7ce019fc..39765388bb01f49e4eb8a271e8f1bc3631b08544 100644 (file)
@@ -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(