[asterisk-commits] branch group/new_loader_completion r26379 - in
/team/group/new_loader_complet...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Wed May 10 04:46:59 MST 2006
Author: kpfleming
Date: Wed May 10 06:46:58 2006
New Revision: 26379
URL: http://svn.digium.com/view/asterisk?rev=26379&view=rev
Log:
convert the rest of the apps to the new loader definition format
various minor Makefile improvements
enable C++ modules to use the new loader definition format
Modified:
team/group/new_loader_completion/agi/Makefile
team/group/new_loader_completion/apps/Makefile
team/group/new_loader_completion/apps/app_adsiprog.c
team/group/new_loader_completion/apps/app_alarmreceiver.c
team/group/new_loader_completion/apps/app_amd.c
team/group/new_loader_completion/apps/app_authenticate.c
team/group/new_loader_completion/apps/app_cdr.c
team/group/new_loader_completion/apps/app_chanisavail.c
team/group/new_loader_completion/apps/app_channelredirect.c
team/group/new_loader_completion/apps/app_chanspy.c
team/group/new_loader_completion/apps/app_controlplayback.c
team/group/new_loader_completion/apps/app_db.c
team/group/new_loader_completion/apps/app_dial.c
team/group/new_loader_completion/apps/app_dictate.c
team/group/new_loader_completion/apps/app_directed_pickup.c
team/group/new_loader_completion/apps/app_directory.c
team/group/new_loader_completion/apps/app_disa.c
team/group/new_loader_completion/apps/app_dumpchan.c
team/group/new_loader_completion/apps/app_echo.c
team/group/new_loader_completion/apps/app_exec.c
team/group/new_loader_completion/apps/app_externalivr.c
team/group/new_loader_completion/apps/app_festival.c
team/group/new_loader_completion/apps/app_flash.c
team/group/new_loader_completion/apps/app_forkcdr.c
team/group/new_loader_completion/apps/app_getcpeid.c
team/group/new_loader_completion/apps/app_hasnewvoicemail.c
team/group/new_loader_completion/apps/app_ices.c
team/group/new_loader_completion/apps/app_image.c
team/group/new_loader_completion/apps/app_lookupblacklist.c
team/group/new_loader_completion/apps/app_lookupcidname.c
team/group/new_loader_completion/apps/app_macro.c
team/group/new_loader_completion/apps/app_meetme.c
team/group/new_loader_completion/apps/app_milliwatt.c
team/group/new_loader_completion/apps/app_mixmonitor.c
team/group/new_loader_completion/apps/app_morsecode.c
team/group/new_loader_completion/apps/app_mp3.c
team/group/new_loader_completion/apps/app_nbscat.c
team/group/new_loader_completion/apps/app_osplookup.c
team/group/new_loader_completion/apps/app_page.c
team/group/new_loader_completion/apps/app_parkandannounce.c
team/group/new_loader_completion/apps/app_playback.c
team/group/new_loader_completion/apps/app_privacy.c
team/group/new_loader_completion/apps/app_queue.c
team/group/new_loader_completion/apps/app_random.c
team/group/new_loader_completion/apps/app_read.c
team/group/new_loader_completion/apps/app_readfile.c
team/group/new_loader_completion/apps/app_realtime.c
team/group/new_loader_completion/apps/app_record.c
team/group/new_loader_completion/apps/app_sayunixtime.c
team/group/new_loader_completion/apps/app_senddtmf.c
team/group/new_loader_completion/apps/app_sendtext.c
team/group/new_loader_completion/apps/app_setcallerid.c
team/group/new_loader_completion/apps/app_setcdruserfield.c
team/group/new_loader_completion/apps/app_settransfercapability.c
team/group/new_loader_completion/apps/app_sms.c
team/group/new_loader_completion/apps/app_softhangup.c
team/group/new_loader_completion/apps/app_speech_utils.c
team/group/new_loader_completion/apps/app_stack.c
team/group/new_loader_completion/apps/app_system.c
team/group/new_loader_completion/apps/app_talkdetect.c
team/group/new_loader_completion/apps/app_test.c
team/group/new_loader_completion/apps/app_transfer.c
team/group/new_loader_completion/apps/app_url.c
team/group/new_loader_completion/apps/app_userevent.c
team/group/new_loader_completion/apps/app_verbose.c
team/group/new_loader_completion/apps/app_voicemail.c
team/group/new_loader_completion/apps/app_waitforring.c
team/group/new_loader_completion/apps/app_waitforsilence.c
team/group/new_loader_completion/apps/app_while.c
team/group/new_loader_completion/apps/app_zapateller.c
team/group/new_loader_completion/apps/app_zapbarge.c
team/group/new_loader_completion/apps/app_zapras.c
team/group/new_loader_completion/build_tools/prep_moduledeps
team/group/new_loader_completion/cdr/Makefile
team/group/new_loader_completion/channels/Makefile
team/group/new_loader_completion/channels/chan_h323.c
team/group/new_loader_completion/channels/chan_vpb.c
team/group/new_loader_completion/codecs/Makefile
team/group/new_loader_completion/formats/Makefile
team/group/new_loader_completion/funcs/Makefile
team/group/new_loader_completion/include/asterisk/module.h
team/group/new_loader_completion/loader.c
team/group/new_loader_completion/pbx/Makefile
team/group/new_loader_completion/res/Makefile
team/group/new_loader_completion/utils/Makefile
team/group/new_loader_completion/utils/ael_main.c
Modified: team/group/new_loader_completion/agi/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/agi/Makefile?rev=26379&r1=26378&r2=26379&view=diff
==============================================================================
--- team/group/new_loader_completion/agi/Makefile (original)
+++ team/group/new_loader_completion/agi/Makefile Wed May 10 06:46:58 2006
@@ -40,7 +40,7 @@
rm -f *.so *.o look eagi-test eagi-sphinx-test
%.so : %.o
- $(CC) -shared -Xlinker -x -o $@ $<
+ $(CC) -shared -Xlinker -x -o $@ $^
ifneq ($(wildcard .depend),)
include .depend
Modified: team/group/new_loader_completion/apps/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/Makefile?rev=26379&r1=26378&r2=26379&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/Makefile (original)
+++ team/group/new_loader_completion/apps/Makefile Wed May 10 06:46:58 2006
@@ -35,13 +35,13 @@
rm -f *.so *.o
%.so: %.o
- $(CC) $(SOLINK) -o $@ $<
+ $(CC) $(SOLINK) -o $@ $^
app_rpt.so: app_rpt.o
- $(CC) $(SOLINK) -o $@ $< $(ZAPTEL_LIB)
+ $(CC) $(SOLINK) -o $@ $^ $(ZAPTEL_LIB)
app_rpt.o: app_rpt.c
- $(CC) -c -o $@ $(CFLAGS) $(ZAPTEL_INCLUDE) $<
+ $(CC) -c -o $@ $(CFLAGS) $(ZAPTEL_INCLUDE) $^
install: all
for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
@@ -53,7 +53,7 @@
ifeq (SunOS,$(shell uname))
app_chanspy.so: app_chanspy.o
- $(CC) $(SOLINK) -o $@ $< -lrt
+ $(CC) $(SOLINK) -o $@ $^ -lrt
endif
ifneq ($(wildcard .depend),)
Modified: team/group/new_loader_completion/apps/app_adsiprog.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_adsiprog.c?rev=26379&r1=26378&r2=26379&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_adsiprog.c (original)
+++ team/group/new_loader_completion/apps/app_adsiprog.c Wed May 10 06:46:58 2006
@@ -1583,14 +1583,4 @@
return ast_register_application(app, adsi_exec, synopsis, descrip);
}
-static const char *description(void)
-{
- return "Asterisk ADSI Programming Application";
-}
-
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, XXX);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Asterisk ADSI Programming Application");
Modified: team/group/new_loader_completion/apps/app_alarmreceiver.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_alarmreceiver.c?rev=26379&r1=26378&r2=26379&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_alarmreceiver.c (original)
+++ team/group/new_loader_completion/apps/app_alarmreceiver.c Wed May 10 06:46:58 2006
@@ -833,14 +833,4 @@
return ast_register_application(app, alarmreceiver_exec, synopsis, descrip);
}
-static const char *description(void)
-{
- return "Alarm Receiver for Asterisk";
-}
-
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, XXX);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Alarm Receiver for Asterisk");
Modified: team/group/new_loader_completion/apps/app_amd.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_amd.c?rev=26379&r1=26378&r2=26379&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_amd.c (original)
+++ team/group/new_loader_completion/apps/app_amd.c Wed May 10 06:46:58 2006
@@ -407,14 +407,8 @@
return 0;
}
-static const char *description(void)
-{
- return "Answering Machine Detection Application";
-}
-
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-STD_MOD(MOD_1, reload, NULL, NULL);
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "Answering Machine Detection Application",
+ .load = load_module,
+ .unload = unload_module,
+ .reload = reload,
+ );
Modified: team/group/new_loader_completion/apps/app_authenticate.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_authenticate.c?rev=26379&r1=26378&r2=26379&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_authenticate.c (original)
+++ team/group/new_loader_completion/apps/app_authenticate.c Wed May 10 06:46:58 2006
@@ -250,14 +250,4 @@
return ast_register_application(app, auth_exec, synopsis, descrip);
}
-static const char *description(void)
-{
- return "Authentication Application";
-}
-
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, XXX);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Authentication Application");
Modified: team/group/new_loader_completion/apps/app_cdr.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_cdr.c?rev=26379&r1=26378&r2=26379&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_cdr.c (original)
+++ team/group/new_loader_completion/apps/app_cdr.c Wed May 10 06:46:58 2006
@@ -76,14 +76,4 @@
return ast_register_application(nocdr_app, nocdr_exec, nocdr_synopsis, nocdr_descrip);
}
-static const char *description(void)
-{
- return "Tell Asterisk to not maintain a CDR for the current call";
-}
-
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, XXX);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Tell Asterisk to not maintain a CDR for the current call");
Modified: team/group/new_loader_completion/apps/app_chanisavail.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_chanisavail.c?rev=26379&r1=26378&r2=26379&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_chanisavail.c (original)
+++ team/group/new_loader_completion/apps/app_chanisavail.c Wed May 10 06:46:58 2006
@@ -170,14 +170,4 @@
return ast_register_application(app, chanavail_exec, synopsis, descrip);
}
-static const char *description(void)
-{
- return "Check channel availability";
-}
-
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, XXX);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Check channel availability");
Modified: team/group/new_loader_completion/apps/app_channelredirect.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_channelredirect.c?rev=26379&r1=26378&r2=26379&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_channelredirect.c (original)
+++ team/group/new_loader_completion/apps/app_channelredirect.c Wed May 10 06:46:58 2006
@@ -135,14 +135,4 @@
return ast_register_application(app, asyncgoto_exec, synopsis, descrip);
}
-static const char *description(void)
-{
- return "Channel Redirect";
-}
-
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, XXX);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Channel Redirect");
Modified: team/group/new_loader_completion/apps/app_chanspy.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_chanspy.c?rev=26379&r1=26378&r2=26379&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_chanspy.c (original)
+++ team/group/new_loader_completion/apps/app_chanspy.c Wed May 10 06:46:58 2006
@@ -56,7 +56,6 @@
#define ALL_DONE(u, ret) ast_module_user_remove(u); return ret;
#define get_volfactor(x) x ? ((x > 0) ? (1 << x) : ((1 << abs(x)) * -1)) : 0
-static const char *tdesc = "Listen to the audio of an active channel";
static const char *app = "ChanSpy";
static const char *desc =
" ChanSpy([chanprefix][|options]): This application is used to listen to the\n"
@@ -582,17 +581,7 @@
static int load_module(void)
{
- return ast_register_application(app, chanspy_exec, tdesc, desc);
-}
-
-static const char *description(void)
-{
- return (char *) tdesc;
-}
-
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, XXX);
+ return ast_register_application(app, chanspy_exec, "Listen to the audio of an active channel", desc);
+}
+
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Listen to the audio of an active channel");
Modified: team/group/new_loader_completion/apps/app_controlplayback.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_controlplayback.c?rev=26379&r1=26378&r2=26379&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_controlplayback.c (original)
+++ team/group/new_loader_completion/apps/app_controlplayback.c Wed May 10 06:46:58 2006
@@ -165,14 +165,4 @@
return ast_register_application(app, controlplayback_exec, synopsis, descrip);
}
-static const char *description(void)
-{
- return "Control Playback Application";
-}
-
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, XXX);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Control Playback Application");
Modified: team/group/new_loader_completion/apps/app_db.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_db.c?rev=26379&r1=26378&r2=26379&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_db.c (original)
+++ team/group/new_loader_completion/apps/app_db.c Wed May 10 06:46:58 2006
@@ -162,14 +162,4 @@
return retval;
}
-static const char *description(void)
-{
- return "Database Access Functions";
-}
-
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, XXX);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Database Access Functions");
Modified: team/group/new_loader_completion/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_dial.c?rev=26379&r1=26378&r2=26379&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_dial.c (original)
+++ team/group/new_loader_completion/apps/app_dial.c Wed May 10 06:46:58 2006
@@ -1701,14 +1701,4 @@
return res;
}
-static const char *description(void)
-{
- return "Dialing Application";
-}
-
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, XXX);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Dialing Application");
Modified: team/group/new_loader_completion/apps/app_dictate.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_dictate.c?rev=26379&r1=26378&r2=26379&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_dictate.c (original)
+++ team/group/new_loader_completion/apps/app_dictate.c Wed May 10 06:46:58 2006
@@ -346,14 +346,4 @@
return ast_register_application(app, dictate_exec, synopsis, desc);
}
-static const char *description(void)
-{
- return "Virtual Dictation Machine";
-}
-
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, XXX);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Virtual Dictation Machine");
Modified: team/group/new_loader_completion/apps/app_directed_pickup.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_directed_pickup.c?rev=26379&r1=26378&r2=26379&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_directed_pickup.c (original)
+++ team/group/new_loader_completion/apps/app_directed_pickup.c Wed May 10 06:46:58 2006
@@ -146,14 +146,4 @@
return ast_register_application(app, pickup_exec, synopsis, descrip);
}
-static const char *description(void)
-{
- return "Directed Call Pickup Application";
-}
-
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, XXX);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Directed Call Pickup Application");
Modified: team/group/new_loader_completion/apps/app_directory.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_directory.c?rev=26379&r1=26378&r2=26379&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_directory.c (original)
+++ team/group/new_loader_completion/apps/app_directory.c Wed May 10 06:46:58 2006
@@ -477,14 +477,4 @@
return ast_register_application(app, directory_exec, synopsis, descrip);
}
-static const char *description(void)
-{
- return "Extension Directory";
-}
-
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, XXX);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Extension Directory");
Modified: team/group/new_loader_completion/apps/app_disa.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_disa.c?rev=26379&r1=26378&r2=26379&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_disa.c (original)
+++ team/group/new_loader_completion/apps/app_disa.c Wed May 10 06:46:58 2006
@@ -389,14 +389,4 @@
return ast_register_application(app, disa_exec, synopsis, descrip);
}
-static const char *description(void)
-{
- return "DISA (Direct Inward System Access) Application";
-}
-
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, XXX);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "DISA (Direct Inward System Access) Application");
Modified: team/group/new_loader_completion/apps/app_dumpchan.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_dumpchan.c?rev=26379&r1=26378&r2=26379&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_dumpchan.c (original)
+++ team/group/new_loader_completion/apps/app_dumpchan.c Wed May 10 06:46:58 2006
@@ -171,14 +171,4 @@
return ast_register_application(app, dumpchan_exec, synopsis, desc);
}
-static const char *description(void)
-{
- return "Dump Info About The Calling Channel";
-}
-
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, XXX);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Dump Info About The Calling Channel");
Modified: team/group/new_loader_completion/apps/app_echo.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_echo.c?rev=26379&r1=26378&r2=26379&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_echo.c (original)
+++ team/group/new_loader_completion/apps/app_echo.c Wed May 10 06:46:58 2006
@@ -40,8 +40,6 @@
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
#include "asterisk/module.h"
-
-static char *tdesc = "Simple Echo Application";
static char *app = "Echo";
@@ -110,14 +108,4 @@
return ast_register_application(app, echo_exec, synopsis, descrip);
}
-static const char *description(void)
-{
- return tdesc;
-}
-
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, XXX);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Simple Echo Application");
Modified: team/group/new_loader_completion/apps/app_exec.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_exec.c?rev=26379&r1=26378&r2=26379&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_exec.c (original)
+++ team/group/new_loader_completion/apps/app_exec.c Wed May 10 06:46:58 2006
@@ -44,8 +44,6 @@
/* Maximum length of any variable */
#define MAXRESULT 1024
-
-static char *tdesc = "Executes dialplan applications";
/*! Note
*
@@ -166,18 +164,19 @@
return 0;
}
-static int execif_exec(struct ast_channel *chan, void *data) {
- int res=0;
- struct localuser *u;
+static int execif_exec(struct ast_channel *chan, void *data)
+{
+ int res = 0;
+ struct ast_module_user *u;
char *myapp = NULL;
char *mydata = NULL;
char *expr = NULL;
struct ast_app *app = NULL;
- LOCAL_USER_ADD(u);
+ u = ast_module_user_add(chan);
if (!(expr = ast_strdupa(data))) {
- LOCAL_USER_REMOVE(u);
+ ast_module_user_remove(u);
return -1;
}
@@ -203,7 +202,8 @@
res = -1;
}
- LOCAL_USER_REMOVE(u);
+ ast_module_user_remove(u);
+
return res;
}
@@ -228,14 +228,4 @@
return res;
}
-static const char *description(void)
-{
- return tdesc;
-}
-
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, XXX);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Executes dialplan applications");
Modified: team/group/new_loader_completion/apps/app_externalivr.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_externalivr.c?rev=26379&r1=26378&r2=26379&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_externalivr.c (original)
+++ team/group/new_loader_completion/apps/app_externalivr.c Wed May 10 06:46:58 2006
@@ -242,7 +242,7 @@
static int app_exec(struct ast_channel *chan, void *data)
{
- struct localuser *lu = NULL;
+ struct ast_module_user *lu;
struct playlist_entry *entry;
const char *args = data;
int child_stdin[2] = { 0,0 };
@@ -261,7 +261,7 @@
bzero(u, sizeof(*u));
- LOCAL_USER_ADD(lu);
+ lu = ast_module_user_add(chan);
AST_LIST_HEAD_INIT(&u->playlist);
AST_LIST_HEAD_INIT(&u->finishlist);
@@ -270,12 +270,12 @@
if (ast_strlen_zero(args)) {
ast_log(LOG_WARNING, "ExternalIVR requires a command to execute\n");
- LOCAL_USER_REMOVE(lu);
+ ast_module_user_remove(lu);
return -1;
}
if (!(buf = ast_strdupa(data))) {
- LOCAL_USER_REMOVE(lu);
+ ast_module_user_remove(lu);
return -1;
}
@@ -548,7 +548,7 @@
while ((entry = AST_LIST_REMOVE_HEAD(&u->playlist, list)))
free(entry);
- LOCAL_USER_REMOVE(lu);
+ ast_module_user_remove(lu);
return res;
}
@@ -569,14 +569,4 @@
return ast_register_application(app, app_exec, synopsis, descrip);
}
-static const char *description(void)
-{
- return "External IVR Interface Application";
-}
-
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, XXX);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "External IVR Interface Application");
Modified: team/group/new_loader_completion/apps/app_festival.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_festival.c?rev=26379&r1=26378&r2=26379&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_festival.c (original)
+++ team/group/new_loader_completion/apps/app_festival.c Wed May 10 06:46:58 2006
@@ -535,15 +535,4 @@
return ast_register_application(app, festival_exec, synopsis, descrip);
}
-static const char *description(void)
-{
- return "Simple Festival Interface";
-
-}
-
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, XXX);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Simple Festival Interface");
Modified: team/group/new_loader_completion/apps/app_flash.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_flash.c?rev=26379&r1=26378&r2=26379&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_flash.c (original)
+++ team/group/new_loader_completion/apps/app_flash.c Wed May 10 06:46:58 2006
@@ -124,15 +124,5 @@
return ast_register_application(app, flash_exec, synopsis, descrip);
}
-static const char *description(void)
-{
- return "Flash zap trunk application";
-}
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Flash channel application");
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, XXX);
-
Modified: team/group/new_loader_completion/apps/app_forkcdr.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_forkcdr.c?rev=26379&r1=26378&r2=26379&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_forkcdr.c (original)
+++ team/group/new_loader_completion/apps/app_forkcdr.c Wed May 10 06:46:58 2006
@@ -112,14 +112,4 @@
return ast_register_application(app, forkcdr_exec, synopsis, descrip);
}
-static const char *description(void)
-{
- return "Fork The CDR into 2 separate entities.";
-}
-
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, XXX);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Fork The CDR into 2 separate entities");
Modified: team/group/new_loader_completion/apps/app_getcpeid.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_getcpeid.c?rev=26379&r1=26378&r2=26379&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_getcpeid.c (original)
+++ team/group/new_loader_completion/apps/app_getcpeid.c Wed May 10 06:46:58 2006
@@ -146,14 +146,4 @@
return ast_register_application(app, cpeid_exec, synopsis, descrip);
}
-static const char *description(void)
-{
- return "Get ADSI CPE ID";
-}
-
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, XXX);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Get ADSI CPE ID");
Modified: team/group/new_loader_completion/apps/app_hasnewvoicemail.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_hasnewvoicemail.c?rev=26379&r1=26378&r2=26379&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_hasnewvoicemail.c (original)
+++ team/group/new_loader_completion/apps/app_hasnewvoicemail.c Wed May 10 06:46:58 2006
@@ -241,14 +241,4 @@
return res;
}
-static const char *description(void)
-{
- return "Indicator for whether a voice mailbox has messages in a given folder.";
-}
-
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, XXX);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Indicator for whether a voice mailbox has messages in a given folder.");
Modified: team/group/new_loader_completion/apps/app_ices.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_ices.c?rev=26379&r1=26378&r2=26379&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_ices.c (original)
+++ team/group/new_loader_completion/apps/app_ices.c Wed May 10 06:46:58 2006
@@ -207,14 +207,4 @@
return ast_register_application(app, ices_exec, synopsis, descrip);
}
-static const char *description(void)
-{
- return "Encode and Stream via icecast and ices";
-}
-
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, XXX);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Encode and Stream via icecast and ices");
Modified: team/group/new_loader_completion/apps/app_image.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_image.c?rev=26379&r1=26378&r2=26379&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_image.c (original)
+++ team/group/new_loader_completion/apps/app_image.c Wed May 10 06:46:58 2006
@@ -43,8 +43,6 @@
#include "asterisk/image.h"
#include "asterisk/app.h"
#include "asterisk/options.h"
-
-static char *tdesc = "Image Transmission Application";
static char *app = "SendImage";
@@ -127,14 +125,4 @@
return ast_register_application(app, sendimage_exec, synopsis, descrip);
}
-static const char *description(void)
-{
- return tdesc;
-}
-
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, XXX);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Image Transmission Application");
Modified: team/group/new_loader_completion/apps/app_lookupblacklist.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_lookupblacklist.c?rev=26379&r1=26378&r2=26379&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_lookupblacklist.c (original)
+++ team/group/new_loader_completion/apps/app_lookupblacklist.c Wed May 10 06:46:58 2006
@@ -46,8 +46,6 @@
#include "asterisk/callerid.h"
#include "asterisk/astdb.h"
#include "asterisk/options.h"
-
-static char *tdesc = "Look up Caller*ID name/number from blacklist database";
static char *app = "LookupBlacklist";
@@ -122,14 +120,4 @@
return ast_register_application (app, lookupblacklist_exec, synopsis,descrip);
}
-static const char *description(void)
-{
- return tdesc;
-}
-
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, XXX);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Look up Caller*ID name/number from blacklist database");
Modified: team/group/new_loader_completion/apps/app_lookupcidname.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_lookupcidname.c?rev=26379&r1=26378&r2=26379&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_lookupcidname.c (original)
+++ team/group/new_loader_completion/apps/app_lookupcidname.c Wed May 10 06:46:58 2006
@@ -45,8 +45,6 @@
#include "asterisk/callerid.h"
#include "asterisk/astdb.h"
-static char *tdesc = "Look up CallerID Name from local database";
-
static char *app = "LookupCIDName";
static char *synopsis = "Look up CallerID Name from local database";
@@ -60,23 +58,23 @@
"calls.\n";
-static int
-lookupcidname_exec (struct ast_channel *chan, void *data)
+static int lookupcidname_exec (struct ast_channel *chan, void *data)
{
- char dbname[64];
- struct ast_module_user *u;
+ char dbname[64];
+ struct ast_module_user *u;
- LOCAL_USER_ADD (u);
- if (chan->cid.cid_num) {
- if (!ast_db_get ("cidname", chan->cid.cid_num, dbname, sizeof (dbname))) {
- ast_set_callerid (chan, NULL, dbname, NULL);
- if (option_verbose > 2)
- ast_verbose (VERBOSE_PREFIX_3 "Changed Caller*ID name to %s\n",
- dbname);
+ u = ast_module_user_add(chan);
+ if (chan->cid.cid_num) {
+ if (!ast_db_get ("cidname", chan->cid.cid_num, dbname, sizeof (dbname))) {
+ ast_set_callerid (chan, NULL, dbname, NULL);
+ if (option_verbose > 2)
+ ast_verbose(VERBOSE_PREFIX_3 "Changed Caller*ID name to %s\n",
+ dbname);
+ }
}
- }
- LOCAL_USER_REMOVE (u);
- return 0;
+ ast_module_user_remove(u);
+
+ return 0;
}
static int unload_module(void)
@@ -95,14 +93,4 @@
return ast_register_application (app, lookupcidname_exec, synopsis, descrip);
}
-static const char *description(void)
-{
- return tdesc;
-}
-
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, XXX);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Look up CallerID Name from local database");
Modified: team/group/new_loader_completion/apps/app_macro.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_macro.c?rev=26379&r1=26378&r2=26379&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_macro.c (original)
+++ team/group/new_loader_completion/apps/app_macro.c Wed May 10 06:46:58 2006
@@ -49,8 +49,6 @@
/* special result value used to force macro exit */
#define MACRO_EXIT_RESULT 1024
-
-static char *tdesc = "Extension Macros";
static char *descrip =
" Macro(macroname|arg1|arg2...): Executes a macro using the context\n"
@@ -366,14 +364,4 @@
return res;
}
-static const char *description(void)
-{
- return tdesc;
-}
-
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, XXX);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Extension Macros");
Modified: team/group/new_loader_completion/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_meetme.c?rev=26379&r1=26378&r2=26379&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_meetme.c (original)
+++ team/group/new_loader_completion/apps/app_meetme.c Wed May 10 06:46:58 2006
@@ -2495,15 +2495,9 @@
return 0;
}
-static const char *description(void)
-{
- return "MeetMe conference bridge";
-}
-
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-STD_MOD(MOD_1, reload, NULL, NULL);
-
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "MeetMe conference bridge",
+ .load = load_module,
+ .unload = unload_module,
+ .reload = reload,
+ );
+
Modified: team/group/new_loader_completion/apps/app_milliwatt.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_milliwatt.c?rev=26379&r1=26378&r2=26379&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_milliwatt.c (original)
+++ team/group/new_loader_completion/apps/app_milliwatt.c Wed May 10 06:46:58 2006
@@ -153,14 +153,4 @@
return ast_register_application(app, milliwatt_exec, synopsis, descrip);
}
-static const char *description(void)
-{
- return "Digital Milliwatt (mu-law) Test Application";
-}
-
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, XXX);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Digital Milliwatt (mu-law) Test Application");
Modified: team/group/new_loader_completion/apps/app_mixmonitor.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_mixmonitor.c?rev=26379&r1=26378&r2=26379&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_mixmonitor.c (original)
+++ team/group/new_loader_completion/apps/app_mixmonitor.c Wed May 10 06:46:58 2006
@@ -478,14 +478,4 @@
return res;
}
-static const char *description(void)
-{
- return "Mixed Audio Monitoring Application";
-}
-
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, XXX);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Mixed Audio Monitoring Application");
Modified: team/group/new_loader_completion/apps/app_morsecode.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_morsecode.c?rev=26379&r1=26378&r2=26379&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_morsecode.c (original)
+++ team/group/new_loader_completion/apps/app_morsecode.c Wed May 10 06:46:58 2006
@@ -40,8 +40,6 @@
#include "asterisk/pbx.h"
#include "asterisk/module.h"
#include "asterisk/indications.h"
-
-static char *tdesc = "Morse code";
static char *app_morsecode = "Morsecode";
@@ -177,14 +175,4 @@
return ast_register_application(app_morsecode, morsecode_exec, morsecode_synopsis, morsecode_descrip);
}
-static const char *description(void)
-{
- return tdesc;
-}
-
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, XXX);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Morse code");
Modified: team/group/new_loader_completion/apps/app_mp3.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_mp3.c?rev=26379&r1=26378&r2=26379&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_mp3.c (original)
+++ team/group/new_loader_completion/apps/app_mp3.c Wed May 10 06:46:58 2006
@@ -49,8 +49,6 @@
#define LOCAL_MPG_123 "/usr/local/bin/mpg123"
#define MPG_123 "/usr/bin/mpg123"
-
-static char *tdesc = "Silly MP3 Application";
static char *app = "MP3Player";
@@ -244,14 +242,4 @@
return ast_register_application(app, mp3_exec, synopsis, descrip);
}
-static const char *description(void)
-{
- return tdesc;
-}
-
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, XXX);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Silly MP3 Application");
Modified: team/group/new_loader_completion/apps/app_nbscat.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_nbscat.c?rev=26379&r1=26378&r2=26379&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_nbscat.c (original)
+++ team/group/new_loader_completion/apps/app_nbscat.c Wed May 10 06:46:58 2006
@@ -54,8 +54,6 @@
#ifndef AF_LOCAL
#define AF_LOCAL AF_UNIX
#endif
-
-static char *tdesc = "Silly NBS Stream Application";
static char *app = "NBScat";
@@ -226,14 +224,4 @@
return ast_register_application(app, NBScat_exec, synopsis, descrip);
}
-static const char *description(void)
-{
- return tdesc;
-}
-
-static const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, XXX);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Silly NBS Stream Application");
Modified: team/group/new_loader_completion/apps/app_osplookup.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_osplookup.c?rev=26379&r1=26378&r2=26379&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_osplookup.c (original)
+++ team/group/new_loader_completion/apps/app_osplookup.c Wed May 10 06:46:58 2006
@@ -116,18 +116,18 @@
[... 1930 lines stripped ...]
More information about the asterisk-commits
mailing list