linter: Make it easier to report file issues

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

diff --git a/src/libpakfire/include/pakfire/linter-file.h b/src/libpakfire/include/pakfire/linter-file.h
index ef9fcfef670a1a7dc655ddabcb9322fd98413c6b..976f2356a403444cb6f5acef1778fea9f355ce9d 100644 (file)
--- a/src/libpakfire/include/pakfire/linter-file.h
+++ b/src/libpakfire/include/pakfire/linter-file.h
@@ -37,12 +37,5 @@ struct pakfire_linter_file* pakfire_linter_file_unref(struct pakfire_linter_file
 
 int pakfire_linter_file_lint(struct pakfire_linter_file* lfile);
 
-#define pakfire_linter_file_info(linter, file, format, ...) \
-       pakfire_linter_result(linter, file, PAKFIRE_LINTER_INFO, format, ## __VA_ARGS__)
-#define pakfire_linter_file_warning(linter, file, format, ...) \
-       pakfire_linter_result(linter, file, PAKFIRE_LINTER_WARNING, format, ## __VA_ARGS__)
-#define pakfire_linter_file_error(linter, file, format, ...) \
-       pakfire_linter_result(linter, file, PAKFIRE_LINTER_ERROR, format, ## __VA_ARGS__)
-
 #endif /* PAKFIRE_PRIVATE */
 #endif /* PAKFIRE_LINTER_FILE_H */

diff --git a/src/libpakfire/linter-file.c b/src/libpakfire/linter-file.c
index ae1ed88309e6fba09bd0e9ae549ac4a127dd9822..93821f003f1b51146f70b41e8cf51ae6eb4e5688 100644 (file)
--- a/src/libpakfire/linter-file.c
+++ b/src/libpakfire/linter-file.c
@@ -47,6 +47,13 @@ struct pakfire_linter_file {
        const char* path;
 };
 
+#define pakfire_linter_file_info(lfile, format, ...) \
+       pakfire_linter_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__)
+#define pakfire_linter_file_error(lfile, format, ...) \
+       pakfire_linter_result(lfile->linter, lfile->file, PAKFIRE_LINTER_ERROR, format, ## __VA_ARGS__)
+
 int pakfire_linter_file_create(struct pakfire_linter_file** lfile,
                struct pakfire_ctx* ctx, struct pakfire_linter* linter, struct pakfire_file* file, int fd) {
        struct pakfire_linter_file* l = NULL;
@@ -286,7 +293,7 @@ static int pakfire_linter_file_check_pie(struct pakfire_linter_file* lfile) {
                        break;
        }
 
-       return pakfire_linter_file_error(lfile->linter, lfile->file, "Missing PIE");
+       return pakfire_linter_file_error(lfile, "Missing PIE");
 }
 
 static int __pakfire_linter_file_check_ssp(
@@ -337,8 +344,7 @@ static int __pakfire_linter_file_check_ssp(
        }
 
        // The file does not seem to have SSP enabled
-       return pakfire_linter_file_error(
-               lfile->linter, lfile->file, "Missing Stack Smashing Protection");
+       return pakfire_linter_file_error(lfile, "Missing Stack Smashing Protection");
 }
 
 static int pakfire_linter_file_check_ssp(struct pakfire_linter_file* lfile) {
@@ -398,7 +404,7 @@ static int __pakfire_linter_file_check_execstack(
 
                                // The stack cannot be writable and executable
                                if ((phdr.p_flags & PF_W) && (phdr.p_flags & PF_X))
-                                       return pakfire_linter_file_error(lfile->linter, lfile->file, "Executable Stack");
+                                       return pakfire_linter_file_error(lfile, "Executable Stack");
 
                        default:
                                break;