upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-25 02:35:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtld: extract calculation of the format strings for trace into a helper

Browse source 
(cherry picked from commit c25f36f630)
This commit is contained in:
Konstantin Belousov 2022-03-30 23:35:37 +03:00
parent 64d0220f45
commit 61bb7ef551
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
libexec/rtld-elf/rtld.c
View file

@ -4965,22 +4965,29 @@ symlook_obj1_gnu(SymLook *req, const Obj_Entry *obj)
return (ESRCH);
}
static void
trace_calc_fmts(const char **main_local, const char **fmt1, const char **fmt2)
{
*main_local = ld_get_env_var(LD_TRACE_LOADED_OBJECTS_PROGNAME);
if (*main_local == NULL)
*main_local = "";
*fmt1 = ld_get_env_var(LD_TRACE_LOADED_OBJECTS_FMT1);
if (*fmt1 == NULL)
*fmt1 = "\t%o => %p (%x)\n";
*fmt2 = ld_get_env_var(LD_TRACE_LOADED_OBJECTS_FMT2);
if (*fmt2 == NULL)
*fmt2 = "\t%o (%x)\n";
}
static void
trace_loaded_objects(Obj_Entry *obj)
{
const char *fmt1, *fmt2, *fmt, *main_local, *list_containers;
int c;
if ((main_local = ld_get_env_var(LD_TRACE_LOADED_OBJECTS_PROGNAME)) ==
NULL)
main_local = "";
if ((fmt1 = ld_get_env_var(LD_TRACE_LOADED_OBJECTS_FMT1)) == NULL)
fmt1 = "\t%o => %p (%x)\n";
if ((fmt2 = ld_get_env_var(LD_TRACE_LOADED_OBJECTS_FMT2)) == NULL)
fmt2 = "\t%o (%x)\n";
trace_calc_fmts(&main_local, &fmt1, &fmt2);
list_containers = ld_get_env_var(LD_TRACE_LOADED_OBJECTS_ALL);
for (; obj != NULL; obj = TAILQ_NEXT(obj, next)) {