ldso: tweak shadow warning with preload file support

The stat buffer is already declared at the top of the function.

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
(cherry picked from commit 6140a2a7175a796a7c06119f036357db87a1b865)

Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>

diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c
index 9903b1c..74da588 100644 (file)
--- a/ldso/ldso/ldso.c
+++ b/ldso/ldso/ldso.c
@@ -670,7 +670,6 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr,
 
 #ifdef __LDSO_PRELOAD_FILE_SUPPORT__
        do {
-               struct stat st;
                char *preload;
                int fd;
                char c, *cp, *cp2;
@@ -722,11 +721,11 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr,
 
                        tpnt1 = _dl_load_shared_library(0, &rpnt, NULL, cp2, trace_loaded_objects);
                        if (!tpnt1) {
-#ifdef __LDSO_LDD_SUPPORT__
+# ifdef __LDSO_LDD_SUPPORT__
                                if (trace_loaded_objects)
                                        _dl_dprintf(1, "\t%s => not found\n", cp2);
                                else
-#endif
+# endif
                                {
                                        _dl_dprintf(_dl_debug_file, "%s: can't load library '%s'\n", _dl_progname, cp2);
                                        _dl_exit(15);
@@ -736,14 +735,14 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr,
 
                                _dl_debug_early("Loading: (%x) %s\n", DL_LOADADDR_BASE(tpnt1->loadaddr), tpnt1->libname);
 
-#ifdef __LDSO_LDD_SUPPORT__
+# ifdef __LDSO_LDD_SUPPORT__
                                if (trace_loaded_objects &&
                                    tpnt1->usage_count == 1) {
                                        _dl_dprintf(1, "\t%s => %s (%x)\n",
                                                    cp2, tpnt1->libname,
                                                    DL_LOADADDR_BASE(tpnt1->loadaddr));
                                }
-#endif
+# endif
                        }
 
                        /* find start of next library */