scripts/sortextable: Rewrite error/success handling

[linux-2.6-block.git] / scripts / sortextable.h

diff --git a/scripts/sortextable.h b/scripts/sortextable.h
index d4b3f6c40f027bcfe790ab25e7aedef492a9cd53..5a62e94df678c46639433cabb9745ac6f6dc2d70 100644 (file)
--- a/scripts/sortextable.h
+++ b/scripts/sortextable.h
@@ -87,7 +87,7 @@ static int compare_extable(const void *a, const void *b)
        return 0;
 }
 
-static void
+static int
 do_func(Elf_Ehdr *ehdr, char const *const fname, table_sort_t custom_sort)
 {
        Elf_Shdr *shdr;
@@ -146,17 +146,17 @@ do_func(Elf_Ehdr *ehdr, char const *const fname, table_sort_t custom_sort)
        }
        if (strtab_sec == NULL) {
                fprintf(stderr, "no .strtab in  file: %s\n", fname);
-               fail_file();
+               return -1;
        }
        if (symtab_sec == NULL) {
                fprintf(stderr, "no .symtab in  file: %s\n", fname);
-               fail_file();
+               return -1;
        }
        symtab = (const Elf_Sym *)((const char *)ehdr +
                                   _r(&symtab_sec->sh_offset));
        if (extab_sec == NULL) {
                fprintf(stderr, "no __ex_table in  file: %s\n", fname);
-               fail_file();
+               return -1;
        }
        strtab = (const char *)ehdr + _r(&strtab_sec->sh_offset);
 
@@ -190,7 +190,7 @@ do_func(Elf_Ehdr *ehdr, char const *const fname, table_sort_t custom_sort)
                fprintf(stderr,
                        "no main_extable_sort_needed symbol in  file: %s\n",
                        fname);
-               fail_file();
+               return -1;
        }
        sort_needed_sec = &shdr[get_secindex(r2(&sym->st_shndx),
                                             sort_needed_sym - symtab,
@@ -206,4 +206,5 @@ do_func(Elf_Ehdr *ehdr, char const *const fname, table_sort_t custom_sort)
 #endif
        /* We sorted it, clear the flag. */
        w(0, sort_done_location);
+       return 0;
 }