Switch from AST_CLI (formerly NEW_CLI) to AST_CLI_DEFINE, since the former didn't make much sense

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@86820 f38db490-d61c-443f-a65b-d21fe96a405b

16 files changed, 133 insertions, 133 deletions

diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index 97f0c46be..8f103ae37 100644
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -1765,9 +1765,9 @@ static const char agent_logoff_usage[] =
 "       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"),
 };
 
 /*!
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c
index a257bffcc..fefde1eb1 100644
--- a/channels/chan_alsa.c
+++ b/channels/chan_alsa.c
@@ -1096,11 +1096,11 @@ static char *console_dial(struct ast_cli_entry *e, int cmd, struct ast_cli_args
 }
 
 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)
diff --git a/channels/chan_features.c b/channels/chan_features.c
index 8a563290b..4ef9d4125 100644
--- a/channels/chan_features.c
+++ b/channels/chan_features.c
@@ -543,7 +543,7 @@ static char *features_show(struct ast_cli_entry *e, int cmd, struct ast_cli_args
 }
 
 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)
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c
index ae5cdb74d..f1790230f 100644
--- a/channels/chan_gtalk.c
+++ b/channels/chan_gtalk.c
@@ -235,8 +235,8 @@ static struct ast_rtp_protocol gtalk_rtp = {
 };
 
 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];
diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index a0f7c961d..da324cf6d 100644
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -2744,11 +2744,11 @@ static char *handle_cli_h323_show_tokens(struct ast_cli_entry *e, int cmd, struc
 }
 
 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 int reload(void)
 }
 
 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)
 {
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index d0b68f13b..6b456f626 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -11305,32 +11305,32 @@ static struct ast_switch iax2_switch =
 */
 
 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 */
 };
 
diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c
index 2dc74eafd..fecdff937 100644
--- a/channels/chan_jingle.c
+++ b/channels/chan_jingle.c
@@ -236,8 +236,8 @@ static struct ast_rtp_protocol jingle_rtp = {
 };
 
 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"),
 };
 
 
diff --git a/channels/chan_local.c b/channels/chan_local.c
index bfe19f4cc..3aa46cf6e 100644
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -723,7 +723,7 @@ static char *locals_show(struct ast_cli_entry *e, int cmd, struct ast_cli_args *
 }
 
 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 */
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index fc8b54f55..9eb0fa112 100644
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -1183,11 +1183,11 @@ static char *handle_mgcp_set_debug_off(struct ast_cli_entry *e, int cmd, struct
 }
 
 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)
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index 6dd537a82..55f41d928 100644
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -1762,27 +1762,27 @@ static char *complete_show_config(struct ast_cli_args *a)
 }
 
 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) 
diff --git a/channels/chan_oss.c b/channels/chan_oss.c
index bd89b03aa..1caf1a378 100644
--- a/channels/chan_oss.c
+++ b/channels/chan_oss.c
@@ -1455,16 +1455,16 @@ static char *console_boost(struct ast_cli_entry *e, int cmd, struct ast_cli_args
 }
 
 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"),
 };
 
 /*!
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 1b41379dd..f0187f8d7 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -18947,25 +18947,25 @@ static int reload(void)
 
 /*! \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 */
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index bbea12915..86d2a5b95 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -2731,14 +2731,14 @@ static char *handle_skinny_show_settings(struct ast_cli_entry *e, int cmd, struc
 }
 
 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
diff --git a/channels/chan_usbradio.c b/channels/chan_usbradio.c
index cbd2fd28f..fc77b73e3 100644
--- a/channels/chan_usbradio.c
+++ b/channels/chan_usbradio.c
@@ -1923,10 +1923,10 @@ static char *handle_cli_radio_set_debug(struct ast_cli_entry *e, int cmd, struct
 }
 
 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"),
 };
 
 /*
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index f4991fae8..21ea7edc2 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -10845,14 +10845,14 @@ static char *handle_pri_show_debug(struct ast_cli_entry *e, int cmd, struct ast_
 }
 
 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 char *zap_show_version(struct ast_cli_entry *e, int cmd, struct ast_cli_a
 }
 
 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 char *handle_ss7_show_linkset(struct ast_cli_entry *e, int cmd, struct as
 }
 
 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 */
 
diff --git a/channels/iax2-provision.c b/channels/iax2-provision.c
index 702d8bc14..8e22e88d5 100644
--- a/channels/iax2-provision.c
+++ b/channels/iax2-provision.c
@@ -471,7 +471,7 @@ static char *iax_show_provisioning(struct ast_cli_entry *e, int cmd, struct ast_
 }
 
 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)