mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-07-30 13:53:30 +02:00
do not return NULL symbols.
Wed Mar 1 05:34:47 2000 Tim Janik <timj@gtk.org> * gmodule-beos.c (_g_module_symbol): do not return NULL symbols. * gmodule-os2.c: removed NetBSD specific defines. (_g_module_self): set an error message for unsupported behaviour. * gmodule-beos.c: many coding style fixups. (_g_module_open): (_g_module_self): (_g_module_close): (_g_module_symbol): bunch of memory leaks plugged. * gmodule-dl.c: make sure the error message returned from dlerror() is always != NULL, by using a wrapper function fetch_dlerror(). based on a patch to fix _g_module_symbol() for NetBSD from Scott Presnell <srp@zgi.com>. * gmodule-dld.c: minor indentation. * gmodule-win32.c: minor cleanups. * merges from glib-1-2.
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/* GMODULE - GLIB wrapper code for dynamic module loading
|
||||
* Copyright (C) 1998 Tim Janik
|
||||
* Copyright (C) 1998, 2000 Tim Janik
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Library General Public
|
||||
@@ -36,12 +36,8 @@
|
||||
/* dlerror() is not implemented on all systems
|
||||
*/
|
||||
#ifndef G_MODULE_HAVE_DLERROR
|
||||
# ifdef __NetBSD__
|
||||
# define dlerror() g_strerror (errno)
|
||||
# else /* !__NetBSD__ */
|
||||
/* could we rely on errno's state here? */
|
||||
# define dlerror() "unknown dl-error"
|
||||
# endif /* !__NetBSD__ */
|
||||
# define dlerror() "unknown dl-error"
|
||||
#endif /* G_MODULE_HAVE_DLERROR */
|
||||
|
||||
/* some flags are missing on some systems, so we provide
|
||||
@@ -92,15 +88,16 @@ _g_module_self (void)
|
||||
* are required on some systems.
|
||||
*/
|
||||
|
||||
/* XXX, not supported */
|
||||
/* XXX, not supported */
|
||||
handle = NULL;
|
||||
g_module_set_error ("module handle for self not supported");
|
||||
|
||||
return handle;
|
||||
}
|
||||
|
||||
static void
|
||||
_g_module_close (gpointer handle,
|
||||
gboolean is_unref)
|
||||
_g_module_close (gpointer handle,
|
||||
gboolean is_unref)
|
||||
{
|
||||
/* are there any systems out there that have dlopen()/dlclose()
|
||||
* without a reference count implementation?
|
||||
@@ -109,14 +106,14 @@ _g_module_close (gpointer handle,
|
||||
|
||||
if (is_unref)
|
||||
{
|
||||
/* XXX, no return code */
|
||||
/* XXX, no return code */
|
||||
dlclose (handle);
|
||||
}
|
||||
}
|
||||
|
||||
static gpointer
|
||||
_g_module_symbol (gpointer handle,
|
||||
const gchar *symbol_name)
|
||||
_g_module_symbol (gpointer handle,
|
||||
const gchar *symbol_name)
|
||||
{
|
||||
gpointer p;
|
||||
|
||||
|
Reference in New Issue
Block a user