diff options
| -rw-r--r-- | libexec/ld.so/dlfcn.c | 4 | ||||
| -rw-r--r-- | libexec/ld.so/library.c | 3 | ||||
| -rw-r--r-- | libexec/ld.so/library_mquery.c | 4 | ||||
| -rw-r--r-- | libexec/ld.so/loader.c | 4 | ||||
| -rw-r--r-- | libexec/ld.so/resolve.h | 4 |
5 files changed, 7 insertions, 12 deletions
diff --git a/libexec/ld.so/dlfcn.c b/libexec/ld.so/dlfcn.c index 2aee958d316..9a4bfde57eb 100644 --- a/libexec/ld.so/dlfcn.c +++ b/libexec/ld.so/dlfcn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dlfcn.c,v 1.115 2023/08/15 06:26:34 guenther Exp $ */ +/* $OpenBSD: dlfcn.c,v 1.116 2023/12/19 16:13:22 deraadt Exp $ */ /* * Copyright (c) 1998 Per Fogelstrom, Opsycon AB @@ -44,7 +44,7 @@ static int _dl_real_close(void *handle); static lock_cb *_dl_thread_fnc = NULL; static elf_object_t *obj_from_addr(const void *addr); -#define OK_FLAGS (0 \ +#define OK_FLAGS (0 \ | RTLD_TRACE \ | RTLD_LAZY \ | RTLD_NOW \ diff --git a/libexec/ld.so/library.c b/libexec/ld.so/library.c index 34bf47ce977..b203d4fcef7 100644 --- a/libexec/ld.so/library.c +++ b/libexec/ld.so/library.c @@ -1,4 +1,4 @@ -/* $OpenBSD: library.c,v 1.92 2023/08/15 06:23:31 guenther Exp $ */ +/* $OpenBSD: library.c,v 1.93 2023/12/19 16:13:22 deraadt Exp $ */ /* * Copyright (c) 2002 Dale Rahn @@ -316,7 +316,6 @@ _dl_tryload_shlib(const char *libname, int type, int flags, int nodelete) _dl_push_range_size(&mut, phdp->p_vaddr + loff, phdp->p_memsz); break; - default: break; } diff --git a/libexec/ld.so/library_mquery.c b/libexec/ld.so/library_mquery.c index 5f7aeb2cf82..74070a86a5f 100644 --- a/libexec/ld.so/library_mquery.c +++ b/libexec/ld.so/library_mquery.c @@ -1,4 +1,4 @@ -/* $OpenBSD: library_mquery.c,v 1.72 2023/08/15 06:23:31 guenther Exp $ */ +/* $OpenBSD: library_mquery.c,v 1.73 2023/12/19 16:13:22 deraadt Exp $ */ /* * Copyright (c) 2002 Dale Rahn @@ -60,7 +60,6 @@ _dl_load_list_free(struct load_list *load_list) } } - void _dl_unload_shlib(elf_object_t *object) { @@ -99,7 +98,6 @@ unload: } } - elf_object_t * _dl_tryload_shlib(const char *libname, int type, int flags, int nodelete) { diff --git a/libexec/ld.so/loader.c b/libexec/ld.so/loader.c index dc7eb6a49c3..9f15530e2c4 100644 --- a/libexec/ld.so/loader.c +++ b/libexec/ld.so/loader.c @@ -1,4 +1,4 @@ -/* $OpenBSD: loader.c,v 1.217 2023/12/19 06:27:45 deraadt Exp $ */ +/* $OpenBSD: loader.c,v 1.218 2023/12/19 16:13:22 deraadt Exp $ */ /* * Copyright (c) 1998 Per Fogelstrom, Opsycon AB @@ -171,7 +171,6 @@ _dl_run_all_dtors(void) } } - for (node = _dl_objects; node != NULL; node = node->next ) { @@ -1139,5 +1138,4 @@ _dl_apply_immutable(elf_object_t *object) } } - } diff --git a/libexec/ld.so/resolve.h b/libexec/ld.so/resolve.h index d32279d15f8..8f3411dcfd1 100644 --- a/libexec/ld.so/resolve.h +++ b/libexec/ld.so/resolve.h @@ -1,4 +1,4 @@ -/* $OpenBSD: resolve.h,v 1.105 2023/08/15 06:26:34 guenther Exp $ */ +/* $OpenBSD: resolve.h,v 1.106 2023/12/19 16:13:22 deraadt Exp $ */ /* * Copyright (c) 1998 Per Fogelstrom, Opsycon AB @@ -73,7 +73,7 @@ typedef struct elf_object elf_object_t; struct object_vector { int len; int alloc; - elf_object_t **vec; + elf_object_t **vec; }; void object_vec_grow(struct object_vector *_vec, int _more); |