emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use correct function casts. Use dlfunc where available to remove ISO warnings :)

Browse Source
This commit is contained in:
Roy Marples 2007-05-14 17:05:55 +00:00
parent b2e8324184
commit d0308aaecd
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/rc-plugin.c
View File

@ -23,7 +23,7 @@ typedef struct plugin
{
char *name;
void *handle;
int (*hook) (rc_hook_t hook, const char *name);
int (*hook) (rc_hook_t, const char *);
struct plugin *next;
} plugin_t;
@ -47,7 +47,7 @@ void rc_plugin_load (void)
char *p = rc_strcatpaths (RC_PLUGINDIR, file, NULL);
void *h = dlopen (p, RTLD_LAZY);
char *func;
void *f;
int (*fptr) (rc_hook_t, const char *);
int len;
if (! h) {
@ -62,8 +62,12 @@ void rc_plugin_load (void)
func = rc_xmalloc (sizeof (char *) * len);
snprintf (func, len, "_%s_hook", file);
f = dlsym (h, func);
if (! f) {
#ifdef __FreeBSD__
fptr = (int (*)(rc_hook_t, const char*)) dlfunc (h, func);
#else
fptr = (int (*)(rc_hook_t, const char*)) dlsym (h, func);
#endif
if (! fptr) {
eerror ("`%s' does not expose the symbol `%s'", p, func);
dlclose (h);
} else {
@ -76,7 +80,7 @@ void rc_plugin_load (void)
memset (plugin, 0, sizeof (plugin_t));
plugin->name = rc_xstrdup (file);
plugin->handle = h;
plugin->hook = f;
plugin->hook = fptr;
}
free (func);

4
src/runscript.c
View File

@ -80,8 +80,8 @@ static void setup_selinux (int argc, char **argv)
* which sucks ass
* http://www.opengroup.org/onlinepubs/009695399/functions/dlsym.html
*/
selinux_run_init_old = dlsym (lib_handle, "selinux_runscript");
selinux_run_init_new = dlsym (lib_handle, "selinux_runscript2");
selinux_run_init_old = (void (*)(void)) dlsym (lib_handle, "selinux_runscript");
selinux_run_init_new = (void (*)(int, char **)) dlsym (lib_handle, "selinux_runscript2");
/* Use new run_init if it rc_exists, else fall back to old */
if (selinux_run_init_new)