fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-25 02:30:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

LoaderOpen returns either a valid pointer or NULL, so don't check for < 0

Browse source 
Fixes Sun cc warning that was recently elevated to error by the
stricter default CFLAGS changes to xorg-macros:

"loadmod.c", line 914: improper pointer/integer combination: op "<"

Should have been changed when commit ab7f057ce9 changed the
LoaderOpen return type from int to void *.

Changes log message when file is found but dlopen() fails from:
 (EE) LoadModule: Module dbe does not have a dbeModuleData data object.
 (EE) Failed to load module "dbe" (invalid module, 0)
to:
 (EE) Failed to load module "dbe" (loader failed, 7)

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
(cherry picked from commit e4dcf580f0)
This commit is contained in:
Alan Coopersmith 2011-12-01 23:45:42 -08:00 • committed by Jeremy Huddleston
parent de6f92513b
commit 7abd360638
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hw/xfree86/loader/loadmod.c
View file

@ -926,7 +926,7 @@ doLoadModule(const char *module, const char *path, const char **subdirlist,
goto LoadModule_fail;
}
ret->handle = LoaderOpen(found, errmaj, errmin);
if (ret->handle < 0)
if (ret->handle == NULL)
goto LoadModule_fail;
ret->path = strdup(found);