diff options
| author | Dale Rahn <drahn@cvs.openbsd.org> | 2006-05-12 22:14:05 +0000 |
|---|---|---|
| committer | Dale Rahn <drahn@cvs.openbsd.org> | 2006-05-12 22:14:05 +0000 |
| commit | 9588320eaa6af8d8d2023d04ebfea3ea7858acb6 (patch) | |
| tree | 4256b610fc26f82386fb168ac0187464d242fa7d | |
| parent | 44f1dacd9f544e7d6b24890c23b6750329738b9e (diff) | |
Commit the rest of the api change that started in prebind.
| -rw-r--r-- | libexec/ld.so/dl_prebind.c | 18 | ||||
| -rw-r--r-- | libexec/ld.so/prebind.h | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/libexec/ld.so/dl_prebind.c b/libexec/ld.so/dl_prebind.c index be27aee4521..d4c32c90cd8 100644 --- a/libexec/ld.so/dl_prebind.c +++ b/libexec/ld.so/dl_prebind.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dl_prebind.c,v 1.7 2006/05/10 03:26:50 deraadt Exp $ */ +/* $OpenBSD: dl_prebind.c,v 1.8 2006/05/12 22:14:04 drahn Exp $ */ /* * Copyright (c) 2006 Dale Rahn <drahn@dalerahn.com> * @@ -283,14 +283,14 @@ prebind_symcache(elf_object_t *object, int plt) f = &(fixup[i]); #if 0 DL_DEB(("symidx %d: obj %d sym %d flags %x\n", - f->sym, f->targobj_idx, f->sym_idx, f->flags)); + f->sym, f->obj_idx, f->sym_idx, f->flags)); #endif - tobj = objarray[f->targobj_idx]; + tobj = objarray[f->obj_idx]; sym = tobj->dyn.symtab + f->sym_idx; str = tobj->dyn.strtab + sym->st_name; #ifdef DEBUG2 DL_DEB(("symidx %d: obj %d %s sym %d %s flags %d %x\n", - f->sym, f->targobj_idx, tobj->load_name, + f->sym, f->obj_idx, tobj->load_name, f->sym_idx, str, SYM_SEARCH_ALL|SYM_WARNNOTFOUND|plt, object->load_addr + sym->st_value)); #endif @@ -318,15 +318,15 @@ prebind_symcache(elf_object_t *object, int plt) f = &(fixup[i]); #if 0 DL_DEB(("symidx %d: obj %d sym %d flags %x\n", - f->sym, f->targobj_idx, f->sym_idx, + f->sym, f->obj_idx, f->sym_idx, SYM_SEARCH_ALL|SYM_WARNNOTFOUND|plt)); #endif - tobj = objarray[f->targobj_idx]; + tobj = objarray[f->obj_idx]; sym = tobj->dyn.symtab + f->sym_idx; str = tobj->dyn.strtab + sym->st_name; #ifdef DEBUG2 DL_DEB(("symidx %d: obj %d %s sym %d %s flags %d %x\n", - f->sym, f->targobj_idx, tobj->load_name, + f->sym, f->obj_idx, tobj->load_name, f->sym_idx, str, SYM_SEARCH_ALL|SYM_WARNNOTFOUND|plt, object->load_addr + sym->st_value)); #endif @@ -544,8 +544,8 @@ prebind_dump_fixup(struct fixup *fixup, u_int32_t numfixups) for (i = 0; i < numfixups; i++) { f = &(fixup[i]); - _dl_printf("idx %d targobj %d sym idx %d\n", - f->sym, f->targobj_idx, f->sym_idx); + _dl_printf("idx %d obj %d sym idx %d\n", + f->sym, f->obj_idx, f->sym_idx); } } diff --git a/libexec/ld.so/prebind.h b/libexec/ld.so/prebind.h index 6f9dd6228cf..369308a8ca0 100644 --- a/libexec/ld.so/prebind.h +++ b/libexec/ld.so/prebind.h @@ -1,4 +1,4 @@ -/* $OpenBSD: prebind.h,v 1.1 2006/05/03 16:10:51 drahn Exp $ */ +/* $OpenBSD: prebind.h,v 1.2 2006/05/12 22:14:04 drahn Exp $ */ /* * Copyright (c) 2006 Dale Rahn <drahn@dalerahn.com> * @@ -59,6 +59,6 @@ struct symcachetab { struct fixup { u_int32_t sym; - u_int32_t targobj_idx; + u_int32_t obj_idx; u_int32_t sym_idx; }; |