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
This commit is contained in:
parent
5eab36f290
commit
addfbd03b7
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=232857
@ -1895,7 +1895,7 @@ preinit_main(void)
|
|||||||
int index;
|
int index;
|
||||||
|
|
||||||
preinit_addr = (Elf_Addr *)obj_main->preinit_array;
|
preinit_addr = (Elf_Addr *)obj_main->preinit_array;
|
||||||
if (preinit_addr == (Elf_Addr)NULL)
|
if (preinit_addr == (Elf_Addr *)NULL)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
for (index = 0; index < obj_main->preinit_array_num; index++) {
|
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);
|
call_initfini_pointer(elm->obj, elm->obj->init);
|
||||||
}
|
}
|
||||||
init_addr = (Elf_Addr *)elm->obj->init_array;
|
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++) {
|
for (index = 0; index < elm->obj->init_array_num; index++) {
|
||||||
if (init_addr[index] != 0 && init_addr[index] != 1) {
|
if (init_addr[index] != 0 && init_addr[index] != 1) {
|
||||||
dbg("calling init function for %s at %p", elm->obj->path,
|
dbg("calling init function for %s at %p", elm->obj->path,
|
||||||
|
Loading…
Reference in New Issue
Block a user