Date: Mon, 12 Mar 2012 11:04:48 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r232857 - head/libexec/rtld-elf Message-ID: <201203121104.q2CB4mN2058832@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Mon Mar 12 11:04:48 2012 New Revision: 232857 URL: http://svn.freebsd.org/changeset/base/232857 Log: Fix the following warning/error with clang: libexec/rtld-elf/rtld.c:1898:22: error: comparison between pointer and integer ('Elf_Addr *' (aka 'unsigned int *') and 'Elf_Addr' (aka 'unsigned int')) [-Werror] if (preinit_addr == (Elf_Addr)NULL) ~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~ libexec/rtld-elf/rtld.c:2039:16: error: comparison between pointer and integer ('Elf_Addr *' (aka 'unsigned int *') and 'Elf_Addr' (aka 'unsigned int')) [-Werror] if (init_addr != (Elf_Addr)NULL) { ~~~~~~~~~ ^ ~~~~~~~~~~~~~~ Reviewed by: kib Modified: head/libexec/rtld-elf/rtld.c 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,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203121104.q2CB4mN2058832>