linter: Create its own type

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

diff --git a/src/pakfire/archive.c b/src/pakfire/archive.c
index 1ea177adaec8689f40ad4eeafedbd8b9d4bc2681..98ec3ea5ea1c41ea2b3db9e3b3c11f30131bc6f0 100644 (file)
--- a/src/pakfire/archive.c
+++ b/src/pakfire/archive.c
@@ -1983,7 +1983,7 @@ int pakfire_archive_apply_systemd_sysusers(pakfire_archive* archive) {
 
 int pakfire_archive_lint(pakfire_archive* archive,
                pakfire_linter_result_callback callback, void* data) {
-       struct pakfire_linter* linter = NULL;
+       pakfire_linter* linter = NULL;
        int r;
 
        // Create a new linter

diff --git a/src/pakfire/linter-file.c b/src/pakfire/linter-file.c
index aa9211377148458edce9791f76cbca1b67b683ed..ad73701a2bc7f77dc65ba2a7704b031fc1674c60 100644 (file)
--- a/src/pakfire/linter-file.c
+++ b/src/pakfire/linter-file.c
@@ -38,7 +38,7 @@ struct pakfire_linter_file {
        int nrefs;
 
        // Linter
-       struct pakfire_linter* linter;
+       pakfire_linter* linter;
 
        // File
        pakfire_file* file;
@@ -60,11 +60,11 @@ struct pakfire_linter_file {
 };
 
 #define pakfire_linter_file_info(lfile, format, ...) \
-       pakfire_linter_result(lfile->linter, lfile->file, PAKFIRE_LINTER_INFO, format, ## __VA_ARGS__)
+       pakfire_linter_add_result(lfile->linter, lfile->file, PAKFIRE_LINTER_INFO, format, ## __VA_ARGS__)
 #define pakfire_linter_file_warning(lfile, format, ...) \
-       pakfire_linter_result(lfile->linter, lfile->file, PAKFIRE_LINTER_WARNING, format, ## __VA_ARGS__)
+       pakfire_linter_add_result(lfile->linter, lfile->file, PAKFIRE_LINTER_WARNING, format, ## __VA_ARGS__)
 #define pakfire_linter_file_error(lfile, format, ...) \
-       pakfire_linter_result(lfile->linter, lfile->file, PAKFIRE_LINTER_ERROR, format, ## __VA_ARGS__)
+       pakfire_linter_add_result(lfile->linter, lfile->file, PAKFIRE_LINTER_ERROR, format, ## __VA_ARGS__)
 
 /*
        Maps the file into memory
@@ -108,7 +108,7 @@ static void pakfire_linter_file_free(pakfire_linter_file* lfile) {
 }
 
 int pakfire_linter_file_create(pakfire_linter_file** lfile,
-               pakfire_ctx* ctx, struct pakfire_linter* linter, pakfire_file* file, int fd) {
+               pakfire_ctx* ctx, pakfire_linter* linter, pakfire_file* file, int fd) {
        pakfire_linter_file* l = NULL;
        int r = 0;
 

diff --git a/src/pakfire/linter-file.h b/src/pakfire/linter-file.h
index 44aab5c9cb9c7f99decebfdde24530a90516ab34..92f0290f012f976f16430f444e43b165b45d355d 100644 (file)
--- a/src/pakfire/linter-file.h
+++ b/src/pakfire/linter-file.h
@@ -28,7 +28,7 @@ typedef struct pakfire_linter_file pakfire_linter_file;
 #include <pakfire/linter.h>
 
 int pakfire_linter_file_create(pakfire_linter_file** lfile,
-       pakfire_ctx* ctx, struct pakfire_linter* linter, pakfire_file* file, int fd);
+       pakfire_ctx* ctx, pakfire_linter* linter, pakfire_file* file, int fd);
 
 pakfire_linter_file* pakfire_linter_file_ref(pakfire_linter_file* lfile);
 pakfire_linter_file* pakfire_linter_file_unref(pakfire_linter_file* lfile);

diff --git a/src/pakfire/linter.c b/src/pakfire/linter.c
index 1ae7740fe62f8f885700c1311501ddc8ac4dc74f..d43663386650aa28eb905f30875d0256c2e859c6 100644 (file)
--- a/src/pakfire/linter.c
+++ b/src/pakfire/linter.c
@@ -39,7 +39,7 @@
 #include <pakfire/pakfire.h>
 #include <pakfire/string.h>
 
-struct pakfire_linter_result {
+typedef struct pakfire_linter_result {
        TAILQ_ENTRY(pakfire_linter_result) nodes;
 
        // File
@@ -50,7 +50,7 @@ struct pakfire_linter_result {
 
        // Comment
        char* comment;
-};
+} pakfire_linter_result;
 
 struct pakfire_linter {
        pakfire_ctx* ctx;
@@ -85,7 +85,7 @@ struct pakfire_linter {
        void* result_data;
 };
 
-static void pakfire_linter_result_free(struct pakfire_linter_result* result) {
+static void pakfire_linter_result_free(pakfire_linter_result* result) {
        if (result->file)
                pakfire_file_unref(result->file);
        if (result->comment)
@@ -93,9 +93,9 @@ static void pakfire_linter_result_free(struct pakfire_linter_result* result) {
        free(result);
 }
 
-int pakfire_linter_result(struct pakfire_linter* linter, pakfire_file* file,
+int pakfire_linter_add_result(pakfire_linter* linter, pakfire_file* file,
                int priority, const char* format, ...) {
-       struct pakfire_linter_result* result = NULL;
+       pakfire_linter_result* result = NULL;
        va_list args;
        int r;
 
@@ -168,9 +168,9 @@ ERROR:
        return r;
 }
 
-int pakfire_linter_create(struct pakfire_linter** linter,
+int pakfire_linter_create(pakfire_linter** linter,
                struct pakfire* pakfire, pakfire_archive* archive) {
-       struct pakfire_linter* l = NULL;
+       pakfire_linter* l = NULL;
        int r;
 
        // Allocate a new object
@@ -216,8 +216,8 @@ ERROR:
        return r;
 }
 
-static void pakfire_linter_free(struct pakfire_linter* linter) {
-       struct pakfire_linter_result* result = NULL;
+static void pakfire_linter_free(pakfire_linter* linter) {
+       pakfire_linter_result* result = NULL;
 
        // Free all results
        for (;;) {
@@ -242,13 +242,13 @@ static void pakfire_linter_free(struct pakfire_linter* linter) {
        free(linter);
 }
 
-struct pakfire_linter* pakfire_linter_ref(struct pakfire_linter* linter) {
+pakfire_linter* pakfire_linter_ref(pakfire_linter* linter) {
        ++linter->nrefs;
 
        return linter;
 }
 
-struct pakfire_linter* pakfire_linter_unref(struct pakfire_linter* linter) {
+pakfire_linter* pakfire_linter_unref(pakfire_linter* linter) {
        if (--linter->nrefs > 0)
                return linter;
 
@@ -256,14 +256,14 @@ struct pakfire_linter* pakfire_linter_unref(struct pakfire_linter* linter) {
        return NULL;
 }
 
-void pakfire_linter_set_result_callback(struct pakfire_linter* linter,
+void pakfire_linter_set_result_callback(pakfire_linter* linter,
                pakfire_linter_result_callback callback, void* data) {
        linter->result_callback = callback;
        linter->result_data     = data;
 }
 
 static int pakfire_linter_read_file(
-               struct pakfire_linter* linter, pakfire_file* file, struct archive* a) {
+               pakfire_linter* linter, pakfire_file* file, struct archive* a) {
        int fd = -EBADF;
        int r;
 
@@ -347,7 +347,7 @@ ERROR:
 }
 
 static int pakfire_linter_payload(
-               struct pakfire_linter* linter, pakfire_file* file, struct archive* a) {
+               pakfire_linter* linter, pakfire_file* file, struct archive* a) {
        pakfire_linter_file* lfile = NULL;
        int fd = -EBADF;
        int r;
@@ -402,7 +402,7 @@ ERROR:
        return r;
 }
 
-static int pakfire_linter_name(struct pakfire_linter* linter) {
+static int pakfire_linter_name(pakfire_linter* linter) {
        int r;
 
        // Fetch the package name
@@ -423,12 +423,12 @@ static int pakfire_linter_name(struct pakfire_linter* linter) {
 }
 
 static int pakfire_linter_lint_source(
-               struct pakfire_linter* linter, pakfire_file* file) {
+               pakfire_linter* linter, pakfire_file* file) {
        return 0;
 }
 
 static int pakfire_linter_lint_fhs(
-               struct pakfire_linter* linter, pakfire_file* file) {
+               pakfire_linter* linter, pakfire_file* file) {
        int r;
 
        // Checking against FHS
@@ -480,7 +480,7 @@ static int pakfire_linter_lint_fhs(
 
 static int pakfire_linter_lint_file(pakfire_archive* archive,
                struct archive* a, struct archive_entry* e, void* data) {
-       struct pakfire_linter* linter = data;
+       pakfire_linter* linter = data;
        pakfire_file* file = NULL;
        int r;
 
@@ -520,8 +520,8 @@ ERROR:
 }
 
 static int pakfire_linter_dump_results(
-               struct pakfire_linter* linter, pakfire_file* file, const char* prefix) {
-       struct pakfire_linter_result* result = NULL;
+               pakfire_linter* linter, pakfire_file* file, const char* prefix) {
+       pakfire_linter_result* result = NULL;
 
        TAILQ_FOREACH(result, &linter->results, nodes) {
                // Also process if the file matches
@@ -547,7 +547,7 @@ static int pakfire_linter_dump_results(
 
 static int __pakfire_linter_dump_file(
                pakfire_ctx* ctx, pakfire_file* file, void* data) {
-       struct pakfire_linter* linter = data;
+       pakfire_linter* linter = data;
 
        // Show information about the file
        char* dump = pakfire_file_dump(file, PAKFIRE_FILE_DUMP_FULL);
@@ -569,7 +569,7 @@ static int __pakfire_linter_dump_file(
 /*
        Dumps the result of the linter...
 */
-static int pakfire_linter_dump(struct pakfire_linter* linter) {
+static int pakfire_linter_dump(pakfire_linter* linter) {
        int r;
 
        // Fetch nevra
@@ -610,7 +610,7 @@ static int pakfire_linter_dump(struct pakfire_linter* linter) {
        return 0;
 }
 
-int pakfire_linter_lint(struct pakfire_linter* linter) {
+int pakfire_linter_lint(pakfire_linter* linter) {
        int r;
 
        // Lint the name

diff --git a/src/pakfire/linter.h b/src/pakfire/linter.h
index 33e392349c243581b51fbcb132c533640f1be671..577ee3312310f958b44b1dc45ac57a12fea5c935 100644 (file)
--- a/src/pakfire/linter.h
+++ b/src/pakfire/linter.h
@@ -36,27 +36,27 @@ typedef int (*pakfire_linter_result_callback)(pakfire_ctx* ctx,
        pakfire_archive* archive, struct pakfire_package* package,
        pakfire_file* file, int priority, const char* message, void* data);
 
-struct pakfire_linter;
+typedef struct pakfire_linter pakfire_linter;
 
-int pakfire_linter_create(struct pakfire_linter** linter,
+int pakfire_linter_create(pakfire_linter** linter,
        struct pakfire* pakfire, pakfire_archive* archive);
 
-struct pakfire_linter* pakfire_linter_ref(struct pakfire_linter* linter);
-struct pakfire_linter* pakfire_linter_unref(struct pakfire_linter* linter);
+pakfire_linter* pakfire_linter_ref(pakfire_linter* linter);
+pakfire_linter* pakfire_linter_unref(pakfire_linter* linter);
 
-void pakfire_linter_set_result_callback(struct pakfire_linter* linter,
+void pakfire_linter_set_result_callback(pakfire_linter* linter,
        pakfire_linter_result_callback callback, void* data);
 
-int pakfire_linter_lint(struct pakfire_linter* linter);
+int pakfire_linter_lint(pakfire_linter* linter);
 
-int pakfire_linter_result(struct pakfire_linter* linter, pakfire_file* file,
+int pakfire_linter_add_result(pakfire_linter* linter, pakfire_file* file,
        int priority, const char* format, ...) __attribute__((format(printf, 4, 5)));
 
 #define pakfire_linter_info(linter, format, ...) \
-       pakfire_linter_result(linter, NULL, PAKFIRE_LINTER_INFO, format, ## __VA_ARGS__)
+       pakfire_linter_add_result(linter, NULL, PAKFIRE_LINTER_INFO, format, ## __VA_ARGS__)
 #define pakfire_linter_warning(linter, format, ...) \
-       pakfire_linter_result(linter, NULL, PAKFIRE_LINTER_WARNING, format, ## __VA_ARGS__)
+       pakfire_linter_add_result(linter, NULL, PAKFIRE_LINTER_WARNING, format, ## __VA_ARGS__)
 #define pakfire_linter_error(linter, format, ...) \
-       pakfire_linter_result(linter, NULL, PAKFIRE_LINTER_ERROR, format, ## __VA_ARGS__)
+       pakfire_linter_add_result(linter, NULL, PAKFIRE_LINTER_ERROR, format, ## __VA_ARGS__)
 
 #endif /* PAKFIRE_LINTER_H */