hasher: Create its own type

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

diff --git a/src/pakfire/hasher.c b/src/pakfire/hasher.c
index b1193d4d99be58ba53674e67bf760034776d4d42..6c28cda22e1317b004314e90d3e76336c345debb 100644 (file)
--- a/src/pakfire/hasher.c
+++ b/src/pakfire/hasher.c
@@ -50,7 +50,7 @@ struct pakfire_hasher {
        struct pakfire_hashes hashes;
 };
 
-static void pakfire_hasher_free(struct pakfire_hasher* self) {
+static void pakfire_hasher_free(pakfire_hasher* self) {
        if (self->sha3_512)
                EVP_MD_CTX_free(self->sha3_512);
        if (self->sha3_256)
@@ -68,7 +68,7 @@ static void pakfire_hasher_free(struct pakfire_hasher* self) {
        free(self);
 }
 
-static EVP_MD_CTX* pakfire_hasher_setup_hash(struct pakfire_hasher* self, const EVP_MD* md) {
+static EVP_MD_CTX* pakfire_hasher_setup_hash(pakfire_hasher* self, const EVP_MD* md) {
        EVP_MD_CTX* evp_ctx = NULL;
        int r;
 
@@ -97,7 +97,7 @@ ERROR:
        return NULL;
 }
 
-static int pakfire_hasher_setup_hashes(struct pakfire_hasher* self) {
+static int pakfire_hasher_setup_hashes(pakfire_hasher* self) {
        // Initialize context for SHA-3-512
        if (self->types & PAKFIRE_HASH_SHA3_512) {
                self->sha3_512 = pakfire_hasher_setup_hash(self, EVP_sha3_512());
@@ -143,9 +143,9 @@ static int pakfire_hasher_setup_hashes(struct pakfire_hasher* self) {
        return 0;
 }
 
-int pakfire_hasher_create(struct pakfire_hasher** hasher,
+int pakfire_hasher_create(pakfire_hasher** hasher,
                pakfire_ctx* ctx, enum pakfire_hash_type types) {
-       struct pakfire_hasher* self = NULL;
+       pakfire_hasher* self = NULL;
        int r;
 
        // Something must have been selected
@@ -182,13 +182,13 @@ ERROR:
        return r;
 };
 
-struct pakfire_hasher* pakfire_hasher_ref(struct pakfire_hasher* self) {
+pakfire_hasher* pakfire_hasher_ref(pakfire_hasher* self) {
        self->nrefs++;
 
        return self;
 }
 
-struct pakfire_hasher* pakfire_hasher_unref(struct pakfire_hasher* self) {
+pakfire_hasher* pakfire_hasher_unref(pakfire_hasher* self) {
        if (--self->nrefs > 0)
                return self;
 
@@ -196,7 +196,7 @@ struct pakfire_hasher* pakfire_hasher_unref(struct pakfire_hasher* self) {
        return NULL;
 }
 
-static int __pakfire_hasher_update(struct pakfire_hasher* self, EVP_MD_CTX* evp_ctx,
+static int __pakfire_hasher_update(pakfire_hasher* self, EVP_MD_CTX* evp_ctx,
                const char* buffer, const size_t length) {
        int r;
 
@@ -216,7 +216,7 @@ static int __pakfire_hasher_update(struct pakfire_hasher* self, EVP_MD_CTX* evp_
        return 0;
 }
 
-int pakfire_hasher_update(struct pakfire_hasher* self, const char* buffer, const size_t length) {
+int pakfire_hasher_update(pakfire_hasher* self, const char* buffer, const size_t length) {
        int r;
 
        // SHA-3-512
@@ -252,7 +252,7 @@ int pakfire_hasher_update(struct pakfire_hasher* self, const char* buffer, const
        return 0;
 }
 
-static int __pakfire_hasher_finalize(struct pakfire_hasher* self,
+static int __pakfire_hasher_finalize(pakfire_hasher* self,
                EVP_MD_CTX* evp_ctx, unsigned char* digest) {
        int r;
 
@@ -272,7 +272,7 @@ static int __pakfire_hasher_finalize(struct pakfire_hasher* self,
        return 0;
 }
 
-int pakfire_hasher_finalize(struct pakfire_hasher* self, struct pakfire_hashes* computed_hashes) {
+int pakfire_hasher_finalize(pakfire_hasher* self, struct pakfire_hashes* computed_hashes) {
        int r;
 
        // Finalize SHA-3-512
@@ -320,7 +320,7 @@ int pakfire_hasher_finalize(struct pakfire_hasher* self, struct pakfire_hashes*
  */
 int pakfire_hash_buffer(pakfire_ctx* ctx, const char* buffer, const size_t length,
                const enum pakfire_hash_type types, struct pakfire_hashes* hashes) {
-       struct pakfire_hasher* hasher = NULL;
+       pakfire_hasher* hasher = NULL;
        int r;
 
        // Create a new hasher
@@ -353,7 +353,7 @@ ERROR:
 */
 int pakfire_hash_file(pakfire_ctx* ctx,
                FILE* f, const enum pakfire_hash_type types, struct pakfire_hashes* hashes) {
-       struct pakfire_hasher* hasher = NULL;
+       pakfire_hasher* hasher = NULL;
        char buffer[65536];
        size_t bytes_read;
        int r;

diff --git a/src/pakfire/hasher.h b/src/pakfire/hasher.h
index cabf65dc3ecd160485b2c6781276262337878657..79bfd965e9c659a23eea8994f1101a66ff28b602 100644 (file)
--- a/src/pakfire/hasher.h
+++ b/src/pakfire/hasher.h
@@ -26,16 +26,16 @@
 #include <pakfire/ctx.h>
 #include <pakfire/hashes.h>
 
-struct pakfire_hasher;
+typedef struct pakfire_hasher pakfire_hasher;
 
-int pakfire_hasher_create(struct pakfire_hasher** hasher,
+int pakfire_hasher_create(pakfire_hasher** hasher,
        pakfire_ctx* ctx, enum pakfire_hash_type types);
 
-struct pakfire_hasher* pakfire_hasher_ref(struct pakfire_hasher* self);
-struct pakfire_hasher* pakfire_hasher_unref(struct pakfire_hasher* self);
+pakfire_hasher* pakfire_hasher_ref(pakfire_hasher* self);
+pakfire_hasher* pakfire_hasher_unref(pakfire_hasher* self);
 
-int pakfire_hasher_update(struct pakfire_hasher* self, const char* buffer, const size_t length);
-int pakfire_hasher_finalize(struct pakfire_hasher* self, struct pakfire_hashes* computed_hashes);
+int pakfire_hasher_update(pakfire_hasher* self, const char* buffer, const size_t length);
+int pakfire_hasher_finalize(pakfire_hasher* self, struct pakfire_hashes* computed_hashes);
 
 int pakfire_hash_buffer(pakfire_ctx* ctx, const char* buffer, const size_t length,
        const enum pakfire_hash_type types, struct pakfire_hashes* hashes);

diff --git a/src/pakfire/xfer.c b/src/pakfire/xfer.c
index 3c5823965783f6d72da294f6021dd54d01a1c71a..ea56b8237266fa518f06be225b7f2be8f57976da 100644 (file)
--- a/src/pakfire/xfer.c
+++ b/src/pakfire/xfer.c
@@ -88,7 +88,7 @@ struct pakfire_xfer {
        struct pakfire_hashes expected_hashes;
 
        // Hasher
-       struct pakfire_hasher* hasher;
+       pakfire_hasher* hasher;
 
        // Mirrors
        char baseurl[PATH_MAX];