From c8920de1429631ab53b8a388acdd3f8064305bd3 Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Thu, 12 May 2011 12:08:21 +0200 Subject: [PATCH] nm.c: Remove unused if/else and parameters. --- src/ChangeLog | 5 +++++ src/nm.c | 13 ++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 6c49eef06..91e5d377f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-05-11 Marek Polacek + + * nm.c (show_symbols_sysv): Remove unused if/else, remove + unused `prefix' and `fname' parameters. + 2011-05-07 Marek Polacek * unstrip.c (compare_sections_nonrel): Mark this function as static. diff --git a/src/nm.c b/src/nm.c index 01519a5ae..f78861ece 100644 --- a/src/nm.c +++ b/src/nm.c @@ -718,8 +718,7 @@ sym_name (Elf *elf, GElf_Word strndx, GElf_Word st_name, char buf[], size_t n) /* Show symbols in SysV format. */ static void -show_symbols_sysv (Ebl *ebl, GElf_Word strndx, - const char *prefix, const char *fname, const char *fullname, +show_symbols_sysv (Ebl *ebl, GElf_Word strndx, const char *fullname, GElf_SymX *syms, size_t nsyms, int longest_name, int longest_where) { @@ -762,10 +761,7 @@ show_symbols_sysv (Ebl *ebl, GElf_Word strndx, int digits = length_map[gelf_getclass (ebl->elf) - 1][radix]; /* We always print this prolog. */ - if (prefix == NULL || 1) - printf (gettext ("\n\nSymbols from %s:\n\n"), fullname); - else - printf (gettext ("\n\nSymbols from %s[%s]:\n\n"), prefix, fname); + printf (gettext ("\n\nSymbols from %s:\n\n"), fullname); /* The header line. */ printf (gettext ("%*s%-*s %-*s Class Type %-*s %*s Section\n\n"), @@ -1185,9 +1181,8 @@ show_symbols (Ebl *ebl, GElf_Ehdr *ehdr, Elf_Scn *scn, Elf_Scn *xndxscn, switch (format) { case format_sysv: - show_symbols_sysv (ebl, shdr->sh_link, prefix, fname, - fullname, sym_mem, nentries, longest_name, - longest_where); + show_symbols_sysv (ebl, shdr->sh_link, fullname, sym_mem, nentries, + longest_name, longest_where); break; case format_bsd: -- 2.47.3