d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the following warning/error with clang:

Browse Source 
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
This commit is contained in:
Dimitry Andric 2012-03-12 11:04:48 +00:00
parent 5eab36f290
commit addfbd03b7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libexec/rtld-elf/rtld.c
View File

@ -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, 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 != (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,