[asterisk-commits] qwell: trunk r86820 - in /trunk: apps/ channels/ codecs/ funcs/ include/aster...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Mon Oct 22 15:05:19 CDT 2007


Author: qwell
Date: Mon Oct 22 15:05:18 2007
New Revision: 86820

URL: http://svn.digium.com/view/asterisk?view=rev&rev=86820
Log:
Switch from AST_CLI (formerly NEW_CLI) to AST_CLI_DEFINE, since the former didn't make much sense

Modified:
    trunk/apps/app_meetme.c
    trunk/apps/app_minivm.c
    trunk/apps/app_mixmonitor.c
    trunk/apps/app_osplookup.c
    trunk/apps/app_playback.c
    trunk/apps/app_queue.c
    trunk/apps/app_rpt.c
    trunk/apps/app_voicemail.c
    trunk/channels/chan_agent.c
    trunk/channels/chan_alsa.c
    trunk/channels/chan_features.c
    trunk/channels/chan_gtalk.c
    trunk/channels/chan_h323.c
    trunk/channels/chan_iax2.c
    trunk/channels/chan_jingle.c
    trunk/channels/chan_local.c
    trunk/channels/chan_mgcp.c
    trunk/channels/chan_misdn.c
    trunk/channels/chan_oss.c
    trunk/channels/chan_sip.c
    trunk/channels/chan_skinny.c
    trunk/channels/chan_usbradio.c
    trunk/channels/chan_zap.c
    trunk/channels/iax2-provision.c
    trunk/codecs/codec_zap.c
    trunk/funcs/func_devstate.c
    trunk/include/asterisk/cli.h
    trunk/main/asterisk.c
    trunk/main/astmm.c
    trunk/main/astobj2.c
    trunk/main/cdr.c
    trunk/main/channel.c
    trunk/main/cli.c
    trunk/main/config.c
    trunk/main/db.c
    trunk/main/dnsmgr.c
    trunk/main/file.c
    trunk/main/frame.c
    trunk/main/http.c
    trunk/main/image.c
    trunk/main/logger.c
    trunk/main/manager.c
    trunk/main/pbx.c
    trunk/main/rtp.c
    trunk/main/threadstorage.c
    trunk/main/translate.c
    trunk/main/udptl.c
    trunk/main/utils.c
    trunk/pbx/pbx_ael.c
    trunk/pbx/pbx_config.c
    trunk/pbx/pbx_dundi.c
    trunk/res/res_agi.c
    trunk/res/res_clioriginate.c
    trunk/res/res_config_pgsql.c
    trunk/res/res_config_sqlite.c
    trunk/res/res_convert.c
    trunk/res/res_crypto.c
    trunk/res/res_features.c
    trunk/res/res_indications.c
    trunk/res/res_jabber.c
    trunk/res/res_limit.c
    trunk/res/res_musiconhold.c
    trunk/res/res_odbc.c
    trunk/res/res_realtime.c

Modified: trunk/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_meetme.c?view=diff&rev=86820&r1=86819&r2=86820
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Mon Oct 22 15:05:18 2007
@@ -1244,9 +1244,9 @@
 }
 
 static struct ast_cli_entry cli_meetme[] = {
-	AST_CLI(meetme_cmd, "Execute a command on a conference or conferee"),
-	AST_CLI(sla_show_trunks, "Show SLA Trunks"),
-	AST_CLI(sla_show_stations, "Show SLA Stations"),
+	AST_CLI_DEFINE(meetme_cmd, "Execute a command on a conference or conferee"),
+	AST_CLI_DEFINE(sla_show_trunks, "Show SLA Trunks"),
+	AST_CLI_DEFINE(sla_show_stations, "Show SLA Stations"),
 };
 
 static void conf_flush(int fd, struct ast_channel *chan)

Modified: trunk/apps/app_minivm.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_minivm.c?view=diff&rev=86820&r1=86819&r2=86820
==============================================================================
--- trunk/apps/app_minivm.c (original)
+++ trunk/apps/app_minivm.c Mon Oct 22 15:05:18 2007
@@ -2991,12 +2991,12 @@
 
 /*! \brief CLI commands for Mini-voicemail */
 static struct ast_cli_entry cli_minivm[] = {
-	AST_CLI(handle_minivm_show_users, "List defined mini-voicemail boxes"),
-	AST_CLI(handle_minivm_show_zones, "List zone message formats"),
-	AST_CLI(handle_minivm_list_templates, "List message templates"),	
-	AST_CLI(handle_minivm_reload, "Reload Mini-voicemail configuration"),
-	AST_CLI(handle_minivm_show_stats, "Show some mini-voicemail statistics"),
-	AST_CLI(handle_minivm_show_settings, "Show mini-voicemail general settings"),
+	AST_CLI_DEFINE(handle_minivm_show_users, "List defined mini-voicemail boxes"),
+	AST_CLI_DEFINE(handle_minivm_show_zones, "List zone message formats"),
+	AST_CLI_DEFINE(handle_minivm_list_templates, "List message templates"),	
+	AST_CLI_DEFINE(handle_minivm_reload, "Reload Mini-voicemail configuration"),
+	AST_CLI_DEFINE(handle_minivm_show_stats, "Show some mini-voicemail statistics"),
+	AST_CLI_DEFINE(handle_minivm_show_settings, "Show mini-voicemail general settings"),
 };
 
 static struct ast_custom_function minivm_counter_function = {

Modified: trunk/apps/app_mixmonitor.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_mixmonitor.c?view=diff&rev=86820&r1=86819&r2=86820
==============================================================================
--- trunk/apps/app_mixmonitor.c (original)
+++ trunk/apps/app_mixmonitor.c Mon Oct 22 15:05:18 2007
@@ -399,7 +399,7 @@
 }
 
 static struct ast_cli_entry cli_mixmonitor[] = {
-	AST_CLI(handle_cli_mixmonitor, "Execute a MixMonitor command")
+	AST_CLI_DEFINE(handle_cli_mixmonitor, "Execute a MixMonitor command")
 };
 
 static int unload_module(void)

Modified: trunk/apps/app_osplookup.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_osplookup.c?view=diff&rev=86820&r1=86819&r2=86820
==============================================================================
--- trunk/apps/app_osplookup.c (original)
+++ trunk/apps/app_osplookup.c Mon Oct 22 15:05:18 2007
@@ -2000,7 +2000,7 @@
 "		SUCCESS | FAILED | ERROR \n";
 
 static struct ast_cli_entry cli_osp[] = {
-	AST_CLI(handle_cli_osp_show, "Displays OSF information")
+	AST_CLI_DEFINE(handle_cli_osp_show, "Displays OSF information")
 };
 
 static int load_module(void)

Modified: trunk/apps/app_playback.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_playback.c?view=diff&rev=86820&r1=86819&r2=86820
==============================================================================
--- trunk/apps/app_playback.c (original)
+++ trunk/apps/app_playback.c Mon Oct 22 15:05:18 2007
@@ -395,9 +395,9 @@
 }
 
 static struct ast_cli_entry cli_playback[] = {
-	AST_CLI(__say_cli_init, "Set or show the say mode"),
-	AST_CLI(__say_cli_init, "Set the say mode"),
-	AST_CLI(__say_cli_init, "Set the say mode"),
+	AST_CLI_DEFINE(__say_cli_init, "Set or show the say mode"),
+	AST_CLI_DEFINE(__say_cli_init, "Set the say mode"),
+	AST_CLI_DEFINE(__say_cli_init, "Set the say mode"),
 };
 
 static int playback_exec(struct ast_channel *chan, void *data)

Modified: trunk/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_queue.c?view=diff&rev=86820&r1=86819&r2=86820
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Mon Oct 22 15:05:18 2007
@@ -5004,10 +5004,10 @@
 "Usage: queue unpause member <channel> in <queue> reason <reason>\n";
 
 static struct ast_cli_entry cli_queue[] = {
-	AST_CLI(queue_show, "Show status of a specified queue"),
-	AST_CLI(handle_queue_add_member, "Add a channel to a specified queue"),
-	AST_CLI(handle_queue_remove_member, "Removes a channel from a specified queue"),
-	AST_CLI(handle_queue_pause_member, "Pause or unpause a queue member"),
+	AST_CLI_DEFINE(queue_show, "Show status of a specified queue"),
+	AST_CLI_DEFINE(handle_queue_add_member, "Add a channel to a specified queue"),
+	AST_CLI_DEFINE(handle_queue_remove_member, "Removes a channel from a specified queue"),
+	AST_CLI_DEFINE(handle_queue_pause_member, "Pause or unpause a queue member"),
 };
 
 static int unload_module(void)

Modified: trunk/apps/app_rpt.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_rpt.c?view=diff&rev=86820&r1=86819&r2=86820
==============================================================================
--- trunk/apps/app_rpt.c (original)
+++ trunk/apps/app_rpt.c Mon Oct 22 15:05:18 2007
@@ -706,12 +706,12 @@
 static char *handle_cli_rpt_restart(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a);
 
 static struct ast_cli_entry cli_rpt[] = {
-	AST_CLI(handle_cli_rpt_debug_level, "Enable app_rpt debuggin"),
-	AST_CLI(handle_cli_rpt_dump,        "Dump app_rpt structs for debugging"),
-	AST_CLI(handle_cli_rpt_stats,       "Dump node statistics"),
-	AST_CLI(handle_cli_rpt_lstats,      "Dump link statistics"),
-	AST_CLI(handle_cli_rpt_reload,      "Reload app_rpt config"),
-	AST_CLI(handle_cli_rpt_restart,     "Restart app_rpt")
+	AST_CLI_DEFINE(handle_cli_rpt_debug_level, "Enable app_rpt debuggin"),
+	AST_CLI_DEFINE(handle_cli_rpt_dump,        "Dump app_rpt structs for debugging"),
+	AST_CLI_DEFINE(handle_cli_rpt_stats,       "Dump node statistics"),
+	AST_CLI_DEFINE(handle_cli_rpt_lstats,      "Dump link statistics"),
+	AST_CLI_DEFINE(handle_cli_rpt_reload,      "Reload app_rpt config"),
+	AST_CLI_DEFINE(handle_cli_rpt_restart,     "Restart app_rpt")
 };
 
 /*

Modified: trunk/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=86820&r1=86819&r2=86820
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Mon Oct 22 15:05:18 2007
@@ -7735,8 +7735,8 @@
 }
 
 static struct ast_cli_entry cli_voicemail[] = {
-	AST_CLI(handle_voicemail_show_users, "List defined voicemail boxes"),
-	AST_CLI(handle_voicemail_show_zones, "List zone message formats"),
+	AST_CLI_DEFINE(handle_voicemail_show_users, "List defined voicemail boxes"),
+	AST_CLI_DEFINE(handle_voicemail_show_zones, "List zone message formats"),
 };
 
 static void poll_subscribed_mailboxes(void)

Modified: trunk/channels/chan_agent.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_agent.c?view=diff&rev=86820&r1=86819&r2=86820
==============================================================================
--- trunk/channels/chan_agent.c (original)
+++ trunk/channels/chan_agent.c Mon Oct 22 15:05:18 2007
@@ -1765,9 +1765,9 @@
 "       If 'soft' is specified, do not hangup existing calls.\n";
 
 static struct ast_cli_entry cli_agents[] = {
-	AST_CLI(agents_show, "Show status of agents"),
-	AST_CLI(agents_show_online, "Show all online agents"),
-	AST_CLI(agent_logoff_cmd, "Sets an agent offline"),
+	AST_CLI_DEFINE(agents_show, "Show status of agents"),
+	AST_CLI_DEFINE(agents_show_online, "Show all online agents"),
+	AST_CLI_DEFINE(agent_logoff_cmd, "Sets an agent offline"),
 };
 
 /*!

Modified: trunk/channels/chan_alsa.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_alsa.c?view=diff&rev=86820&r1=86819&r2=86820
==============================================================================
--- trunk/channels/chan_alsa.c (original)
+++ trunk/channels/chan_alsa.c Mon Oct 22 15:05:18 2007
@@ -1096,11 +1096,11 @@
 }
 
 static struct ast_cli_entry cli_alsa[] = {
-	AST_CLI(console_answer, "Answer an incoming console call"),
-	AST_CLI(console_hangup, "Hangup a call on the console"),
-	AST_CLI(console_dial, "Dial an extension on the console"),
-	AST_CLI(console_sendtext, "Send text to the remote device"),
-	AST_CLI(console_autoanswer, "Sets/displays autoanswer"),
+	AST_CLI_DEFINE(console_answer, "Answer an incoming console call"),
+	AST_CLI_DEFINE(console_hangup, "Hangup a call on the console"),
+	AST_CLI_DEFINE(console_dial, "Dial an extension on the console"),
+	AST_CLI_DEFINE(console_sendtext, "Send text to the remote device"),
+	AST_CLI_DEFINE(console_autoanswer, "Sets/displays autoanswer"),
 };
 
 static int load_module(void)

Modified: trunk/channels/chan_features.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_features.c?view=diff&rev=86820&r1=86819&r2=86820
==============================================================================
--- trunk/channels/chan_features.c (original)
+++ trunk/channels/chan_features.c Mon Oct 22 15:05:18 2007
@@ -543,7 +543,7 @@
 }
 
 static struct ast_cli_entry cli_features[] = {
-	AST_CLI(features_show, "List status of feature channels"),
+	AST_CLI_DEFINE(features_show, "List status of feature channels"),
 };
 
 static int load_module(void)

Modified: trunk/channels/chan_gtalk.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_gtalk.c?view=diff&rev=86820&r1=86819&r2=86820
==============================================================================
--- trunk/channels/chan_gtalk.c (original)
+++ trunk/channels/chan_gtalk.c Mon Oct 22 15:05:18 2007
@@ -235,8 +235,8 @@
 };
 
 static struct ast_cli_entry gtalk_cli[] = {
-	AST_CLI(gtalk_do_reload, "Reload GoogleTalk configuration"),
-	AST_CLI(gtalk_show_channels, "Show GoogleTalk channels"),
+	AST_CLI_DEFINE(gtalk_do_reload, "Reload GoogleTalk configuration"),
+	AST_CLI_DEFINE(gtalk_show_channels, "Show GoogleTalk channels"),
 };
 
 static char externip[16];

Modified: trunk/channels/chan_h323.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_h323.c?view=diff&rev=86820&r1=86819&r2=86820
==============================================================================
--- trunk/channels/chan_h323.c (original)
+++ trunk/channels/chan_h323.c Mon Oct 22 15:05:18 2007
@@ -2744,11 +2744,11 @@
 }
 
 static struct ast_cli_entry cli_h323[] = {
-	AST_CLI(handle_cli_h323_set_trace,   "Enable/Disable H.323 Stack Tracing"),
-	AST_CLI(handle_cli_h323_set_debug,   "Enable/Disable H.323 Debugging"),
-	AST_CLI(handle_cli_h323_cycle_gk,    "Manually re-register with the Gatekeper"),
-	AST_CLI(handle_cli_h323_hangup,      "Manually try to hang up a call"),
-	AST_CLI(handle_cli_h323_show_tokens, "Show all active call tokens"),
+	AST_CLI_DEFINE(handle_cli_h323_set_trace,   "Enable/Disable H.323 Stack Tracing"),
+	AST_CLI_DEFINE(handle_cli_h323_set_debug,   "Enable/Disable H.323 Debugging"),
+	AST_CLI_DEFINE(handle_cli_h323_cycle_gk,    "Manually re-register with the Gatekeper"),
+	AST_CLI_DEFINE(handle_cli_h323_hangup,      "Manually try to hang up a call"),
+	AST_CLI_DEFINE(handle_cli_h323_show_tokens, "Show all active call tokens"),
 };
 
 static int reload_config(int is_reload)
@@ -3078,7 +3078,7 @@
 }
 
 static struct ast_cli_entry cli_h323_reload =
-	AST_CLI(handle_cli_h323_reload, "Reload H.323 configuration");
+	AST_CLI_DEFINE(handle_cli_h323_reload, "Reload H.323 configuration");
 
 static enum ast_rtp_get_result oh323_get_rtp_peer(struct ast_channel *chan, struct ast_rtp **rtp)
 {

Modified: trunk/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_iax2.c?view=diff&rev=86820&r1=86819&r2=86820
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Mon Oct 22 15:05:18 2007
@@ -11305,32 +11305,32 @@
 */
 
 static struct ast_cli_entry cli_iax2[] = {
-	AST_CLI(handle_cli_iax2_provision,           "Provision an IAX device"),
-	AST_CLI(handle_cli_iax2_prune_realtime,      "Prune a cached realtime lookup"),
-	AST_CLI(handle_cli_iax2_reload,              "Reload IAX configuration"),
-	AST_CLI(handle_cli_iax2_set_mtu,             "Set the IAX systemwide trunking MTU"),
-	AST_CLI(handle_cli_iax2_set_debug,           "Enable IAX debugging"),
-	AST_CLI(handle_cli_iax2_set_debug_trunk,     "Enable IAX trunk debugging"),
-	AST_CLI(handle_cli_iax2_set_debug_jb,        "Enable IAX jitterbuffer debugging"),
-	AST_CLI(handle_cli_iax2_set_debug_off,       "Disable IAX debugging"),
-	AST_CLI(handle_cli_iax2_set_debug_trunk_off, "Disable IAX trunk debugging"),
-	AST_CLI(handle_cli_iax2_set_debug_jb_off,    "Disable IAX jitterbuffer debugging"),
-	AST_CLI(handle_cli_iax2_show_cache,          "Display IAX cached dialplan"),
-	AST_CLI(handle_cli_iax2_show_channels,       "List active IAX channels"),
-	AST_CLI(handle_cli_iax2_show_firmware,       "List available IAX firmware"),
-	AST_CLI(handle_cli_iax2_show_netstats,       "List active IAX channel netstats"),
-	AST_CLI(handle_cli_iax2_show_peer,           "Show details on specific IAX peer"),
-	AST_CLI(handle_cli_iax2_show_peers,          "List defined IAX peers"),
-	AST_CLI(handle_cli_iax2_show_registry,       "Display IAX registration status"),
-	AST_CLI(handle_cli_iax2_show_stats,          "Display IAX statistics"),
-	AST_CLI(handle_cli_iax2_show_threads,        "Display IAX helper thread info"),
-	AST_CLI(handle_cli_iax2_show_users,          "List defined IAX users"),
-	AST_CLI(handle_cli_iax2_test_losspct,        "Set IAX2 incoming frame loss percentage"),
-	AST_CLI(handle_cli_iax2_unregister,          "Unregister (force expiration) an IAX2 peer from the registry"),
+	AST_CLI_DEFINE(handle_cli_iax2_provision,           "Provision an IAX device"),
+	AST_CLI_DEFINE(handle_cli_iax2_prune_realtime,      "Prune a cached realtime lookup"),
+	AST_CLI_DEFINE(handle_cli_iax2_reload,              "Reload IAX configuration"),
+	AST_CLI_DEFINE(handle_cli_iax2_set_mtu,             "Set the IAX systemwide trunking MTU"),
+	AST_CLI_DEFINE(handle_cli_iax2_set_debug,           "Enable IAX debugging"),
+	AST_CLI_DEFINE(handle_cli_iax2_set_debug_trunk,     "Enable IAX trunk debugging"),
+	AST_CLI_DEFINE(handle_cli_iax2_set_debug_jb,        "Enable IAX jitterbuffer debugging"),
+	AST_CLI_DEFINE(handle_cli_iax2_set_debug_off,       "Disable IAX debugging"),
+	AST_CLI_DEFINE(handle_cli_iax2_set_debug_trunk_off, "Disable IAX trunk debugging"),
+	AST_CLI_DEFINE(handle_cli_iax2_set_debug_jb_off,    "Disable IAX jitterbuffer debugging"),
+	AST_CLI_DEFINE(handle_cli_iax2_show_cache,          "Display IAX cached dialplan"),
+	AST_CLI_DEFINE(handle_cli_iax2_show_channels,       "List active IAX channels"),
+	AST_CLI_DEFINE(handle_cli_iax2_show_firmware,       "List available IAX firmware"),
+	AST_CLI_DEFINE(handle_cli_iax2_show_netstats,       "List active IAX channel netstats"),
+	AST_CLI_DEFINE(handle_cli_iax2_show_peer,           "Show details on specific IAX peer"),
+	AST_CLI_DEFINE(handle_cli_iax2_show_peers,          "List defined IAX peers"),
+	AST_CLI_DEFINE(handle_cli_iax2_show_registry,       "Display IAX registration status"),
+	AST_CLI_DEFINE(handle_cli_iax2_show_stats,          "Display IAX statistics"),
+	AST_CLI_DEFINE(handle_cli_iax2_show_threads,        "Display IAX helper thread info"),
+	AST_CLI_DEFINE(handle_cli_iax2_show_users,          "List defined IAX users"),
+	AST_CLI_DEFINE(handle_cli_iax2_test_losspct,        "Set IAX2 incoming frame loss percentage"),
+	AST_CLI_DEFINE(handle_cli_iax2_unregister,          "Unregister (force expiration) an IAX2 peer from the registry"),
 #ifdef IAXTESTS
-	AST_CLI(handle_cli_iax2_test_jitter,         "Simulates jitter for testing"),
-	AST_CLI(handle_cli_iax2_test_late,           "Test the receipt of a late frame"),
-	AST_CLI(handle_cli_iax2_test_resync,         "Test a resync in received timestamps"),
+	AST_CLI_DEFINE(handle_cli_iax2_test_jitter,         "Simulates jitter for testing"),
+	AST_CLI_DEFINE(handle_cli_iax2_test_late,           "Test the receipt of a late frame"),
+	AST_CLI_DEFINE(handle_cli_iax2_test_resync,         "Test a resync in received timestamps"),
 #endif /* IAXTESTS */
 };
 

Modified: trunk/channels/chan_jingle.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_jingle.c?view=diff&rev=86820&r1=86819&r2=86820
==============================================================================
--- trunk/channels/chan_jingle.c (original)
+++ trunk/channels/chan_jingle.c Mon Oct 22 15:05:18 2007
@@ -236,8 +236,8 @@
 };
 
 static struct ast_cli_entry jingle_cli[] = {
-	AST_CLI(jingle_do_reload, "Reload Jingle configuration"),
-	AST_CLI(jingle_show_channels, "Show Jingle channels"),
+	AST_CLI_DEFINE(jingle_do_reload, "Reload Jingle configuration"),
+	AST_CLI_DEFINE(jingle_show_channels, "Show Jingle channels"),
 };
 
 

Modified: trunk/channels/chan_local.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_local.c?view=diff&rev=86820&r1=86819&r2=86820
==============================================================================
--- trunk/channels/chan_local.c (original)
+++ trunk/channels/chan_local.c Mon Oct 22 15:05:18 2007
@@ -723,7 +723,7 @@
 }
 
 static struct ast_cli_entry cli_local[] = {
-	AST_CLI(locals_show, "List status of local channels"),
+	AST_CLI_DEFINE(locals_show, "List status of local channels"),
 };
 
 /*! \brief Load module into PBX, register channel */

Modified: trunk/channels/chan_mgcp.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_mgcp.c?view=diff&rev=86820&r1=86819&r2=86820
==============================================================================
--- trunk/channels/chan_mgcp.c (original)
+++ trunk/channels/chan_mgcp.c Mon Oct 22 15:05:18 2007
@@ -1183,11 +1183,11 @@
 }
 
 static struct ast_cli_entry cli_mgcp[] = {
-	AST_CLI(handle_mgcp_audit_endpoint, "Audit specified MGCP endpoint"),
-	AST_CLI(handle_mgcp_show_endpoints, "List defined MGCP endpoints"),
-	AST_CLI(handle_mgcp_set_debug, "Enable MGCP debugging"),
-	AST_CLI(handle_mgcp_set_debug_off, "Disable MGCP debugging"),
-	AST_CLI(mgcp_reload, "Reload MGCP configuration"),
+	AST_CLI_DEFINE(handle_mgcp_audit_endpoint, "Audit specified MGCP endpoint"),
+	AST_CLI_DEFINE(handle_mgcp_show_endpoints, "List defined MGCP endpoints"),
+	AST_CLI_DEFINE(handle_mgcp_set_debug, "Enable MGCP debugging"),
+	AST_CLI_DEFINE(handle_mgcp_set_debug_off, "Disable MGCP debugging"),
+	AST_CLI_DEFINE(mgcp_reload, "Reload MGCP configuration"),
 };
 
 static int mgcp_answer(struct ast_channel *ast)

Modified: trunk/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_misdn.c?view=diff&rev=86820&r1=86819&r2=86820
==============================================================================
--- trunk/channels/chan_misdn.c (original)
+++ trunk/channels/chan_misdn.c Mon Oct 22 15:05:18 2007
@@ -1762,27 +1762,27 @@
 }
 
 static struct ast_cli_entry chan_misdn_clis[] = {
-	AST_CLI(handle_cli_misdn_port_block,        "Block the given port"),
-	AST_CLI(handle_cli_misdn_port_down,         "Try to deacivate the L1 on the given port"),
-	AST_CLI(handle_cli_misdn_port_unblock,      "Unblock the given port"),
-	AST_CLI(handle_cli_misdn_port_up,           "Try to establish L1 on the given port"),
-	AST_CLI(handle_cli_misdn_reload,            "Reload internal mISDN config, read from the config file"),
-	AST_CLI(handle_cli_misdn_restart_pid,       "Restart the given pid"),
-	AST_CLI(handle_cli_misdn_restart_port,      "Restart the given port"),
-	AST_CLI(handle_cli_misdn_show_channel,      "Show an internal mISDN channel"),
-	AST_CLI(handle_cli_misdn_show_channels,     "Show the internal mISDN channel list"),
-	AST_CLI(handle_cli_misdn_show_config,       "Show internal mISDN config, read from the config file"),
-	AST_CLI(handle_cli_misdn_show_port,         "Show detailed information for given port"),
-	AST_CLI(handle_cli_misdn_show_ports_stats,  "Show mISDNs channel's call statistics per port"),
-	AST_CLI(handle_cli_misdn_show_stacks,       "Show internal mISDN stack_list"),
-	AST_CLI(handle_cli_misdn_send_facility,     "Sends a Facility Message to the mISDN Channel"),
-	AST_CLI(handle_cli_misdn_send_digit,        "Send DTMF digit to mISDN Channel"),
-	AST_CLI(handle_cli_misdn_send_display,      "Send Text to mISDN Channel"),
-	AST_CLI(handle_cli_misdn_send_restart,      "Send a restart for every bchannel on the given port"),
-	AST_CLI(handle_cli_misdn_set_crypt_debug,   "Set CryptDebuglevel of chan_misdn, at the moment, level={1,2}"),
-	AST_CLI(handle_cli_misdn_set_debug,         "Set Debuglevel of chan_misdn"),
-	AST_CLI(handle_cli_misdn_set_tics,          "???"),
-	AST_CLI(handle_cli_misdn_toggle_echocancel, "Toggle EchoCancel on mISDN Channel"),
+	AST_CLI_DEFINE(handle_cli_misdn_port_block,        "Block the given port"),
+	AST_CLI_DEFINE(handle_cli_misdn_port_down,         "Try to deacivate the L1 on the given port"),
+	AST_CLI_DEFINE(handle_cli_misdn_port_unblock,      "Unblock the given port"),
+	AST_CLI_DEFINE(handle_cli_misdn_port_up,           "Try to establish L1 on the given port"),
+	AST_CLI_DEFINE(handle_cli_misdn_reload,            "Reload internal mISDN config, read from the config file"),
+	AST_CLI_DEFINE(handle_cli_misdn_restart_pid,       "Restart the given pid"),
+	AST_CLI_DEFINE(handle_cli_misdn_restart_port,      "Restart the given port"),
+	AST_CLI_DEFINE(handle_cli_misdn_show_channel,      "Show an internal mISDN channel"),
+	AST_CLI_DEFINE(handle_cli_misdn_show_channels,     "Show the internal mISDN channel list"),
+	AST_CLI_DEFINE(handle_cli_misdn_show_config,       "Show internal mISDN config, read from the config file"),
+	AST_CLI_DEFINE(handle_cli_misdn_show_port,         "Show detailed information for given port"),
+	AST_CLI_DEFINE(handle_cli_misdn_show_ports_stats,  "Show mISDNs channel's call statistics per port"),
+	AST_CLI_DEFINE(handle_cli_misdn_show_stacks,       "Show internal mISDN stack_list"),
+	AST_CLI_DEFINE(handle_cli_misdn_send_facility,     "Sends a Facility Message to the mISDN Channel"),
+	AST_CLI_DEFINE(handle_cli_misdn_send_digit,        "Send DTMF digit to mISDN Channel"),
+	AST_CLI_DEFINE(handle_cli_misdn_send_display,      "Send Text to mISDN Channel"),
+	AST_CLI_DEFINE(handle_cli_misdn_send_restart,      "Send a restart for every bchannel on the given port"),
+	AST_CLI_DEFINE(handle_cli_misdn_set_crypt_debug,   "Set CryptDebuglevel of chan_misdn, at the moment, level={1,2}"),
+	AST_CLI_DEFINE(handle_cli_misdn_set_debug,         "Set Debuglevel of chan_misdn"),
+	AST_CLI_DEFINE(handle_cli_misdn_set_tics,          "???"),
+	AST_CLI_DEFINE(handle_cli_misdn_toggle_echocancel, "Toggle EchoCancel on mISDN Channel"),
 };
 
 static int update_config(struct chan_list *ch, int orig) 

Modified: trunk/channels/chan_oss.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_oss.c?view=diff&rev=86820&r1=86819&r2=86820
==============================================================================
--- trunk/channels/chan_oss.c (original)
+++ trunk/channels/chan_oss.c Mon Oct 22 15:05:18 2007
@@ -1455,16 +1455,16 @@
 }
 
 static struct ast_cli_entry cli_oss[] = {
-	AST_CLI(console_answer, "Answer an incoming console call"),
-	AST_CLI(console_hangup, "Hangup a call on the console"),
-	AST_CLI(console_flash, "Flash a call on the console"),
-	AST_CLI(console_dial, "Dial an extension on the console"),
-	AST_CLI(console_mute, "Disable/Enable mic input"),
-	AST_CLI(console_transfer, "Transfer a call to a different extension"),	
-	AST_CLI(console_sendtext, "Send text to the remote device"),
-	AST_CLI(console_autoanswer, "Sets/displays autoanswer"),
-	AST_CLI(console_boost, "Sets/displays mic boost in dB"),
-	AST_CLI(console_active, "Sets/displays active console"),
+	AST_CLI_DEFINE(console_answer, "Answer an incoming console call"),
+	AST_CLI_DEFINE(console_hangup, "Hangup a call on the console"),
+	AST_CLI_DEFINE(console_flash, "Flash a call on the console"),
+	AST_CLI_DEFINE(console_dial, "Dial an extension on the console"),
+	AST_CLI_DEFINE(console_mute, "Disable/Enable mic input"),
+	AST_CLI_DEFINE(console_transfer, "Transfer a call to a different extension"),	
+	AST_CLI_DEFINE(console_sendtext, "Send text to the remote device"),
+	AST_CLI_DEFINE(console_autoanswer, "Sets/displays autoanswer"),
+	AST_CLI_DEFINE(console_boost, "Sets/displays mic boost in dB"),
+	AST_CLI_DEFINE(console_active, "Sets/displays active console"),
 };
 
 /*!

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=86820&r1=86819&r2=86820
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Mon Oct 22 15:05:18 2007
@@ -18947,25 +18947,25 @@
 
 /*! \brief SIP Cli commands definition */
 static struct ast_cli_entry cli_sip[] = {
-	AST_CLI(sip_show_channels, "List active SIP channels/subscriptions"),
-	AST_CLI(sip_show_domains, "List our local SIP domains."),
-	AST_CLI(sip_show_inuse, "List all inuse/limits"),
-	AST_CLI(sip_show_objects, "List all SIP object allocations"),
-	AST_CLI(sip_show_peers, "List defined SIP peers"),
-	AST_CLI(sip_show_registry, "List SIP registration status"),
-	AST_CLI(sip_unregister, "Unregister (force expiration) a SIP peer from the registery\n"),
-	AST_CLI(sip_show_settings, "Show SIP global settings"),
-	AST_CLI(sip_notify, "Send a notify packet to a SIP peer"),
-	AST_CLI(sip_show_channel, "Show detailed SIP channel info"),
-	AST_CLI(sip_show_history, "Show SIP dialog history"),
-	AST_CLI(sip_show_peer, "Show details on specific SIP peer"),
-	AST_CLI(sip_show_users, "List defined SIP users"),
-	AST_CLI(sip_show_user, "Show details on specific SIP user"),
-	AST_CLI(sip_prune_realtime, "Prune cached Realtime users/peers"),
-	AST_CLI(sip_do_debug, "Enable/Disable SIP debugging"),
-	AST_CLI(sip_do_history, "Enable SIP history"),
-	AST_CLI(sip_no_history, "Disable SIP history"),
-	AST_CLI(sip_reload, "Reload SIP configuration"),
+	AST_CLI_DEFINE(sip_show_channels, "List active SIP channels/subscriptions"),
+	AST_CLI_DEFINE(sip_show_domains, "List our local SIP domains."),
+	AST_CLI_DEFINE(sip_show_inuse, "List all inuse/limits"),
+	AST_CLI_DEFINE(sip_show_objects, "List all SIP object allocations"),
+	AST_CLI_DEFINE(sip_show_peers, "List defined SIP peers"),
+	AST_CLI_DEFINE(sip_show_registry, "List SIP registration status"),
+	AST_CLI_DEFINE(sip_unregister, "Unregister (force expiration) a SIP peer from the registery\n"),
+	AST_CLI_DEFINE(sip_show_settings, "Show SIP global settings"),
+	AST_CLI_DEFINE(sip_notify, "Send a notify packet to a SIP peer"),
+	AST_CLI_DEFINE(sip_show_channel, "Show detailed SIP channel info"),
+	AST_CLI_DEFINE(sip_show_history, "Show SIP dialog history"),
+	AST_CLI_DEFINE(sip_show_peer, "Show details on specific SIP peer"),
+	AST_CLI_DEFINE(sip_show_users, "List defined SIP users"),
+	AST_CLI_DEFINE(sip_show_user, "Show details on specific SIP user"),
+	AST_CLI_DEFINE(sip_prune_realtime, "Prune cached Realtime users/peers"),
+	AST_CLI_DEFINE(sip_do_debug, "Enable/Disable SIP debugging"),
+	AST_CLI_DEFINE(sip_do_history, "Enable SIP history"),
+	AST_CLI_DEFINE(sip_no_history, "Disable SIP history"),
+	AST_CLI_DEFINE(sip_reload, "Reload SIP configuration"),
 };
 
 /*! \brief PBX load module - initialization */

Modified: trunk/channels/chan_skinny.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_skinny.c?view=diff&rev=86820&r1=86819&r2=86820
==============================================================================
--- trunk/channels/chan_skinny.c (original)
+++ trunk/channels/chan_skinny.c Mon Oct 22 15:05:18 2007
@@ -2731,14 +2731,14 @@
 }
 
 static struct ast_cli_entry cli_skinny[] = {
-	AST_CLI(handle_skinny_show_devices, "List defined Skinny devices"),
-	AST_CLI(handle_skinny_show_device, "List Skinny device information"),
-	AST_CLI(handle_skinny_show_lines, "List defined Skinny lines per device"),	
-	AST_CLI(handle_skinny_show_line, "List Skinny line information"),
-	AST_CLI(handle_skinny_show_settings, "List global Skinny settings"),
-	AST_CLI(handle_skinny_set_debug, "Enable Skinny debugging"),
-	AST_CLI(handle_skinny_set_debug_off, "Disable Skinny debugging"),
-	AST_CLI(handle_skinny_reset, "Reset Skinny device(s)"),
+	AST_CLI_DEFINE(handle_skinny_show_devices, "List defined Skinny devices"),
+	AST_CLI_DEFINE(handle_skinny_show_device, "List Skinny device information"),
+	AST_CLI_DEFINE(handle_skinny_show_lines, "List defined Skinny lines per device"),	
+	AST_CLI_DEFINE(handle_skinny_show_line, "List Skinny line information"),
+	AST_CLI_DEFINE(handle_skinny_show_settings, "List global Skinny settings"),
+	AST_CLI_DEFINE(handle_skinny_set_debug, "Enable Skinny debugging"),
+	AST_CLI_DEFINE(handle_skinny_set_debug_off, "Disable Skinny debugging"),
+	AST_CLI_DEFINE(handle_skinny_reset, "Reset Skinny device(s)"),
 };
 
 #if 0

Modified: trunk/channels/chan_usbradio.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_usbradio.c?view=diff&rev=86820&r1=86819&r2=86820
==============================================================================
--- trunk/channels/chan_usbradio.c (original)
+++ trunk/channels/chan_usbradio.c Mon Oct 22 15:05:18 2007
@@ -1923,10 +1923,10 @@
 }
 
 static struct ast_cli_entry cli_usbradio[] = {
-	AST_CLI(handle_cli_radio_key,       "Simulate Rx Signal Present"),
-	AST_CLI(handle_cli_radio_unkey,     "Simulate Rx Signal Lusb"),
-	AST_CLI(handle_cli_radio_tune,      "Radio Tune"),
-	AST_CLI(handle_cli_radio_set_debug, "Enable/Disable Radio Debugging"),
+	AST_CLI_DEFINE(handle_cli_radio_key,       "Simulate Rx Signal Present"),
+	AST_CLI_DEFINE(handle_cli_radio_unkey,     "Simulate Rx Signal Lusb"),
+	AST_CLI_DEFINE(handle_cli_radio_tune,      "Radio Tune"),
+	AST_CLI_DEFINE(handle_cli_radio_set_debug, "Enable/Disable Radio Debugging"),
 };
 
 /*

Modified: trunk/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_zap.c?view=diff&rev=86820&r1=86819&r2=86820
==============================================================================
--- trunk/channels/chan_zap.c (original)
+++ trunk/channels/chan_zap.c Mon Oct 22 15:05:18 2007
@@ -10845,14 +10845,14 @@
 }
 
 static struct ast_cli_entry zap_pri_cli[] = {
-	AST_CLI(handle_pri_debug, "Enables PRI debugging on a span"),
-	AST_CLI(handle_pri_no_debug, "Disables PRI debugging on a span"),
-	AST_CLI(handle_pri_really_debug, "Enables REALLY INTENSE PRI debugging"),
-	AST_CLI(handle_pri_show_spans, "Displays PRI Information"),
-	AST_CLI(handle_pri_show_span, "Displays PRI Information"),
-	AST_CLI(handle_pri_show_debug, "Displays current PRI debug settings"),
-	AST_CLI(handle_pri_set_debug_file, "Sends PRI debug output to the specified file"),
-	AST_CLI(handle_pri_unset_debug_file, "Ends PRI debug output to file"),
+	AST_CLI_DEFINE(handle_pri_debug, "Enables PRI debugging on a span"),
+	AST_CLI_DEFINE(handle_pri_no_debug, "Disables PRI debugging on a span"),
+	AST_CLI_DEFINE(handle_pri_really_debug, "Enables REALLY INTENSE PRI debugging"),
+	AST_CLI_DEFINE(handle_pri_show_spans, "Displays PRI Information"),
+	AST_CLI_DEFINE(handle_pri_show_span, "Displays PRI Information"),
+	AST_CLI_DEFINE(handle_pri_show_debug, "Displays current PRI debug settings"),
+	AST_CLI_DEFINE(handle_pri_set_debug_file, "Sends PRI debug output to the specified file"),
+	AST_CLI_DEFINE(handle_pri_unset_debug_file, "Ends PRI debug output to file"),
 };
 
 #endif /* HAVE_PRI */
@@ -11369,13 +11369,13 @@
 }
 
 static struct ast_cli_entry zap_cli[] = {
-	AST_CLI(handle_zap_show_cadences, "List cadences"),
-	AST_CLI(zap_show_channels, "Show active zapata channels"),
-	AST_CLI(zap_show_channel, "Show information on a channel"),
-	AST_CLI(zap_destroy_channel, "Destroy a channel"),
-	AST_CLI(zap_restart_cmd, "Fully restart zaptel channels"),
-	AST_CLI(zap_show_status, "Show all Zaptel cards status"),
-	AST_CLI(zap_show_version, "Show the Zaptel version in use"),
+	AST_CLI_DEFINE(handle_zap_show_cadences, "List cadences"),
+	AST_CLI_DEFINE(zap_show_channels, "Show active zapata channels"),
+	AST_CLI_DEFINE(zap_show_channel, "Show information on a channel"),
+	AST_CLI_DEFINE(zap_destroy_channel, "Destroy a channel"),
+	AST_CLI_DEFINE(zap_restart_cmd, "Fully restart zaptel channels"),
+	AST_CLI_DEFINE(zap_show_status, "Show all Zaptel cards status"),
+	AST_CLI_DEFINE(zap_show_version, "Show the Zaptel version in use"),
 };
 
 #define TRANSFER	0
@@ -11969,11 +11969,11 @@
 }
 
 static struct ast_cli_entry zap_ss7_cli[] = {
-	AST_CLI(handle_ss7_debug, "Enables SS7 debugging on a linkset"), 
-	AST_CLI(handle_ss7_no_debug, "Disables SS7 debugging on a linkset"), 
-	AST_CLI(handle_ss7_block_cic, "Disables SS7 debugging on a linkset"),
-	AST_CLI(handle_ss7_unblock_cic, "Disables SS7 debugging on a linkset"),
-	AST_CLI(handle_ss7_show_linkset, "Shows the status of a linkset"),
+	AST_CLI_DEFINE(handle_ss7_debug, "Enables SS7 debugging on a linkset"), 
+	AST_CLI_DEFINE(handle_ss7_no_debug, "Disables SS7 debugging on a linkset"), 
+	AST_CLI_DEFINE(handle_ss7_block_cic, "Disables SS7 debugging on a linkset"),
+	AST_CLI_DEFINE(handle_ss7_unblock_cic, "Disables SS7 debugging on a linkset"),
+	AST_CLI_DEFINE(handle_ss7_show_linkset, "Shows the status of a linkset"),
 };
 #endif /* HAVE_SS7 */
 

Modified: trunk/channels/iax2-provision.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/iax2-provision.c?view=diff&rev=86820&r1=86819&r2=86820
==============================================================================
--- trunk/channels/iax2-provision.c (original)
+++ trunk/channels/iax2-provision.c Mon Oct 22 15:05:18 2007
@@ -471,7 +471,7 @@
 }
 
 static struct ast_cli_entry cli_iax2_provision[] = {
-	AST_CLI(iax_show_provisioning, "Display iax provisioning"),
+	AST_CLI_DEFINE(iax_show_provisioning, "Display iax provisioning"),
 };
 
 static int iax_provision_init(void)

Modified: trunk/codecs/codec_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/codecs/codec_zap.c?view=diff&rev=86820&r1=86819&r2=86820
==============================================================================
--- trunk/codecs/codec_zap.c (original)
+++ trunk/codecs/codec_zap.c Mon Oct 22 15:05:18 2007
@@ -70,7 +70,7 @@
 static char *handle_cli_transcoder_show(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a);
 
 static struct ast_cli_entry cli[] = {
-	AST_CLI(handle_cli_transcoder_show, "Display Zaptel transcoder utilization.")
+	AST_CLI_DEFINE(handle_cli_transcoder_show, "Display Zaptel transcoder utilization.")
 };
 
 struct format_map {

Modified: trunk/funcs/func_devstate.c
URL: http://svn.digium.com/view/asterisk/trunk/funcs/func_devstate.c?view=diff&rev=86820&r1=86819&r2=86820
==============================================================================
--- trunk/funcs/func_devstate.c (original)
+++ trunk/funcs/func_devstate.c Mon Oct 22 15:05:18 2007
@@ -174,7 +174,7 @@
 }
 
 static struct ast_cli_entry cli_funcdevstate[] = {
-	AST_CLI(cli_funcdevstate_list, "List currently known custom device states"),
+	AST_CLI_DEFINE(cli_funcdevstate_list, "List currently known custom device states"),
 };
 
 static struct ast_custom_function devstate_function = {

Modified: trunk/include/asterisk/cli.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/cli.h?view=diff&rev=86820&r1=86819&r2=86820
==============================================================================
--- trunk/include/asterisk/cli.h (original)
+++ trunk/include/asterisk/cli.h Mon Oct 22 15:05:18 2007
@@ -84,7 +84,7 @@
 
 	...
 	// this is how we create the entry to register 
-	AST_CLI(new_setdebug, "short description")
+	AST_CLI_DEFINE(new_setdebug, "short description")
 	...
 
    To help the transition, we make the pointer to the struct ast_cli_entry
@@ -197,7 +197,7 @@
 
 /* XXX the parser in gcc 2.95 gets confused if you don't put a space
  * between the last arg before VA_ARGS and the comma */
-#define AST_CLI(fn, txt , ... )	{ .new_handler = fn, .summary = txt, ## __VA_ARGS__ }
+#define AST_CLI_DEFINE(fn, txt , ... )	{ .new_handler = fn, .summary = txt, ## __VA_ARGS__ }
 
 /*!
  * Helper function to generate cli entries from a NULL-terminated array.

Modified: trunk/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/trunk/main/asterisk.c?view=diff&rev=86820&r1=86819&r2=86820
==============================================================================
--- trunk/main/asterisk.c (original)
+++ trunk/main/asterisk.c Mon Oct 22 15:05:18 2007
@@ -1734,26 +1734,26 @@
 #define ASTERISK_PROMPT2 "%s*CLI> "
 
 static struct ast_cli_entry cli_asterisk[] = {
-	AST_CLI(handle_abort_shutdown, "Cancel a running shutdown"),
-	AST_CLI(handle_stop_now, "Shut down Asterisk immediately"),
-	AST_CLI(handle_stop_gracefully, "Gracefully shut down Asterisk"),
-	AST_CLI(handle_stop_when_convenient, "Shut down Asterisk at empty call volume"),
-	AST_CLI(handle_restart_now, "Restart Asterisk immediately"), 
-	AST_CLI(handle_restart_gracefully, "Restart Asterisk gracefully"),
-	AST_CLI(handle_restart_when_convenient, "Restart Asterisk at empty call volume"),
-	AST_CLI(show_warranty, "Show the warranty (if any) for this copy of Asterisk"),
-	AST_CLI(show_license, "Show the license(s) for this copy of Asterisk"),
-	AST_CLI(handle_version, "Display version info"),
-	AST_CLI(handle_bang, "Execute a shell command"),
+	AST_CLI_DEFINE(handle_abort_shutdown, "Cancel a running shutdown"),

[... 792 lines stripped ...]



More information about the asterisk-commits mailing list