svn commit: r232857 - head/libexec/rtld-elf

[Stefan Farfeleder]

On Mon, Mar 12, 2012 at 11:04:48AM +0000, Dimitry Andric wrote:
> Modified: head/libexec/rtld-elf/rtld.c
> ==============================================================================
> --- head/libexec/rtld-elf/rtld.c	Mon Mar 12 10:36:03 2012	(r232856)
> +++ head/libexec/rtld-elf/rtld.c	Mon Mar 12 11:04:48 2012	(r232857)
> @@ -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 == (Elf_Addr *)NULL)
>  	return;
>  
>      for (index = 0; index < obj_main->preinit_array_num; index++) {
> @@ -2036,7 +2036,7 @@ objlist_call_init(Objlist *list, RtldLoc
>  	    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 != (Elf_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,
> 

Why don't you simply remove the unnecessary casts?