RepoMirrors/musl
1
0
Fork 0
mirror of git://git.musl-libc.org/musl synced 2024-12-21 22:30:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

cosmetic improvements in dynamic linker cleanup

Browse Source 
consistent use of braces in if/else structure, line length.
This commit is contained in:
Rich Felker 2014-03-25 16:21:50 -04:00
parent 8769196ffb
commit fa7248c971
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ldso/dynlink.c
View File

@ -301,10 +301,10 @@ static void reclaim(struct dso *dso, size_t start, size_t end)
static void reclaim_gaps(struct dso *dso) static void reclaim_gaps(struct dso *dso)
{ {
Phdr *ph; Phdr *ph = dso->phdr;
size_t phcnt; size_t phcnt = dso->phnum;
for (phcnt = dso->phnum, ph = dso->phdr; phcnt--; ph=(void *)((char *)ph+dso->phentsize)) { for (; phcnt--; ph=(void *)((char *)ph+dso->phentsize)) {
if (ph->p_type!=PT_LOAD) continue; if (ph->p_type!=PT_LOAD) continue;
if ((ph->p_flags&(PF_R|PF_W))!=(PF_R|PF_W)) continue; if ((ph->p_flags&(PF_R|PF_W))!=(PF_R|PF_W)) continue;
reclaim(dso, ph->p_vaddr & -PAGE_SIZE, ph->p_vaddr); reclaim(dso, ph->p_vaddr & -PAGE_SIZE, ph->p_vaddr);
@ -351,9 +351,9 @@ static void *map_library(int fd, struct dso *dso)
ph = ph0 = (void *)((char *)buf + eh->e_phoff); ph = ph0 = (void *)((char *)buf + eh->e_phoff);
} }
for (i=eh->e_phnum; i; i--, ph=(void *)((char *)ph+eh->e_phentsize)) { for (i=eh->e_phnum; i; i--, ph=(void *)((char *)ph+eh->e_phentsize)) {
if (ph->p_type == PT_DYNAMIC) if (ph->p_type == PT_DYNAMIC) {
dyn = ph->p_vaddr; dyn = ph->p_vaddr;
else if (ph->p_type == PT_TLS) { } else if (ph->p_type == PT_TLS) {
tls_image = ph->p_vaddr; tls_image = ph->p_vaddr;
dso->tls_align = ph->p_align; dso->tls_align = ph->p_align;
dso->tls_len = ph->p_filesz; dso->tls_len = ph->p_filesz;