From 9618b226da634d95fbba4c9c706bafae32d5dce8 Mon Sep 17 00:00:00 2001 From: dim Date: Mon, 12 Mar 2012 11:22:23 +0000 Subject: [PATCH 134/175] Amend r232857, now dropping the casts entirely, as they were not necessary at all. Submitted by: stefanf git-svn-id: http://svn.freebsd.org/base/head@232859 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f (cherry picked from commit 80f4095c018f19e42e809f67c0bbafad719c5543) Signed-off-by: Xin Li --- libexec/rtld-elf/rtld.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 5357d9c8..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, -- 1.7.9.4