]> git.ipfire.org Git - pakfire.git/commitdiff
linter: Replace the ELF check
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 1 Jan 2025 17:17:00 +0000 (17:17 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 1 Jan 2025 17:17:00 +0000 (17:17 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/libpakfire/linter-file.c

index 7c5af01ad0daad56d0c147b753967d9c4d635b1e..73e65d61e1e25df816b24a882665cca4a4d66216 100644 (file)
@@ -346,24 +346,6 @@ static int pakfire_linter_check_script_interpreter(struct pakfire_linter_file* l
        return 0;
 }
 
-
-static int pakfire_linter_file_is_elf(struct pakfire_linter_file* lfile) {
-       // Don't know if we don't have an ELF object
-       if (!lfile->elf)
-               return -EINVAL;
-
-       switch (elf_kind(lfile->elf)) {
-               case ELF_K_ELF:
-                       return 1;
-
-               // Ignore everything else
-               default:
-                       break;
-       }
-
-       return 0;
-}
-
 static int pakfire_linter_file_get_elf_type(struct pakfire_linter_file* lfile) {
        GElf_Ehdr ehdr = {};
 
@@ -986,7 +968,7 @@ static int pakfire_linter_file_check_debug(struct pakfire_linter_file* lfile) {
        int r;
 
        // Fail if this file is not an ELF file
-       if (!pakfire_linter_file_is_elf(lfile))
+       if (!lfile->_elf)
                return pakfire_linter_file_error(lfile, "File is not in ELF format");
 
        switch (pakfire_linter_file_get_elf_type(lfile)) {
@@ -1040,7 +1022,7 @@ int pakfire_linter_file_lint(struct pakfire_linter_file* lfile) {
                return pakfire_linter_file_check_debug(lfile);
 
        // ELF Checks
-       if (pakfire_linter_file_is_elf(lfile)) {
+       if (lfile->_elf) {
                // Check if stripped
                r = pakfire_linter_file_is_stripped(lfile);
                if (r < 0)