util: Rename pakfire_parse_dep to pakfire_str2dep

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/libpakfire/archive.c b/src/libpakfire/archive.c
index 81277229a358d00f006345584a8dd3db0e46aa00..72b252d740af1e92f033c9d977b59326596c8529 100644 (file)
--- a/src/libpakfire/archive.c
+++ b/src/libpakfire/archive.c
@@ -2144,7 +2144,7 @@ PAKFIRE_EXPORT int pakfire_archive_make_package(struct pakfire_archive* archive,
        for (const struct __relation* relation = relations; relation->type; relation++) {
                char* relations = pakfire_archive_get(archive, "dependencies", relation->type);
                if (relations)
-                       pakfire_parse_deps(archive->pakfire, pkg, relation->func, relations);
+                       pakfire_str2deps(archive->pakfire, pkg, relation->func, relations);
        }
 
        // Import filelist

diff --git a/src/libpakfire/db.c b/src/libpakfire/db.c
index 70cf0b76fd8abc32c86e778a51419fedeb55cc7a..f715b4958edb772eb86176ad21a0058243286248 100644 (file)
--- a/src/libpakfire/db.c
+++ b/src/libpakfire/db.c
@@ -1586,7 +1586,7 @@ static int pakfire_db_load_package(struct pakfire_db* db, struct pakfire_repo* r
        for (const struct dependency* deps = dependencies; deps->field; deps++) {
                const char* relations = (const char*)sqlite3_column_text(stmt, deps->field);
                if (relations) {
-                       pakfire_parse_deps(db->pakfire, pkg, deps->func, relations);
+                       pakfire_str2deps(db->pakfire, pkg, deps->func, relations);
                }
        }
 

diff --git a/src/libpakfire/include/pakfire/util.h b/src/libpakfire/include/pakfire/util.h
index 6f6d5cbb0b6781b09140393adf2314cf845517a1..b143f91f325a64b620a0c3259dd92127dffa66e5 100644 (file)
--- a/src/libpakfire/include/pakfire/util.h
+++ b/src/libpakfire/include/pakfire/util.h
@@ -32,8 +32,8 @@
 #include <pakfire/package.h>
 
 const char* pakfire_dep2str(struct pakfire* pakfire, Id id);
-Id pakfire_parse_dep(struct pakfire* pakfire, const char* s);
-void pakfire_parse_deps(struct pakfire* pakfire, struct pakfire_package* pkg,
+Id pakfire_str2dep(struct pakfire* pakfire, const char* s);
+void pakfire_str2deps(struct pakfire* pakfire, struct pakfire_package* pkg,
        void (*func)(struct pakfire_package* pkg, const char* dep), const char* deps);
 
 #define pakfire_string_format(s, fmt, ...) snprintf(s, sizeof(s) - 1, fmt, __VA_ARGS__)

diff --git a/src/libpakfire/package.c b/src/libpakfire/package.c
index a31a70944b662ecdce1efb0740e0e60542855614..39554d3f4e3715fb1db732f0dd5f88d323a70499 100644 (file)
--- a/src/libpakfire/package.c
+++ b/src/libpakfire/package.c
@@ -786,7 +786,7 @@ static void pakfire_package_add_dep(struct pakfire_package* pkg, Id type,
        Solvable* s = get_solvable(pkg);
 
        // Parse the dependency
-       Id id = pakfire_parse_dep(pkg->pakfire, dep);
+       Id id = pakfire_str2dep(pkg->pakfire, dep);
        if (!id)
                return;
 

diff --git a/src/libpakfire/pakfire.c b/src/libpakfire/pakfire.c
index 43dd11e122bf30e6444cd82b3cfcbbe56b5f3b6b..5b0aebb682a53adc10616f0c4e2d046f3142a802 100644 (file)
--- a/src/libpakfire/pakfire.c
+++ b/src/libpakfire/pakfire.c
@@ -1427,7 +1427,7 @@ static int pakfire_search_dep(struct pakfire* pakfire, Id type, const char* what
        pakfire_pool_apply_changes(pakfire);
 
        // Translate dependency to ID
-       Id dep = pakfire_parse_dep(pakfire, what);
+       Id dep = pakfire_str2dep(pakfire, what);
        if (!dep) {
                errno = EINVAL;
                return 1;

diff --git a/src/libpakfire/parser.c b/src/libpakfire/parser.c
index a43a5dd1fd68fc9c9f527b672adf134d2bbed8fd..6ad92a1cc0b3a7db80e1238c6e1e358cde37a2a0 100644 (file)
--- a/src/libpakfire/parser.c
+++ b/src/libpakfire/parser.c
@@ -988,7 +988,7 @@ int pakfire_parser_create_package(struct pakfire_parser* parser,
        if (is_source) {
                char* requires = pakfire_parser_get(parser, "build", "requires");
                if (requires) {
-                       pakfire_parse_deps(parser->pakfire, *pkg,
+                       pakfire_str2deps(parser->pakfire, *pkg,
                                pakfire_package_add_requires, requires);
                        free(requires);
                }
@@ -1012,7 +1012,7 @@ int pakfire_parser_create_package(struct pakfire_parser* parser,
                for (const struct relation* relation = relations; relation->type; relation++) {
                        char* relations = pakfire_parser_get(parser, namespace, relation->type);
                        if (relations) {
-                               pakfire_parse_deps(parser->pakfire, *pkg, relation->func, relations);
+                               pakfire_str2deps(parser->pakfire, *pkg, relation->func, relations);
                                free(relations);
                        }
                }

diff --git a/src/libpakfire/request.c b/src/libpakfire/request.c
index d69566889cf22a516e46a3cca3a32b0c7580e269..c27a8af772dac85f14e7953343a6e2592122c736 100644 (file)
--- a/src/libpakfire/request.c
+++ b/src/libpakfire/request.c
@@ -367,7 +367,7 @@ static int pakfire_request_add_job(struct pakfire_request* request, int action,
 
        // Did we find anything?
        if (jobs.count == 0) {
-               Id id = pakfire_parse_dep(request->pakfire, what);
+               Id id = pakfire_str2dep(request->pakfire, what);
                if (!id)
                        return 1;
 

diff --git a/src/libpakfire/util.c b/src/libpakfire/util.c
index a470221b58137c84b0f043ad723f4e6cf707fb88..063ec14bf17a97f77853853484ca6c970add3538 100644 (file)
--- a/src/libpakfire/util.c
+++ b/src/libpakfire/util.c
@@ -74,7 +74,7 @@ static Id pakfire_parse_namespace(Pool* pool, const char* s) {
        return pool_rel2id(pool, namespace, id, REL_NAMESPACE, 1);
 }
 
-Id pakfire_parse_dep(struct pakfire* pakfire, const char* s) {
+Id pakfire_str2dep(struct pakfire* pakfire, const char* s) {
        Id id;
 
        if (!s) {
@@ -141,7 +141,7 @@ Id pakfire_parse_dep(struct pakfire* pakfire, const char* s) {
        return id;
 }
 
-void pakfire_parse_deps(struct pakfire* pakfire, struct pakfire_package* pkg,
+void pakfire_str2deps(struct pakfire* pakfire, struct pakfire_package* pkg,
                void (*func)(struct pakfire_package* pkg, const char* dep), const char* deps) {
        char* p = strdupa(deps);