diff options
author | obrien <obrien@FreeBSD.org> | 2008-07-11 14:48:28 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 2008-07-11 14:48:28 +0000 |
commit | fa9172e3f7f90b02af3690a1b45ac979dce0c754 (patch) | |
tree | dbac0df97f57d69237ca9ed197f74f8794ee8b53 /sys/kern | |
parent | b341cd2da2055a5743eb5a0e542f24b48a015bd4 (diff) | |
download | FreeBSD-src-fa9172e3f7f90b02af3690a1b45ac979dce0c754.zip FreeBSD-src-fa9172e3f7f90b02af3690a1b45ac979dce0c754.tar.gz |
Improve readability and cscope searches a little bit by not using the
same variable name in closely related (but not conflicting) contexts.
Diffstat (limited to 'sys/kern')
-rw-r--r-- | sys/kern/link_elf_obj.c | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c index e2ea863..d8e9219 100644 --- a/sys/kern/link_elf_obj.c +++ b/sys/kern/link_elf_obj.c @@ -97,10 +97,10 @@ typedef struct elf_file { int nprogtab; Elf_relaent *relatab; - int nrela; + int nrelatab; Elf_relent *reltab; - int nrel; + int nreltab; Elf_Sym *ddbsymtab; /* The symbol table we are using */ long ddbsymcnt; /* Number of symbols */ @@ -257,10 +257,10 @@ link_elf_link_preload(linker_class_t cls, const char *filename, symstrindex = shdr[i].sh_link; break; case SHT_REL: - ef->nrel++; + ef->nreltab++; break; case SHT_RELA: - ef->nrela++; + ef->nrelatab++; break; } } @@ -280,15 +280,15 @@ link_elf_link_preload(linker_class_t cls, const char *filename, if (ef->nprogtab != 0) ef->progtab = malloc(ef->nprogtab * sizeof(*ef->progtab), M_LINKER, M_WAITOK | M_ZERO); - if (ef->nrel != 0) - ef->reltab = malloc(ef->nrel * sizeof(*ef->reltab), M_LINKER, - M_WAITOK | M_ZERO); - if (ef->nrela != 0) - ef->relatab = malloc(ef->nrela * sizeof(*ef->relatab), M_LINKER, - M_WAITOK | M_ZERO); + if (ef->nreltab != 0) + ef->reltab = malloc(ef->nreltab * sizeof(*ef->reltab), + M_LINKER, M_WAITOK | M_ZERO); + if (ef->nrelatab != 0) + ef->relatab = malloc(ef->nrelatab * sizeof(*ef->relatab), + M_LINKER, M_WAITOK | M_ZERO); if ((ef->nprogtab != 0 && ef->progtab == NULL) || - (ef->nrel != 0 && ef->reltab == NULL) || - (ef->nrela != 0 && ef->relatab == NULL)) { + (ef->nreltab != 0 && ef->reltab == NULL) || + (ef->nrelatab != 0 && ef->relatab == NULL)) { error = ENOMEM; goto out; } @@ -357,10 +357,10 @@ link_elf_link_preload(linker_class_t cls, const char *filename, } if (pb != ef->nprogtab) panic("lost progbits"); - if (rl != ef->nrel) - panic("lost rel"); - if (ra != ef->nrela) - panic("lost rela"); + if (rl != ef->nreltab) + panic("lost reltab"); + if (ra != ef->nrelatab) + panic("lost relatab"); /* Local intra-module relocations */ link_elf_reloc_local(lf); @@ -492,8 +492,8 @@ link_elf_load_file(linker_class_t cls, const char *filename, ef = (elf_file_t) lf; ef->nprogtab = 0; ef->e_shdr = 0; - ef->nrel = 0; - ef->nrela = 0; + ef->nreltab = 0; + ef->nrelatab = 0; /* Allocate and read in the section header */ nbytes = hdr->e_shnum * hdr->e_shentsize; @@ -533,10 +533,10 @@ link_elf_load_file(linker_class_t cls, const char *filename, symstrindex = shdr[i].sh_link; break; case SHT_REL: - ef->nrel++; + ef->nreltab++; break; case SHT_RELA: - ef->nrela++; + ef->nrelatab++; break; case SHT_STRTAB: break; @@ -564,15 +564,15 @@ link_elf_load_file(linker_class_t cls, const char *filename, if (ef->nprogtab != 0) ef->progtab = malloc(ef->nprogtab * sizeof(*ef->progtab), M_LINKER, M_WAITOK | M_ZERO); - if (ef->nrel != 0) - ef->reltab = malloc(ef->nrel * sizeof(*ef->reltab), M_LINKER, - M_WAITOK | M_ZERO); - if (ef->nrela != 0) - ef->relatab = malloc(ef->nrela * sizeof(*ef->relatab), M_LINKER, - M_WAITOK | M_ZERO); + if (ef->nreltab != 0) + ef->reltab = malloc(ef->nreltab * sizeof(*ef->reltab), + M_LINKER, M_WAITOK | M_ZERO); + if (ef->nrelatab != 0) + ef->relatab = malloc(ef->nrelatab * sizeof(*ef->relatab), + M_LINKER, M_WAITOK | M_ZERO); if ((ef->nprogtab != 0 && ef->progtab == NULL) || - (ef->nrel != 0 && ef->reltab == NULL) || - (ef->nrela != 0 && ef->relatab == NULL)) { + (ef->nreltab != 0 && ef->reltab == NULL) || + (ef->nrelatab != 0 && ef->relatab == NULL)) { error = ENOMEM; goto out; } @@ -785,10 +785,10 @@ link_elf_load_file(linker_class_t cls, const char *filename, } if (pb != ef->nprogtab) panic("lost progbits"); - if (rl != ef->nrel) - panic("lost rel"); - if (ra != ef->nrela) - panic("lost rela"); + if (rl != ef->nreltab) + panic("lost reltab"); + if (ra != ef->nrelatab) + panic("lost relatab"); if (mapbase != (vm_offset_t)ef->address + mapsize) panic("mapbase 0x%lx != address %p + mapsize 0x%lx (0x%lx)\n", mapbase, ef->address, mapsize, @@ -854,10 +854,10 @@ link_elf_unload_file(linker_file_t file) return; } - for (i = 0; i < ef->nrel; i++) + for (i = 0; i < ef->nreltab; i++) if (ef->reltab[i].rel) free(ef->reltab[i].rel, M_LINKER); - for (i = 0; i < ef->nrela; i++) + for (i = 0; i < ef->nrelatab; i++) if (ef->relatab[i].rela) free(ef->relatab[i].rela, M_LINKER); if (ef->reltab) @@ -930,7 +930,7 @@ relocate_file(elf_file_t ef) /* Perform relocations without addend if there are any: */ - for (i = 0; i < ef->nrel; i++) { + for (i = 0; i < ef->nreltab; i++) { rel = ef->reltab[i].rel; if (rel == NULL) panic("lost a reltab!"); @@ -957,7 +957,7 @@ relocate_file(elf_file_t ef) } /* Perform relocations with addend if there are any: */ - for (i = 0; i < ef->nrela; i++) { + for (i = 0; i < ef->nrelatab; i++) { rela = ef->relatab[i].rela; if (rela == NULL) panic("lost a relatab!"); @@ -1242,7 +1242,7 @@ link_elf_reloc_local(linker_file_t lf) link_elf_fix_link_set(ef); /* Perform relocations without addend if there are any: */ - for (i = 0; i < ef->nrel; i++) { + for (i = 0; i < ef->nreltab; i++) { rel = ef->reltab[i].rel; if (rel == NULL) panic("lost a reltab!"); @@ -1264,7 +1264,7 @@ link_elf_reloc_local(linker_file_t lf) } /* Perform relocations with addend if there are any: */ - for (i = 0; i < ef->nrela; i++) { + for (i = 0; i < ef->nrelatab; i++) { rela = ef->relatab[i].rela; if (rela == NULL) panic("lost a relatab!"); |