dependencies: Drop the legacy logger

[pakfire.git] / src / libpakfire / dependencies.c

diff --git a/src/libpakfire/dependencies.c b/src/libpakfire/dependencies.c
index 9064fb0f659041d2979243c0ef22d5b8d717cc55..fd24198fb7e18ef4ed1af4c1aec28af4f610493b 100644 (file)
--- a/src/libpakfire/dependencies.c
+++ b/src/libpakfire/dependencies.c
@@ -26,9 +26,6 @@
 #include <solv/evr.h>
 #include <solv/pool.h>
 
-// Enable legacy logging
-#define PAKFIRE_LEGACY_LOGGING
-
 #include <pakfire/dependencies.h>
 #include <pakfire/logging.h>
 #include <pakfire/package.h>
@@ -88,11 +85,7 @@ PAKFIRE_EXPORT int pakfire_static_version_compare(const char* evr1, const char*
        return r;
 }
 
-const char* pakfire_dep2str(struct pakfire* pakfire, Id id) {
-       Pool* pool = pakfire_get_solv_pool(pakfire);
-       if (!pool)
-               return NULL;
-
+const char* pakfire_dep2str(struct pakfire_ctx* ctx, Pool* pool, Id id) {
        return pool_dep2str(pool, id);
 }
 
@@ -168,7 +161,7 @@ static Id pakfire_parse_namespace(Pool* pool, const char* s) {
 /*
        This function parses a simple dependency like "foo = 1.2.3"
 */
-static Id pakfire_parse_dep(struct pakfire* pakfire, const char** s) {
+static Id pakfire_parse_dep(struct pakfire_ctx* ctx, Pool* pool, const char** s) {
        Id id = ID_NULL;
 
        if (!s) {
@@ -183,8 +176,6 @@ static Id pakfire_parse_dep(struct pakfire* pakfire, const char** s) {
        if (!p)
                return ID_NULL;
 
-       Pool* pool = pakfire_get_solv_pool(pakfire);
-
        // Consume any leading space
        while (isspace(*p))
                p++;
@@ -248,7 +239,8 @@ static Id pakfire_parse_dep(struct pakfire* pakfire, const char** s) {
 /*
        This function parses any rich dependencies
 */
-static Id pakfire_parse_rich_dep(struct pakfire* pakfire, const char** dep, int flags) {
+static Id pakfire_parse_rich_dep(struct pakfire_ctx* ctx,
+               Pool* pool, const char** dep, int flags) {
        const char* p = *dep;
        Id id;
 
@@ -263,7 +255,7 @@ static Id pakfire_parse_rich_dep(struct pakfire* pakfire, const char** dep, int
        switch (*p) {
                // A new rich dependency
                case '(':
-                       id = pakfire_parse_rich_dep(pakfire, &p, 0);
+                       id = pakfire_parse_rich_dep(ctx, pool, &p, 0);
                        if (!id)
                                return id;
                        break;
@@ -274,7 +266,7 @@ static Id pakfire_parse_rich_dep(struct pakfire* pakfire, const char** dep, int
 
                // Parse a regular dependency
                default:
-                       id = pakfire_parse_dep(pakfire, &p);
+                       id = pakfire_parse_dep(ctx, pool, &p);
                        if (!id)
                                return id;
                        break;
@@ -307,7 +299,7 @@ static Id pakfire_parse_rich_dep(struct pakfire* pakfire, const char** dep, int
                return ID_NULL;
 
        // Parse the next bit
-       Id evr = pakfire_parse_rich_dep(pakfire, &p, flags);
+       Id evr = pakfire_parse_rich_dep(ctx, pool, &p, flags);
 
        // Abort if there was a problem
        if (!evr)
@@ -316,13 +308,11 @@ static Id pakfire_parse_rich_dep(struct pakfire* pakfire, const char** dep, int
        // Store until where we have parsed the string
        *dep = p;
 
-       Pool* pool = pakfire_get_solv_pool(pakfire);
-
        // Combine everything
        return pool_rel2id(pool, id, evr, flags, 1);
 }
 
-Id pakfire_str2dep(struct pakfire* pakfire, const char* dep) {
+Id pakfire_str2dep(struct pakfire_ctx* ctx, Pool* pool, const char* dep) {
        Id id = ID_NULL;
 
        // Invalid input
@@ -347,20 +337,20 @@ Id pakfire_str2dep(struct pakfire* pakfire, const char* dep) {
 
        // Parse any rich dependencies
        if (*s == '(')
-               id = pakfire_parse_rich_dep(pakfire, &s, 0);
+               id = pakfire_parse_rich_dep(ctx, pool, &s, 0);
        else
-               id = pakfire_parse_dep(pakfire, &s);
+               id = pakfire_parse_dep(ctx, pool, &s);
 
        // Return nothing if we could not parse the entire string
        if (id && *s) {
-               DEBUG(pakfire, "Invalid dependency: %s\n", dep);
+               CTX_DEBUG(ctx, "Invalid dependency: %s\n", dep);
                id = ID_NULL;
        }
 
        return id;
 }
 
-int pakfire_str2deps(struct pakfire* pakfire, struct pakfire_package* pkg,
+int pakfire_str2deps(struct pakfire_ctx* ctx, struct pakfire_package* pkg,
                const enum pakfire_package_key key, const char* deps) {
        char* p = NULL;
        int r = 0;