diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2002-05-24 04:21:28 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2002-05-24 04:21:28 +0000 |
| commit | ad6c0b11640680d6e8b8e4f31a9e97ada9e86c64 (patch) | |
| tree | fcc2bd5fcf31e6e8dc187f1d99ba7ca83653285f /libexec/ld.so | |
| parent | 02ba7b17f1114bc55b4a50e004451dc9942b9fc0 (diff) | |
more KNF
Diffstat (limited to 'libexec/ld.so')
| -rw-r--r-- | libexec/ld.so/mips/rtld_machine.c | 6 | ||||
| -rw-r--r-- | libexec/ld.so/powerpc/rtld_machine.c | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/libexec/ld.so/mips/rtld_machine.c b/libexec/ld.so/mips/rtld_machine.c index d07a2c007f3..fdd7ac7368e 100644 --- a/libexec/ld.so/mips/rtld_machine.c +++ b/libexec/ld.so/mips/rtld_machine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtld_machine.c,v 1.3 2002/05/24 04:17:00 deraadt Exp $ */ +/* $OpenBSD: rtld_machine.c,v 1.4 2002/05/24 04:21:27 deraadt Exp $ */ /* * Copyright (c) 1998 Per Fogelstrom, Opsycon AB @@ -72,7 +72,7 @@ _dl_md_reloc(elf_object_t *object, int rel, int relsz) symn = object->dyn.strtab + sym->st_name; if (ELF32_R_SYM(relocs->r_info) && - !(ELF32_ST_BIND(sym->st_info) == STB_LOCAL && + !(ELF32_ST_BIND(sym->st_info) == STB_LOCAL && ELF32_ST_TYPE (sym->st_info) == STT_NOTYPE)) { ooff = _dl_find_symbol(symn, _dl_objects, &this, 0, 1); if (!this && ELF32_ST_BIND(sym->st_info) == STB_GLOBAL) { @@ -86,7 +86,7 @@ _dl_md_reloc(elf_object_t *object, int rel, int relsz) switch (ELF32_R_TYPE(relocs->r_info)) { case R_MIPS_REL32: if (ELF32_ST_BIND(sym->st_info) == STB_LOCAL && - (ELF32_ST_TYPE(sym->st_info) == STT_SECTION || + (ELF32_ST_TYPE(sym->st_info) == STT_SECTION || ELF32_ST_TYPE(sym->st_info) == STT_NOTYPE) ) { *(u_int32_t *)r_addr += loff; } else if (this) diff --git a/libexec/ld.so/powerpc/rtld_machine.c b/libexec/ld.so/powerpc/rtld_machine.c index d661349eca3..8445a5c6b55 100644 --- a/libexec/ld.so/powerpc/rtld_machine.c +++ b/libexec/ld.so/powerpc/rtld_machine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtld_machine.c,v 1.7 2002/05/24 04:17:01 deraadt Exp $ */ +/* $OpenBSD: rtld_machine.c,v 1.8 2002/05/24 04:21:27 deraadt Exp $ */ /* * Copyright (c) 1999 Dale Rahn @@ -160,8 +160,8 @@ _dl_printf("object relocation size %x, numrela %x\n", #if 1 case RELOC_32: if (ELF32_ST_BIND(sym->st_info) == STB_LOCAL && - (ELF32_ST_TYPE(sym->st_info) == STT_SECTION || - ELF32_ST_TYPE(sym->st_info) == STT_NOTYPE) ) { + (ELF32_ST_TYPE(sym->st_info) == STT_SECTION || + ELF32_ST_TYPE(sym->st_info) == STT_NOTYPE) ) { *r_addr = ooff + relas->r_addend; } else { *r_addr = ooff + this->st_value + @@ -171,8 +171,8 @@ _dl_printf("object relocation size %x, numrela %x\n", #endif case RELOC_RELATIVE: if (ELF32_ST_BIND(sym->st_info) == STB_LOCAL && - (ELF32_ST_TYPE(sym->st_info) == STT_SECTION || - ELF32_ST_TYPE(sym->st_info) == STT_NOTYPE) ) { + (ELF32_ST_TYPE(sym->st_info) == STT_SECTION || + ELF32_ST_TYPE(sym->st_info) == STT_NOTYPE) ) { *r_addr = loff + relas->r_addend; #ifdef DL_PRINTF_DEBUG |