Make steps private

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

diff --git a/src/libpakfire/include/pakfire/step.h b/src/libpakfire/include/pakfire/step.h
index f8bb59ff052d92a1d805bc1671f7d3a6c2c9c443..c732690f3dd2bf929388d755deb058a89f780c29 100644 (file)
--- a/src/libpakfire/include/pakfire/step.h
+++ b/src/libpakfire/include/pakfire/step.h
@@ -21,6 +21,9 @@
 #ifndef PAKFIRE_STEP_H
 #define PAKFIRE_STEP_H
 
+#ifdef PAKFIRE_PRIVATE
+
+#include <pakfire/db.h>
 #include <pakfire/types.h>
 
 int pakfire_step_create(PakfireStep* step, Pakfire pakfire,
@@ -37,10 +40,6 @@ ssize_t pakfire_step_get_installsizechange(PakfireStep step);
 
 int pakfire_step_needs_download(PakfireStep step);
 
-#ifdef PAKFIRE_PRIVATE
-
-#include <pakfire/db.h>
-
 int pakfire_step_run(PakfireStep step, struct pakfire_db* db, pakfire_action_type_t action);
 
 #endif

diff --git a/src/libpakfire/libpakfire.sym b/src/libpakfire/libpakfire.sym
index b430d38cb9a32daf5d9fe24f3dbaf037a4259aa8..fd3e894fd7459a8e26c8ddb2d4c6c8657023d6ab 100644 (file)
--- a/src/libpakfire/libpakfire.sym
+++ b/src/libpakfire/libpakfire.sym
@@ -396,17 +396,6 @@ global:
        pakfire_solution_to_string;
        pakfire_solution_unref;
 
-       # step
-       pakfire_step_create;
-       pakfire_step_get_downloadsize;
-       pakfire_step_get_installsizechange;
-       pakfire_step_get_package;
-       pakfire_step_get_type;
-       pakfire_step_get_type_string;
-       pakfire_step_needs_download;
-       pakfire_step_ref;
-       pakfire_step_unref;
-
        # transaction
        pakfire_transaction_count;
        pakfire_transaction_create;

diff --git a/src/libpakfire/step.c b/src/libpakfire/step.c
index 8dfdef6aa44314fc1d65969ab30d7c4bae088d95..19b934eed33b91cba577e34faf0cec07ec4a3df0 100644 (file)
--- a/src/libpakfire/step.c
+++ b/src/libpakfire/step.c
@@ -49,7 +49,7 @@ struct _PakfireStep {
        int nrefs;
 };
 
-PAKFIRE_EXPORT int pakfire_step_create(PakfireStep* step, Pakfire pakfire,
+int pakfire_step_create(PakfireStep* step, Pakfire pakfire,
                pakfire_step_type_t type, PakfirePackage pkg) {
        PakfireStep s = calloc(1, sizeof(*s));
        if (!s)
@@ -71,7 +71,7 @@ PAKFIRE_EXPORT int pakfire_step_create(PakfireStep* step, Pakfire pakfire,
        return 0;
 }
 
-PAKFIRE_EXPORT PakfireStep pakfire_step_ref(PakfireStep step) {
+PakfireStep pakfire_step_ref(PakfireStep step) {
        step->nrefs++;
 
        return step;
@@ -87,7 +87,7 @@ static void pakfire_step_free(PakfireStep step) {
        free(step);
 }
 
-PAKFIRE_EXPORT PakfireStep pakfire_step_unref(PakfireStep step) {
+PakfireStep pakfire_step_unref(PakfireStep step) {
        if (--step->nrefs > 0)
                return step;
 
@@ -95,15 +95,15 @@ PAKFIRE_EXPORT PakfireStep pakfire_step_unref(PakfireStep step) {
        return NULL;
 }
 
-PAKFIRE_EXPORT PakfirePackage pakfire_step_get_package(PakfireStep step) {
+PakfirePackage pakfire_step_get_package(PakfireStep step) {
        return pakfire_package_ref(step->package);
 }
 
-PAKFIRE_EXPORT pakfire_step_type_t pakfire_step_get_type(PakfireStep step) {
+pakfire_step_type_t pakfire_step_get_type(PakfireStep step) {
        return step->type;
 }
 
-PAKFIRE_EXPORT const char* pakfire_step_get_type_string(PakfireStep step) {
+const char* pakfire_step_get_type_string(PakfireStep step) {
        pakfire_step_type_t type = pakfire_step_get_type(step);
 
        switch(type) {
@@ -148,14 +148,14 @@ static int pakfire_step_get_downloadtype(PakfireStep step) {
        return 0;
 }
 
-PAKFIRE_EXPORT size_t pakfire_step_get_downloadsize(PakfireStep step) {
+size_t pakfire_step_get_downloadsize(PakfireStep step) {
        if (pakfire_step_get_downloadtype(step))
                return pakfire_package_get_downloadsize(step->package);
 
        return 0;
 }
 
-PAKFIRE_EXPORT ssize_t pakfire_step_get_installsizechange(PakfireStep step) {
+ssize_t pakfire_step_get_installsizechange(PakfireStep step) {
        ssize_t installsize = pakfire_package_get_installsize(step->package);
 
        pakfire_step_type_t type = pakfire_step_get_type(step);
@@ -173,7 +173,7 @@ PAKFIRE_EXPORT ssize_t pakfire_step_get_installsizechange(PakfireStep step) {
        return installsize;
 }
 
-PAKFIRE_EXPORT int pakfire_step_needs_download(PakfireStep step) {
+int pakfire_step_needs_download(PakfireStep step) {
        if (!pakfire_step_get_downloadtype(step))
                return false;
 
@@ -340,7 +340,7 @@ static const char* pakfire_action_type_string(pakfire_action_type_t type) {
        return NULL;
 }
 
-PAKFIRE_EXPORT int pakfire_step_run(PakfireStep step,
+int pakfire_step_run(PakfireStep step,
                struct pakfire_db* db, const pakfire_action_type_t action) {
        DEBUG(step->pakfire, "Running Step %p (%s)\n", step, pakfire_action_type_string(action));