aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2024-12-04 14:46:30 -05:00
Code

Fix: Added handling of newcb and freecb

Browse Source
This commit is contained in:
Philipp Schafft 2018-06-06 16:03:00 +00:00
parent 38c71f7673
commit 551a36e43b
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/module.c
View File

@ -10,6 +10,7 @@
#include <config.h> #include <config.h>
#endif #endif
#include <stdlib.h>
#include <string.h> #include <string.h>
#include "common/thread/thread.h" #include "common/thread/thread.h"
@ -23,6 +24,8 @@ struct module_tag {
mutex_t lock; mutex_t lock;
const module_client_handler_t *client_handlers; const module_client_handler_t *client_handlers;
size_t client_handlers_len; size_t client_handlers_len;
module_setup_handler_t freecb;
void *userdata;
}; };
@ -116,6 +119,13 @@ module_t * module_container_get_module(module_container_t *self, co
static void __module_free(refobject_t self, void **userdata) static void __module_free(refobject_t self, void **userdata)
{ {
module_t *mod = REFOBJECT_TO_TYPE(self, module_t *); module_t *mod = REFOBJECT_TO_TYPE(self, module_t *);
if (mod->freecb)
mod->freecb(mod, &(mod->userdata));
if (mod->userdata)
free(mod->userdata);
thread_mutex_destroy(&(mod->lock)); thread_mutex_destroy(&(mod->lock));
} }
@ -128,6 +138,16 @@ module_t * module_new(const char *name, module_setup_handler_t newc
thread_mutex_create(&(ret->lock)); thread_mutex_create(&(ret->lock));
ret->userdata = userdata;
ret->freecb = freecb;
if (newcb) {
if (newcb(ret, &(ret->userdata)) != 0) {
refobject_unref(ret);
return NULL;
}
}
return ret; return ret;
} }