summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2012-03-12 11:22:23 +0000
committerdim <dim@FreeBSD.org>2012-03-12 11:22:23 +0000
commit17e08ea3269dbedf8e0de6598af5fd9a4c169959 (patch)
tree177d702d4307c4a60b6dd7ca90ea86de3fa6f29e
parentb7ae1f66589c01173a7705c4b7645abb5d6592c3 (diff)
downloadFreeBSD-src-17e08ea3269dbedf8e0de6598af5fd9a4c169959.zip
FreeBSD-src-17e08ea3269dbedf8e0de6598af5fd9a4c169959.tar.gz
Amend r232857, now dropping the casts entirely, as they were not
necessary at all. Submitted by: stefanf
-rw-r--r--libexec/rtld-elf/rtld.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c
index 5357d9c..98391d6 100644
--- a/libexec/rtld-elf/rtld.c
+++ b/libexec/rtld-elf/rtld.c
@@ -1895,7 +1895,7 @@ preinit_main(void)
int index;
preinit_addr = (Elf_Addr *)obj_main->preinit_array;
- if (preinit_addr == (Elf_Addr *)NULL)
+ if (preinit_addr == NULL)
return;
for (index = 0; index < obj_main->preinit_array_num; index++) {
@@ -2036,7 +2036,7 @@ objlist_call_init(Objlist *list, RtldLockState *lockstate)
call_initfini_pointer(elm->obj, elm->obj->init);
}
init_addr = (Elf_Addr *)elm->obj->init_array;
- if (init_addr != (Elf_Addr *)NULL) {
+ if (init_addr != NULL) {
for (index = 0; index < elm->obj->init_array_num; index++) {
if (init_addr[index] != 0 && init_addr[index] != 1) {
dbg("calling init function for %s at %p", elm->obj->path,
OpenPOWER on IntegriCloud