diff options
| -rw-r--r-- | libexec/ld.so/alpha/rtld_machine.c | 4 | ||||
| -rw-r--r-- | libexec/ld.so/library.c | 11 | ||||
| -rw-r--r-- | libexec/ld.so/powerpc/rtld_machine.c | 4 | ||||
| -rw-r--r-- | libexec/ld.so/resolve.h | 8 | ||||
| -rw-r--r-- | libexec/ld.so/sparc64/rtld_machine.c | 4 |
5 files changed, 15 insertions, 16 deletions
diff --git a/libexec/ld.so/alpha/rtld_machine.c b/libexec/ld.so/alpha/rtld_machine.c index c2479370dc9..0f486f72cc5 100644 --- a/libexec/ld.so/alpha/rtld_machine.c +++ b/libexec/ld.so/alpha/rtld_machine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtld_machine.c,v 1.10 2002/05/24 04:17:00 deraadt Exp $ */ +/* $OpenBSD: rtld_machine.c,v 1.11 2002/06/05 19:34:44 art Exp $ */ /* * Copyright (c) 1999 Dale Rahn @@ -69,7 +69,7 @@ _dl_md_reloc(elf_object_t *object, int rel, int relasz) long fails = 0; Elf64_Addr loff; Elf64_Rela *relas; - load_list_t *llist; + struct load_list *llist; loff = object->load_offs; numrela = object->Dyn.info[relasz] / sizeof(Elf64_Rela); diff --git a/libexec/ld.so/library.c b/libexec/ld.so/library.c index 286ab43e5b1..5eb86c9c54b 100644 --- a/libexec/ld.so/library.c +++ b/libexec/ld.so/library.c @@ -1,4 +1,4 @@ -/* $OpenBSD: library.c,v 1.14 2002/05/28 00:22:01 deraadt Exp $ */ +/* $OpenBSD: library.c,v 1.15 2002/06/05 19:34:44 art Exp $ */ /* * Copyright (c) 1998 Per Fogelstrom, Opsycon AB @@ -154,9 +154,9 @@ _dl_load_shlib(const char *libname, elf_object_t *parent, int type) } void -_dl_load_list_free(load_list_t *load_list) +_dl_load_list_free(struct load_list *load_list) { - load_list_t *next; + struct load_list *next; while (load_list != NULL) { next = load_list->next; @@ -180,7 +180,7 @@ elf_object_t * _dl_tryload_shlib(const char *libname, int type) { int libfile, i, align = _dl_pagesz - 1; - load_list_t *next_load, *load_list = NULL; + struct load_list *next_load, *load_list = NULL; Elf_Addr maxva = 0, minva = 0x7fffffff; /* XXX Correct for 64bit? */ Elf_Addr libaddr, loff; elf_object_t *object; @@ -259,8 +259,7 @@ _dl_tryload_shlib(const char *libname, int type) res = _dl_mmap(start, size, PFLAGS(phdp->p_flags), MAP_FIXED|MAP_PRIVATE, libfile, phdp->p_offset & ~align); - next_load = (load_list_t *)_dl_malloc( - sizeof(load_list_t)); + next_load = _dl_malloc(sizeof(struct load_list)); next_load->next = load_list; load_list = next_load; next_load->start = start; diff --git a/libexec/ld.so/powerpc/rtld_machine.c b/libexec/ld.so/powerpc/rtld_machine.c index 8445a5c6b55..0d3bfce382b 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.8 2002/05/24 04:21:27 deraadt Exp $ */ +/* $OpenBSD: rtld_machine.c,v 1.9 2002/06/05 19:34:44 art Exp $ */ /* * Copyright (c) 1999 Dale Rahn @@ -60,7 +60,7 @@ _dl_md_reloc(elf_object_t *object, int rel, int relasz) int i; int numrela; int fails = 0; - load_list_t *load_list; + struct load_list *load_list; Elf32_Addr loff; Elf32_Rela *relas; /* for jmp table relocations */ diff --git a/libexec/ld.so/resolve.h b/libexec/ld.so/resolve.h index e31bf4f3c98..2d1acf68b07 100644 --- a/libexec/ld.so/resolve.h +++ b/libexec/ld.so/resolve.h @@ -1,4 +1,4 @@ -/* $OpenBSD: resolve.h,v 1.10 2002/05/24 04:17:00 deraadt Exp $ */ +/* $OpenBSD: resolve.h,v 1.11 2002/06/05 19:34:44 art Exp $ */ /* * Copyright (c) 1998 Per Fogelstrom, Opsycon AB @@ -37,12 +37,12 @@ #include <link.h> -typedef struct load_list { +struct load_list { struct load_list *next; char *start; size_t size; int prot; -} load_list_t; +}; /* * Structure describing a loaded object. @@ -58,7 +58,7 @@ typedef struct elf_object { struct elf_object *prev; /* End struct link_map compatible */ - load_list_t *load_list; + struct load_list *load_list; u_int32_t load_size; diff --git a/libexec/ld.so/sparc64/rtld_machine.c b/libexec/ld.so/sparc64/rtld_machine.c index dbd4ab254b9..955e89fa51b 100644 --- a/libexec/ld.so/sparc64/rtld_machine.c +++ b/libexec/ld.so/sparc64/rtld_machine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtld_machine.c,v 1.14 2002/06/03 20:30:50 drahn Exp $ */ +/* $OpenBSD: rtld_machine.c,v 1.15 2002/06/05 19:34:44 art Exp $ */ /* * Copyright (c) 1999 Dale Rahn @@ -223,7 +223,7 @@ _dl_md_reloc(elf_object_t *object, int rel, int relasz) long fails = 0; Elf_Addr loff; Elf_RelA *relas; - load_list_t *llist; + struct load_list *llist; loff = object->load_offs; numrela = object->Dyn.info[relasz] / sizeof(Elf64_Rela); |