From 0a27d8bfe5fa36d8cb600b5b520f9b5c7fbf0ed6 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Mon, 21 Aug 2006 02:11:39 +0000 Subject: merge new_loader_completion branch, including (at least): - restructured build tree and makefiles to eliminate recursion problems - support for embedded modules - support for static builds - simpler cross-compilation support - simpler module/loader interface (no exported symbols) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40722 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- funcs/func_uri.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'funcs/func_uri.c') diff --git a/funcs/func_uri.c b/funcs/func_uri.c index 8d4979b3b..557fea191 100644 --- a/funcs/func_uri.c +++ b/funcs/func_uri.c @@ -86,27 +86,16 @@ static struct ast_custom_function urlencode_function = { .read = uriencode, }; -static char *tdesc = "URI encode/decode dialplan functions"; - -static int unload_module(void *mod) +static int unload_module(void) { return ast_custom_function_unregister(&urldecode_function) || ast_custom_function_unregister(&urlencode_function); } -static int load_module(void *mod) +static int load_module(void) { return ast_custom_function_register(&urldecode_function) || ast_custom_function_register(&urlencode_function); } -static const char *description(void) -{ - return tdesc; -} - -static const char *key(void) -{ - return ASTERISK_GPL_KEY; -} -STD_MOD(MOD_1 | NO_USECOUNT, NULL, NULL, NULL); +AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "URI encode/decode dialplan functions"); -- cgit v1.2.3