[asterisk-commits] branch group/new_loader_completion r29511 - in
/team/group/new_loader_complet...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Mon May 22 13:12:55 MST 2006
Author: kpfleming
Date: Mon May 22 15:12:54 2006
New Revision: 29511
URL: http://svn.digium.com/view/asterisk?rev=29511&view=rev
Log:
the beginnings of module flag support
Modified:
team/group/new_loader_completion/apps/app_amd.c
team/group/new_loader_completion/apps/app_meetme.c
team/group/new_loader_completion/apps/app_playback.c
team/group/new_loader_completion/apps/app_queue.c
team/group/new_loader_completion/apps/app_voicemail.c
team/group/new_loader_completion/cdr/cdr_csv.c
team/group/new_loader_completion/cdr/cdr_custom.c
team/group/new_loader_completion/cdr/cdr_manager.c
team/group/new_loader_completion/cdr/cdr_odbc.c
team/group/new_loader_completion/cdr/cdr_pgsql.c
team/group/new_loader_completion/cdr/cdr_tds.c
team/group/new_loader_completion/channels/chan_agent.c
team/group/new_loader_completion/channels/chan_h323.c
team/group/new_loader_completion/channels/chan_iax2.c
team/group/new_loader_completion/channels/chan_mgcp.c
team/group/new_loader_completion/channels/chan_misdn.c
team/group/new_loader_completion/channels/chan_sip.c
team/group/new_loader_completion/channels/chan_skinny.c
team/group/new_loader_completion/channels/chan_zap.c
team/group/new_loader_completion/codecs/codec_adpcm.c
team/group/new_loader_completion/codecs/codec_alaw.c
team/group/new_loader_completion/codecs/codec_g726.c
team/group/new_loader_completion/codecs/codec_gsm.c
team/group/new_loader_completion/codecs/codec_lpc10.c
team/group/new_loader_completion/codecs/codec_speex.c
team/group/new_loader_completion/codecs/codec_ulaw.c
team/group/new_loader_completion/funcs/func_odbc.c
team/group/new_loader_completion/include/asterisk/module.h
team/group/new_loader_completion/loader.c
team/group/new_loader_completion/pbx/pbx_ael.c
team/group/new_loader_completion/pbx/pbx_config.c
team/group/new_loader_completion/pbx/pbx_dundi.c
team/group/new_loader_completion/res/res_adsi.c
team/group/new_loader_completion/res/res_config_odbc.c
team/group/new_loader_completion/res/res_config_pgsql.c
team/group/new_loader_completion/res/res_crypto.c
team/group/new_loader_completion/res/res_features.c
team/group/new_loader_completion/res/res_indications.c
team/group/new_loader_completion/res/res_monitor.c
team/group/new_loader_completion/res/res_musiconhold.c
team/group/new_loader_completion/res/res_odbc.c
team/group/new_loader_completion/res/res_osp.c
team/group/new_loader_completion/res/res_smdi.c
team/group/new_loader_completion/res/res_snmp.c
team/group/new_loader_completion/res/res_speech.c
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=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_amd.c (original)
+++ team/group/new_loader_completion/apps/app_amd.c Mon May 22 15:12:54 2006
@@ -402,7 +402,7 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "Answering Machine Detection Application",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Answering Machine Detection Application",
.load = load_module,
.unload = unload_module,
.reload = reload,
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=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_meetme.c (original)
+++ team/group/new_loader_completion/apps/app_meetme.c Mon May 22 15:12:54 2006
@@ -2438,7 +2438,7 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "MeetMe conference bridge",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "MeetMe conference bridge",
.load = load_module,
.unload = unload_module,
.reload = reload,
Modified: team/group/new_loader_completion/apps/app_playback.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_playback.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_playback.c (original)
+++ team/group/new_loader_completion/apps/app_playback.c Mon May 22 15:12:54 2006
@@ -476,7 +476,7 @@
return ast_register_application(app, playback_exec, synopsis, descrip);
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "Sound File Playback Application",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Sound File Playback Application",
.load = load_module,
.unload = unload_module,
.reload = reload,
Modified: team/group/new_loader_completion/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_queue.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_queue.c (original)
+++ team/group/new_loader_completion/apps/app_queue.c Mon May 22 15:12:54 2006
@@ -4168,7 +4168,7 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "True Call Queueing",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "True Call Queueing",
.load = load_module,
.unload = unload_module,
.reload = reload,
Modified: team/group/new_loader_completion/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_voicemail.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_voicemail.c (original)
+++ team/group/new_loader_completion/apps/app_voicemail.c Mon May 22 15:12:54 2006
@@ -7054,7 +7054,7 @@
return cmd;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "Comedian Mail (Voicemail System)",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Comedian Mail (Voicemail System)",
.load = load_module,
.unload = unload_module,
.reload = reload,
Modified: team/group/new_loader_completion/cdr/cdr_csv.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/cdr/cdr_csv.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/cdr/cdr_csv.c (original)
+++ team/group/new_loader_completion/cdr/cdr_csv.c Mon May 22 15:12:54 2006
@@ -339,7 +339,7 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "Comma Separated Values CDR Backend",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Comma Separated Values CDR Backend",
.load = load_module,
.unload = unload_module,
.reload = reload,
Modified: team/group/new_loader_completion/cdr/cdr_custom.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/cdr/cdr_custom.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/cdr/cdr_custom.c (original)
+++ team/group/new_loader_completion/cdr/cdr_custom.c Mon May 22 15:12:54 2006
@@ -162,7 +162,7 @@
return load_config(1);
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "Customizable Comma Separated Values CDR Backend",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Customizable Comma Separated Values CDR Backend",
.load = load_module,
.unload = unload_module,
.reload = reload,
Modified: team/group/new_loader_completion/cdr/cdr_manager.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/cdr/cdr_manager.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/cdr/cdr_manager.c (original)
+++ team/group/new_loader_completion/cdr/cdr_manager.c Mon May 22 15:12:54 2006
@@ -161,7 +161,7 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "Asterisk Manager Interface CDR Backend",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Asterisk Manager Interface CDR Backend",
.load = load_module,
.unload = unload_module,
.reload = reload,
Modified: team/group/new_loader_completion/cdr/cdr_odbc.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/cdr/cdr_odbc.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/cdr/cdr_odbc.c (original)
+++ team/group/new_loader_completion/cdr/cdr_odbc.c Mon May 22 15:12:54 2006
@@ -462,7 +462,7 @@
return odbc_load_module();
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "ODBC CDR Backend",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "ODBC CDR Backend",
.load = load_module,
.unload = unload_module,
.reload = reload,
Modified: team/group/new_loader_completion/cdr/cdr_pgsql.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/cdr/cdr_pgsql.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/cdr/cdr_pgsql.c (original)
+++ team/group/new_loader_completion/cdr/cdr_pgsql.c Mon May 22 15:12:54 2006
@@ -315,7 +315,7 @@
return my_load_module();
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "PostgreSQL CDR Backend",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "PostgreSQL CDR Backend",
.load = load_module,
.unload = unload_module,
.reload = reload,
Modified: team/group/new_loader_completion/cdr/cdr_tds.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/cdr/cdr_tds.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/cdr/cdr_tds.c (original)
+++ team/group/new_loader_completion/cdr/cdr_tds.c Mon May 22 15:12:54 2006
@@ -513,7 +513,7 @@
return tds_unload_module();
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "MSSQL CDR Backend",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "MSSQL CDR Backend",
.load = load_module,
.unload = unload_module,
.reload = reload,
Modified: team/group/new_loader_completion/channels/chan_agent.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/channels/chan_agent.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/channels/chan_agent.c (original)
+++ team/group/new_loader_completion/channels/chan_agent.c Mon May 22 15:12:54 2006
@@ -2608,7 +2608,7 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "Agent Proxy Channel",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Agent Proxy Channel",
.load = load_module,
.unload = unload_module,
.reload = reload,
Modified: team/group/new_loader_completion/channels/chan_h323.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/channels/chan_h323.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/channels/chan_h323.c (original)
+++ team/group/new_loader_completion/channels/chan_h323.c Mon May 22 15:12:54 2006
@@ -2447,7 +2447,7 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "The NuFone Network's OpenH323 Channel Driver",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "The NuFone Network's OpenH323 Channel Driver",
.load = load_module,
.unload = unload_module,
.reload = reload,
Modified: team/group/new_loader_completion/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/channels/chan_iax2.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/channels/chan_iax2.c (original)
+++ team/group/new_loader_completion/channels/chan_iax2.c Mon May 22 15:12:54 2006
@@ -9832,7 +9832,7 @@
return res;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "Inter Asterisk eXchange (Ver 2)",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Inter Asterisk eXchange (Ver 2)",
.load = load_module,
.unload = unload_module,
.reload = reload,
Modified: team/group/new_loader_completion/channels/chan_mgcp.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/channels/chan_mgcp.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/channels/chan_mgcp.c (original)
+++ team/group/new_loader_completion/channels/chan_mgcp.c Mon May 22 15:12:54 2006
@@ -4442,7 +4442,7 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "Media Gateway Control Protocol (MGCP)",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Media Gateway Control Protocol (MGCP)",
.load = load_module,
.unload = unload_module,
.reload = reload,
Modified: team/group/new_loader_completion/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/channels/chan_misdn.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/channels/chan_misdn.c (original)
+++ team/group/new_loader_completion/channels/chan_misdn.c Mon May 22 15:12:54 2006
@@ -4472,7 +4472,7 @@
}
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "Channel driver for mISDN Support (Bri/Pri)",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Channel driver for mISDN Support (Bri/Pri)",
.load = load_module,
.unload = unload_module,
.reload = reload,
Modified: team/group/new_loader_completion/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/channels/chan_sip.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/channels/chan_sip.c (original)
+++ team/group/new_loader_completion/channels/chan_sip.c Mon May 22 15:12:54 2006
@@ -14270,7 +14270,7 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "Session Initiation Protocol (SIP)",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Session Initiation Protocol (SIP)",
.load = load_module,
.unload = unload_module,
.reload = reload,
Modified: team/group/new_loader_completion/channels/chan_skinny.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/channels/chan_skinny.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/channels/chan_skinny.c (original)
+++ team/group/new_loader_completion/channels/chan_skinny.c Mon May 22 15:12:54 2006
@@ -3348,7 +3348,7 @@
return -1;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "Skinny Client Control Protocol (Skinny)",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Skinny Client Control Protocol (Skinny)",
.load = load_module,
.unload = unload_module,
.reload = reload,
Modified: team/group/new_loader_completion/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/channels/chan_zap.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/channels/chan_zap.c (original)
+++ team/group/new_loader_completion/channels/chan_zap.c Mon May 22 15:12:54 2006
@@ -11194,7 +11194,7 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT,
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT,
"Zapata Telephony"
#ifdef ZAPATA_PRI
" w/PRI"
Modified: team/group/new_loader_completion/codecs/codec_adpcm.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/codecs/codec_adpcm.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/codecs/codec_adpcm.c (original)
+++ team/group/new_loader_completion/codecs/codec_adpcm.c Mon May 22 15:12:54 2006
@@ -398,7 +398,7 @@
return res;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "Adaptive Differential PCM Coder/Decoder",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Adaptive Differential PCM Coder/Decoder",
.load = load_module,
.unload = unload_module,
.reload = reload,
Modified: team/group/new_loader_completion/codecs/codec_alaw.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/codecs/codec_alaw.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/codecs/codec_alaw.c (original)
+++ team/group/new_loader_completion/codecs/codec_alaw.c Mon May 22 15:12:54 2006
@@ -182,7 +182,7 @@
return res;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "A-law Coder/Decoder",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "A-law Coder/Decoder",
.load = load_module,
.unload = unload_module,
.reload = reload,
Modified: team/group/new_loader_completion/codecs/codec_g726.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/codecs/codec_g726.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/codecs/codec_g726.c (original)
+++ team/group/new_loader_completion/codecs/codec_g726.c Mon May 22 15:12:54 2006
@@ -849,7 +849,7 @@
return res;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "ITU G.726-32kbps G726 Transcoder",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "ITU G.726-32kbps G726 Transcoder",
.load = load_module,
.unload = unload_module,
.reload = reload,
Modified: team/group/new_loader_completion/codecs/codec_gsm.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/codecs/codec_gsm.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/codecs/codec_gsm.c (original)
+++ team/group/new_loader_completion/codecs/codec_gsm.c Mon May 22 15:12:54 2006
@@ -279,7 +279,7 @@
return res;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "GSM Coder/Decoder",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "GSM Coder/Decoder",
.load = load_module,
.unload = unload_module,
.reload = reload,
Modified: team/group/new_loader_completion/codecs/codec_lpc10.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/codecs/codec_lpc10.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/codecs/codec_lpc10.c (original)
+++ team/group/new_loader_completion/codecs/codec_lpc10.c Mon May 22 15:12:54 2006
@@ -317,7 +317,7 @@
return res;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "LPC10 2.4kbps Coder/Decoder",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "LPC10 2.4kbps Coder/Decoder",
.load = load_module,
.unload = unload_module,
.reload = reload,
Modified: team/group/new_loader_completion/codecs/codec_speex.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/codecs/codec_speex.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/codecs/codec_speex.c (original)
+++ team/group/new_loader_completion/codecs/codec_speex.c Mon May 22 15:12:54 2006
@@ -509,7 +509,7 @@
return res;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "Speex Coder/Decoder",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Speex Coder/Decoder",
.load = load_module,
.unload = unload_module,
.reload = reload,
Modified: team/group/new_loader_completion/codecs/codec_ulaw.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/codecs/codec_ulaw.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/codecs/codec_ulaw.c (original)
+++ team/group/new_loader_completion/codecs/codec_ulaw.c Mon May 22 15:12:54 2006
@@ -194,7 +194,7 @@
return res;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "mu-Law Coder/Decoder",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "mu-Law Coder/Decoder",
.load = load_module,
.unload = unload_module,
.reload = reload,
Modified: team/group/new_loader_completion/funcs/func_odbc.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/funcs/func_odbc.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/funcs/func_odbc.c (original)
+++ team/group/new_loader_completion/funcs/func_odbc.c Mon May 22 15:12:54 2006
@@ -636,7 +636,7 @@
/* XXX need to revise usecount - set if query_lock is set */
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "ODBC lookups",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "ODBC lookups",
.load = load_module,
.unload = unload_module,
.reload = reload,
Modified: team/group/new_loader_completion/include/asterisk/module.h
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/include/asterisk/module.h?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/include/asterisk/module.h (original)
+++ team/group/new_loader_completion/include/asterisk/module.h Mon May 22 15:12:54 2006
@@ -272,10 +272,8 @@
#define METHOD_BASE(_base, _name) . ## _name = _base ## _name
enum ast_module_flags {
- AST_MODULE_DEFAULT = 0,
- AST_MODULE_TRACK_USECOUNT = (1 << 0),
- AST_MODULE_TRACK_USERS = (1 << 1),
- AST_MODULE_UNLOAD_FORCE_ONLY = (1 << 2),
+ AST_MODFLAG_DEFAULT = 0,
+ AST_MODFLAG_GLOBAL_SYMBOLS = (1 << 0),
};
/* The 'self' pointer for a module; it will be set by the loader before
@@ -345,7 +343,7 @@
const static __attribute__((unused)) struct ast_module_info *ast_module_info = &__mod_info
#define AST_MODULE_INFO_STANDARD(keystr, desc) \
- AST_MODULE_INFO(keystr, AST_MODULE_DEFAULT, desc, \
+ AST_MODULE_INFO(keystr, AST_MODFLAG_DEFAULT, desc, \
load_module, \
unload_module, \
NULL \
@@ -375,7 +373,7 @@
const static struct ast_module_info *ast_module_info = &__mod_info
#define AST_MODULE_INFO_STANDARD(keystr, desc) \
- AST_MODULE_INFO(keystr, AST_MODULE_DEFAULT, desc, \
+ AST_MODULE_INFO(keystr, AST_MODFLAG_DEFAULT, desc, \
.load = load_module, \
.unload = unload_module, \
)
Modified: team/group/new_loader_completion/loader.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/loader.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/loader.c (original)
+++ team/group/new_loader_completion/loader.c Mon May 22 15:12:54 2006
@@ -268,7 +268,7 @@
if (strcasecmp(cur->resource, resource_name)) /* not us */
continue;
- if (cur->usecount > 0 || ast_test_flag(&cur->mod->flags, AST_MODULE_UNLOAD_FORCE_ONLY)) {
+ if (cur->usecount > 0) {
if (force)
ast_log(LOG_WARNING, "Warning: Forcing removal of module %s with use count %d\n",
resource_name, cur->usecount);
Modified: team/group/new_loader_completion/pbx/pbx_ael.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/pbx/pbx_ael.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/pbx/pbx_ael.c (original)
+++ team/group/new_loader_completion/pbx/pbx_ael.c Mon May 22 15:12:54 2006
@@ -3532,7 +3532,7 @@
return pbx_load_module();
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "Asterisk Extension Language Compiler",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Asterisk Extension Language Compiler",
.load = load_module,
.unload = unload_module,
.reload = reload,
Modified: team/group/new_loader_completion/pbx/pbx_config.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/pbx/pbx_config.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/pbx/pbx_config.c (original)
+++ team/group/new_loader_completion/pbx/pbx_config.c Mon May 22 15:12:54 2006
@@ -1538,7 +1538,7 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "Text Extension Configuration",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Text Extension Configuration",
.load = load_module,
.unload = unload_module,
.reload = reload,
Modified: team/group/new_loader_completion/pbx/pbx_dundi.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/pbx/pbx_dundi.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/pbx/pbx_dundi.c (original)
+++ team/group/new_loader_completion/pbx/pbx_dundi.c Mon May 22 15:12:54 2006
@@ -4544,7 +4544,7 @@
return res;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "Distributed Universal Number Discovery (DUNDi)",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Distributed Universal Number Discovery (DUNDi)",
.load = load_module,
.unload = unload_module,
.reload = reload,
Modified: team/group/new_loader_completion/res/res_adsi.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/res/res_adsi.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/res/res_adsi.c (original)
+++ team/group/new_loader_completion/res/res_adsi.c Mon May 22 15:12:54 2006
@@ -1118,7 +1118,7 @@
return -1;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "ADSI Resource",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "ADSI Resource",
.load = load_module,
.unload = unload_module,
.reload = reload,
Modified: team/group/new_loader_completion/res/res_config_odbc.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/res/res_config_odbc.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/res/res_config_odbc.c (original)
+++ team/group/new_loader_completion/res/res_config_odbc.c Mon May 22 15:12:54 2006
@@ -589,4 +589,7 @@
return 0;
}
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "ODBC Configuration");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "ODBC Configuration",
+ .load = load_module,
+ .unload = unload_module,
+ );
Modified: team/group/new_loader_completion/res/res_config_pgsql.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/res/res_config_pgsql.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/res/res_config_pgsql.c (original)
+++ team/group/new_loader_completion/res/res_config_pgsql.c Mon May 22 15:12:54 2006
@@ -692,13 +692,6 @@
return 1;
}
-
-/* needs usecount semantics defined */
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "Postgresql RealTime Configuration Driver",
- .load = load_module,
- .unload = unload_module,
- .reload = reload
- );
static int pgsql_reconnect(const char *database)
{
@@ -790,3 +783,10 @@
return RESULT_FAILURE;
}
}
+
+/* needs usecount semantics defined */
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "PostgreSQL RealTime Configuration Driver",
+ .load = load_module,
+ .unload = unload_module,
+ .reload = reload
+ );
Modified: team/group/new_loader_completion/res/res_crypto.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/res/res_crypto.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/res/res_crypto.c (original)
+++ team/group/new_loader_completion/res/res_crypto.c Mon May 22 15:12:54 2006
@@ -608,7 +608,7 @@
}
/* needs usecount semantics defined */
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "Cryptographic Digital Signatures",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Cryptographic Digital Signatures",
.load = load_module,
.unload = unload_module,
.reload = reload
Modified: team/group/new_loader_completion/res/res_features.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/res/res_features.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/res/res_features.c (original)
+++ team/group/new_loader_completion/res/res_features.c Mon May 22 15:12:54 2006
@@ -2182,7 +2182,7 @@
return ast_unregister_application(parkedcall);
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "Call Features Resource",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Call Features Resource",
.load = load_module,
.unload = unload_module,
.reload = reload,
Modified: team/group/new_loader_completion/res/res_indications.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/res/res_indications.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/res/res_indications.c (original)
+++ team/group/new_loader_completion/res/res_indications.c Mon May 22 15:12:54 2006
@@ -400,7 +400,7 @@
return ind_load_module();
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "Indications Resource",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Indications Resource",
.load = load_module,
.unload = unload_module,
.reload = reload,
Modified: team/group/new_loader_completion/res/res_monitor.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/res/res_monitor.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/res/res_monitor.c (original)
+++ team/group/new_loader_completion/res/res_monitor.c Mon May 22 15:12:54 2006
@@ -665,4 +665,7 @@
}
/* usecount semantics need to be defined */
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Call Monitoring Resource");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Call Monitoring Resource",
+ .load = load_module,
+ .unload = unload_module,
+ );
Modified: team/group/new_loader_completion/res/res_musiconhold.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/res/res_musiconhold.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/res/res_musiconhold.c (original)
+++ team/group/new_loader_completion/res/res_musiconhold.c Mon May 22 15:12:54 2006
@@ -1208,7 +1208,7 @@
return -1;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "Music On Hold Resource",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Music On Hold Resource",
.load = load_module,
.unload = unload_module,
.reload = reload,
Modified: team/group/new_loader_completion/res/res_odbc.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/res/res_odbc.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/res/res_odbc.c (original)
+++ team/group/new_loader_completion/res/res_odbc.c Mon May 22 15:12:54 2006
@@ -670,7 +670,7 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "ODBC Resource",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "ODBC Resource",
.load = load_module,
.unload = unload_module,
.reload = reload,
Modified: team/group/new_loader_completion/res/res_osp.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/res/res_osp.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/res/res_osp.c (original)
+++ team/group/new_loader_completion/res/res_osp.c Mon May 22 15:12:54 2006
@@ -1091,10 +1091,8 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "Open Settlement Protocol Resource",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Open Settlement Protocol Resource",
.load = load_module,
.unload = unload_module,
.reload = reload,
);
-
-
Modified: team/group/new_loader_completion/res/res_smdi.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/res/res_smdi.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/res/res_smdi.c (original)
+++ team/group/new_loader_completion/res/res_smdi.c Mon May 22 15:12:54 2006
@@ -748,7 +748,7 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODULE_DEFAULT, "Simplified Message Desk Interface (SMDI) Resource",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Simplified Message Desk Interface (SMDI) Resource",
.load = load_module,
.unload = unload_module,
.reload = reload,
Modified: team/group/new_loader_completion/res/res_snmp.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/res/res_snmp.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/res/res_snmp.c (original)
+++ team/group/new_loader_completion/res/res_snmp.c Mon May 22 15:12:54 2006
@@ -127,27 +127,4 @@
return 0;
}
-int usecount(void)
-{
- return 0;
-}
-
-const char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-
-const char *description(void)
-{
- return MODULE_DESCRIPTION;
-}
-
-/*
- * Local Variables:
- * c-file-style: gnu
- * c-basic-offset: 4
- * c-file-offsets: ((case-label . 0))
- * tab-width: 4
- * indent-tabs-mode: t
- * End:
- */
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, MODULE_DESCRIPTION);
Modified: team/group/new_loader_completion/res/res_speech.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/res/res_speech.c?rev=29511&r1=29510&r2=29511&view=diff
==============================================================================
--- team/group/new_loader_completion/res/res_speech.c (original)
+++ team/group/new_loader_completion/res/res_speech.c Mon May 22 15:12:54 2006
@@ -352,4 +352,7 @@
return res;
}
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Generic Speech Recognition API");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Generic Speech Recognition API",
+ .load = load_module,
+ .unload = unload_module,
+ );
More information about the asterisk-commits
mailing list