[asterisk-commits] branch murf/AEL2 r20252 - in /team/murf/AEL2: pbx/pbx_ael2.c utils/ael_main.c

[asterisk-commits at lists.digium.com]

Author: murf
Date: Fri Apr 14 20:51:12 2006
New Revision: 20252

URL: http://svn.digium.com/view/asterisk?rev=20252&view=rev
Log:
oops, didn't get these two files in with 
the previous commit! arg!


Modified:
    team/murf/AEL2/pbx/pbx_ael2.c
    team/murf/AEL2/utils/ael_main.c

Modified: team/murf/AEL2/pbx/pbx_ael2.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2/pbx/pbx_ael2.c?rev=20252&r1=20251&r2=20252&view=diff
==============================================================================
--- team/murf/AEL2/pbx/pbx_ael2.c (original)
+++ team/murf/AEL2/pbx/pbx_ael2.c Fri Apr 14 20:51:12 2006
@@ -3448,7 +3448,7 @@
 /*
  * Standard module functions ...
  */
-int unload_module(void)
+static int unload_module(void)
 {
 	ast_context_destroy(NULL, registrar);
 	ast_cli_unregister_multiple(ael2_cli, sizeof(ael2_cli)/ sizeof(ael2_cli[0]));
@@ -3456,23 +3456,18 @@
 }
 
 
-int load_module(void)
+static int load_module(void)
 {
 	ast_cli_register_multiple(ael2_cli, sizeof(ael2_cli)/ sizeof(ael2_cli[0]));
 	return (pbx_load_module());
 }
 
-int reload(void)
+static int reload(void)
 {
 	ast_context_destroy(NULL, registrar);
 	return pbx_load_module();
 }
 
-int usecount(void)
-{
-	return 0;
-}
-
 const char *description(void)
 {
 	return dtext;
@@ -3482,6 +3477,8 @@
 {
 	return ASTERISK_GPL_KEY;
 }
+
+STD_MOD(MOD_1 | NO_USECOUNT, reload, NULL, NULL);
 
 /* DESTROY the PVAL tree ============================================================================ */
 

Modified: team/murf/AEL2/utils/ael_main.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2/utils/ael_main.c?rev=20252&r1=20251&r2=20252&view=diff
==============================================================================
--- team/murf/AEL2/utils/ael_main.c (original)
+++ team/murf/AEL2/utils/ael_main.c Fri Apr 14 20:51:12 2006
@@ -14,6 +14,7 @@
 #include <limits.h>
 #include <asterisk/ast_expr.h>
 #include <asterisk/logger.h>
+#include <asterisk/module.h>
 #include <asterisk/channel.h>
 #include <asterisk/app.h>
 #include "asterisk/ael_structs.h"
@@ -224,7 +225,8 @@
         return dataPut;
 }
 
-int load_module(void);
+extern struct module_symbols mod_data;
+
 
 int main(int argc, char **argv)
 {
@@ -254,7 +256,7 @@
 	}
 	strcpy(ast_config_AST_VAR_DIR, "/var/lib/asterisk");
 	
-	load_module();
+	mod_data.load_module(0);
 	
 	ast_log(4, "ael2_parse", __LINE__, "main", "%d contexts, %d extensions, %d priorities\n", conts, extens, priors);