1
0
mirror of https://github.com/gryf/wmaker.git synced 2026-01-08 06:44:11 +01:00

cleaning up plugin code.

This commit is contained in:
id
1999-08-23 12:12:01 +00:00
parent dc0d9cff70
commit 4384ccd5b0
4 changed files with 38 additions and 28 deletions

View File

@@ -26,6 +26,8 @@
#include "plugin.h"
#include <stdarg.h>
#ifdef TEXTURE_PLUGIN
# ifdef HAVE_DLFCN_H
# include <dlfcn.h>
@@ -34,6 +36,23 @@
#include <proplist.h>
void** wPluginPackInitData(int members, ...) {
void **p;
va_list vp;
int i;
p = wmalloc(sizeof(void *) * (members + 1));
bzero(p, sizeof(void *) * (members + 1));
va_start(vp, members);
for(i=0;i<members;i++) {
p[i] = va_arg(vp, void *);
printf(" %d > %d\n",i,p[i]);
}
printf(" s> %s\n",p[2]);
va_end(vp);
return p;
}
WFunction *
wPluginCreateFunction(int type, char *library_name,
char *init_proc_name, char *proc_name, char *free_data_proc_name,
@@ -63,9 +82,11 @@ wPluginCreateFunction(int type, char *library_name,
function->freeData = dlsym(function->handle, free_data_proc_name);
if (!function->freeData) {
wwarning(_("function \"%s\" not found in library \"%s\""), free_data_proc_name, library_name);
/*
dlclose(function->handle);
free(function);
return NULL;
*/
}
}
@@ -74,13 +95,11 @@ wPluginCreateFunction(int type, char *library_name,
if (init_proc_name) {
initProc = dlsym(function->handle, init_proc_name);
if (initProc) {
initProc(function->arg, &function->data);
initProc(function->arg, function->data);
} else {
/* Where's my english teacher? -- ]d
wwarning(_("?"),?);
wwarning(_("ignore?"),?);
*/
dlclose(function->handle);
free(function);
}
}
@@ -103,5 +122,3 @@ wPluginDestroyFunction(WFunction *function) {
return;
}
/* hmmmm, need another function to pack a va_list
* but better move on something else for now :D */