From 896ae943edacf29bac67958257ecd085608a331e Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Mon, 4 Jun 2018 22:23:48 +0200 Subject: [PATCH] libdwfl: Make __libdwfl_addrsym a static function in dwfl_module_addrsym.c __libdwfl_addrsym is only used in the dwfl_module_addrsym.c source. There is no need to mark this as a (shared) internal function. Signed-off-by: Mark Wielaard --- libdwfl/ChangeLog | 5 +++++ libdwfl/dwfl_module_addrsym.c | 9 ++++++--- libdwfl/libdwflP.h | 9 --------- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog index 34aa07d1f..acb4236a3 100644 --- a/libdwfl/ChangeLog +++ b/libdwfl/ChangeLog @@ -1,3 +1,8 @@ +2018-06-04 Mark Wielaard + + * libdwflP.h (__libdwfl_addrsym): Remove function declaration. + * dwfl_module_addrsym.c (__libdwfl_addrsym): Make a static function. + 2018-05-27 Mark Wielaard * relocate.c (__libdwfl_relocate): Always call relocate_section with diff --git a/libdwfl/dwfl_module_addrsym.c b/libdwfl/dwfl_module_addrsym.c index db302e636..2336b6024 100644 --- a/libdwfl/dwfl_module_addrsym.c +++ b/libdwfl/dwfl_module_addrsym.c @@ -235,9 +235,12 @@ search_table (struct search_state *state, int start, int end) } /* Returns the name of the symbol "closest" to ADDR. - Never returns symbols at addresses above ADDR. */ -const char * -internal_function + Never returns symbols at addresses above ADDR. + + Wrapper for old dwfl_module_addrsym and new dwfl_module_addrinfo. + adjust_st_value set to true returns adjusted SYM st_value, set to false + it will not adjust SYM at all, but does match against resolved values. */ +static const char * __libdwfl_addrsym (Dwfl_Module *_mod, GElf_Addr _addr, GElf_Off *off, GElf_Sym *_closest_sym, GElf_Word *shndxp, Elf **elfp, Dwarf_Addr *biasp, bool _adjust_st_value) diff --git a/libdwfl/libdwflP.h b/libdwfl/libdwflP.h index 362987110..31e6e1905 100644 --- a/libdwfl/libdwflP.h +++ b/libdwfl/libdwflP.h @@ -463,15 +463,6 @@ extern const char *__libdwfl_getsym (Dwfl_Module *mod, int ndx, GElf_Sym *sym, bool *resolved, bool adjust_st_value) internal_function; -/* Internal wrapper for old dwfl_module_addrsym and new dwfl_module_addrinfo. - adjust_st_value set to true returns adjusted SYM st_value, set to false - it will not adjust SYM at all, but does match against resolved values. */ -extern const char *__libdwfl_addrsym (Dwfl_Module *mod, GElf_Addr addr, - GElf_Off *off, GElf_Sym *sym, - GElf_Word *shndxp, Elf **elfp, - Dwarf_Addr *bias, - bool adjust_st_value) internal_function; - extern void __libdwfl_module_free (Dwfl_Module *mod) internal_function; /* Find the main ELF file, update MOD->elferr and/or MOD->main.elf. */ -- 2.47.2