diff options
Diffstat (limited to 'ldso/include')
| -rw-r--r-- | ldso/include/dl-elf.h | 8 | ||||
| -rw-r--r-- | ldso/include/dl-hash.h | 11 | ||||
| -rw-r--r-- | ldso/include/ldso.h | 2 | ||||
| -rw-r--r-- | ldso/include/unsecvars.h | 4 |
4 files changed, 12 insertions, 13 deletions
diff --git a/ldso/include/dl-elf.h b/ldso/include/dl-elf.h index 320a0f920..08b1c8b50 100644 --- a/ldso/include/dl-elf.h +++ b/ldso/include/dl-elf.h @@ -141,10 +141,10 @@ void __dl_parse_dynamic_info(ElfW(Dyn) *dpnt, unsigned long dynamic_info[], if (dpnt->d_tag == DT_FLAGS_1 && (dpnt->d_un.d_val & DF_1_NOW)) dynamic_info[DT_BIND_NOW] = 1; -#ifdef __LDSO_GNU_HASH_SUPPORT__ +#ifdef __LDSO_GNU_HASH_SUPPORT__ if (dpnt->d_tag == DT_GNU_HASH) dynamic_info[DT_GNU_HASH_IDX] = dpnt->d_un.d_ptr; -#endif +#endif } #ifdef ARCH_DYNAMIC_INFO else { @@ -156,7 +156,7 @@ void __dl_parse_dynamic_info(ElfW(Dyn) *dpnt, unsigned long dynamic_info[], do { \ if (dynamic_info[tag]) \ dynamic_info[tag] = (unsigned long) DL_RELOC_ADDR(load_off, dynamic_info[tag]); \ - } while(0) + } while (0) ADJUST_DYN_INFO(DT_HASH, load_off); ADJUST_DYN_INFO(DT_PLTGOT, load_off); ADJUST_DYN_INFO(DT_STRTAB, load_off); @@ -165,7 +165,7 @@ void __dl_parse_dynamic_info(ElfW(Dyn) *dpnt, unsigned long dynamic_info[], ADJUST_DYN_INFO(DT_JMPREL, load_off); #ifdef __LDSO_GNU_HASH_SUPPORT__ ADJUST_DYN_INFO(DT_GNU_HASH_IDX, load_off); -#endif +#endif #undef ADJUST_DYN_INFO } diff --git a/ldso/include/dl-hash.h b/ldso/include/dl-hash.h index d5c63fa28..5bb1f47e1 100644 --- a/ldso/include/dl-hash.h +++ b/ldso/include/dl-hash.h @@ -40,7 +40,7 @@ struct elf_resolve { unsigned short int init_flag; unsigned long rtld_flags; /* RTLD_GLOBAL, RTLD_NOW etc. */ Elf_Symndx nbucket; - + #ifdef __LDSO_GNU_HASH_SUPPORT__ /* Data needed to support GNU hash style */ Elf32_Word l_gnu_bitmask_idxbits; @@ -55,7 +55,7 @@ struct elf_resolve { #else Elf_Symndx *elf_buckets; #endif - + struct init_fini_list *init_fini; struct init_fini_list *rtld_local; /* keep tack of RTLD_LOCAL libs in same group */ /* @@ -69,10 +69,9 @@ struct elf_resolve { const Elf32_Word *l_gnu_buckets; const Elf_Symndx *chains; }; -#else +#else Elf_Symndx *chains; -#endif - +#endif unsigned long dynamic_info[DYNAMIC_SIZE]; unsigned long n_phent; @@ -136,7 +135,7 @@ extern char * _dl_not_lazy; static inline int _dl_symbol(char * name) { - if(name[0] != '_' || name[1] != 'd' || name[2] != 'l' || name[3] != '_') + if (name[0] != '_' || name[1] != 'd' || name[2] != 'l' || name[3] != '_') return 0; return 1; } diff --git a/ldso/include/ldso.h b/ldso/include/ldso.h index 029922747..a9d3609d0 100644 --- a/ldso/include/ldso.h +++ b/ldso/include/ldso.h @@ -65,7 +65,7 @@ extern int _dl_debug_file; # define __dl_debug_dprint(fmt, args...) \ _dl_dprintf(_dl_debug_file, "%s:%i: " fmt, __FUNCTION__, __LINE__, ## args); # define _dl_if_debug_dprint(fmt, args...) \ - do { if (_dl_debug) __dl_debug_dprint(fmt, ## args); } while (0) + do { if (_dl_debug) __dl_debug_dprint(fmt, ## args); } while (0) #else # define __dl_debug_dprint(fmt, args...) # define _dl_if_debug_dprint(fmt, args...) diff --git a/ldso/include/unsecvars.h b/ldso/include/unsecvars.h index 0ce3ebfea..f1ef381ee 100644 --- a/ldso/include/unsecvars.h +++ b/ldso/include/unsecvars.h @@ -5,7 +5,7 @@ * GNU Lesser General Public License version 2.1 or later. */ -/* +/* * Environment variable to be removed for SUID programs. The names are all * stuffed in a single string which means they have to be terminated with a * '\0' explicitly. @@ -19,7 +19,7 @@ "LD_TRACE_LOADED_OBJECTS\0" \ "TMPDIR\0" -/* +/* * LD_TRACE_LOADED_OBJECTS is not in glibc-2.3.5's unsecvars.h * though used by ldd * |