snapshot: Create its own type

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

diff --git a/src/pakfire/pakfire.c b/src/pakfire/pakfire.c
index 62a5ee5a7fea0174d55b65630933835066b32fa4..a64e094ce522919821d1bc30ef90cb331f816084 100644 (file)
--- a/src/pakfire/pakfire.c
+++ b/src/pakfire/pakfire.c
@@ -112,7 +112,7 @@ struct pakfire {
        struct pakfire_distro distro;
 
        // Snapshot
-       struct pakfire_snapshot* snapshot;
+       pakfire_snapshot* snapshot;
 
        // States
        unsigned int in_free:1;
@@ -1912,7 +1912,7 @@ ERROR:
 }
 
 int pakfire_update_snapshot(struct pakfire* pakfire) {
-       struct pakfire_snapshot* snapshot = NULL;
+       pakfire_snapshot* snapshot = NULL;
        int r;
 
        // Make a new snapshot

diff --git a/src/pakfire/snapshot.c b/src/pakfire/snapshot.c
index 0db0311b7f796081327505b783c2403a03d88d8c..be6d756af479b84d561e323e2d701ab357ff136f 100644 (file)
--- a/src/pakfire/snapshot.c
+++ b/src/pakfire/snapshot.c
@@ -65,7 +65,7 @@ struct pakfire_snapshot {
        } state;
 };
 
-static void pakfire_snapshot_free(struct pakfire_snapshot* self) {
+static void pakfire_snapshot_free(pakfire_snapshot* self) {
        // Ensure this is umounted
        pakfire_snapshot_umount(self);
 
@@ -78,8 +78,8 @@ static void pakfire_snapshot_free(struct pakfire_snapshot* self) {
 }
 
 int pakfire_snapshot_create(
-               struct pakfire_snapshot** snapshot, pakfire_ctx* ctx, const char* path) {
-       struct pakfire_snapshot* self = NULL;
+               pakfire_snapshot** snapshot, pakfire_ctx* ctx, const char* path) {
+       pakfire_snapshot* self = NULL;
        int r;
 
        // Allocate a new snapshot
@@ -123,13 +123,13 @@ ERROR:
        return r;
 }
 
-struct pakfire_snapshot* pakfire_snapshot_ref(struct pakfire_snapshot* self) {
+pakfire_snapshot* pakfire_snapshot_ref(pakfire_snapshot* self) {
        ++self->nrefs;
 
        return self;
 }
 
-struct pakfire_snapshot* pakfire_snapshot_unref(struct pakfire_snapshot* self) {
+pakfire_snapshot* pakfire_snapshot_unref(pakfire_snapshot* self) {
        if (--self->nrefs > 0)
                return self;
 
@@ -199,7 +199,7 @@ static int pakfire_snapshot_filter(const struct dirent* dirent) {
 /*
        Finds and returns the latest snapshot
 */
-int pakfire_snapshot_find(struct pakfire_snapshot** snapshot, struct pakfire* pakfire) {
+int pakfire_snapshot_find(pakfire_snapshot** snapshot, struct pakfire* pakfire) {
        struct dirent** paths = NULL;
        int num_paths = 0;
        char path[PATH_MAX];
@@ -279,7 +279,7 @@ ERROR:
        return r;
 }
 
-static int pakfire_snapshot_mount_tmpfs(struct pakfire_snapshot* self) {
+static int pakfire_snapshot_mount_tmpfs(pakfire_snapshot* self) {
        char* path = NULL;
        int r;
 
@@ -321,7 +321,7 @@ static int pakfire_snapshot_mount_tmpfs(struct pakfire_snapshot* self) {
        return 0;
 }
 
-int pakfire_snapshot_mount(struct pakfire_snapshot* self, const char* path) {
+int pakfire_snapshot_mount(pakfire_snapshot* self, const char* path) {
        int mountfd = -EBADF;
        int fsfd = -EBADF;
        int r;
@@ -389,7 +389,7 @@ ERROR:
        return r;
 }
 
-int pakfire_snapshot_umount(struct pakfire_snapshot* self) {
+int pakfire_snapshot_umount(pakfire_snapshot* self) {
        int r;
 
        switch (self->state) {
@@ -423,7 +423,7 @@ int pakfire_snapshot_umount(struct pakfire_snapshot* self) {
        return 0;
 }
 
-static int pakfire_snapshot_destroy(struct pakfire_snapshot* self) {
+static int pakfire_snapshot_destroy(pakfire_snapshot* self) {
        int r;
 
        // Check if the snapshot is mounted
@@ -507,7 +507,7 @@ ERROR:
 /*
        Creates a new snapshot
 */
-int pakfire_snapshot_make(struct pakfire_snapshot** snapshot, struct pakfire* pakfire) {
+int pakfire_snapshot_make(pakfire_snapshot** snapshot, struct pakfire* pakfire) {
        pakfire_config* config = NULL;
        struct pakfire* p = NULL;
        char snapshot_path[PATH_MAX];
@@ -604,7 +604,7 @@ ERROR:
        Cleans up any unused snapshots
 */
 int pakfire_snapshot_clean(struct pakfire* pakfire) {
-       struct pakfire_snapshot* snapshot = NULL;
+       pakfire_snapshot* snapshot = NULL;
        char path[PATH_MAX];
        FTS* f = NULL;
        int r;

diff --git a/src/pakfire/snapshot.h b/src/pakfire/snapshot.h
index fdce2b761d8ed0a256f0140154a157ec5f4649f1..3f62510f3971b1b238f67ceb48006748206e944b 100644 (file)
--- a/src/pakfire/snapshot.h
+++ b/src/pakfire/snapshot.h
@@ -24,22 +24,22 @@
 #include <pakfire/ctx.h>
 #include <pakfire/pakfire.h>
 
-struct pakfire_snapshot;
+typedef struct pakfire_snapshot pakfire_snapshot;
 
 int pakfire_snapshot_create(
-       struct pakfire_snapshot** snapshot, pakfire_ctx* ctx, const char* path);
+       pakfire_snapshot** snapshot, pakfire_ctx* ctx, const char* path);
 
-struct pakfire_snapshot* pakfire_snapshot_ref(struct pakfire_snapshot* self);
-struct pakfire_snapshot* pakfire_snapshot_unref(struct pakfire_snapshot* self);
+pakfire_snapshot* pakfire_snapshot_ref(pakfire_snapshot* self);
+pakfire_snapshot* pakfire_snapshot_unref(pakfire_snapshot* self);
 
-int pakfire_snapshot_find(struct pakfire_snapshot** snapshot, struct pakfire* pakfire);
+int pakfire_snapshot_find(pakfire_snapshot** snapshot, struct pakfire* pakfire);
 
-const char* pakfire_snapshot_path(struct pakfire_snapshot* self);
+const char* pakfire_snapshot_path(pakfire_snapshot* self);
 
-int pakfire_snapshot_mount(struct pakfire_snapshot* self, const char* path);
-int pakfire_snapshot_umount(struct pakfire_snapshot* self);
+int pakfire_snapshot_mount(pakfire_snapshot* self, const char* path);
+int pakfire_snapshot_umount(pakfire_snapshot* self);
 
-int pakfire_snapshot_make(struct pakfire_snapshot** snapshot, struct pakfire* pakfire);
+int pakfire_snapshot_make(pakfire_snapshot** snapshot, struct pakfire* pakfire);
 
 int pakfire_snapshot_clean(struct pakfire* pakfire);