diff options
64 files changed, 308 insertions, 308 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 56a3f6176..e5d5be469 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -1244,9 +1244,9 @@ static char *sla_show_stations(struct ast_cli_entry *e, int cmd, struct ast_cli_ } 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) diff --git a/apps/app_minivm.c b/apps/app_minivm.c index 462b7e7b7..bb352dc3f 100644 --- a/apps/app_minivm.c +++ b/apps/app_minivm.c @@ -2991,12 +2991,12 @@ static int minivm_counter_func_write(struct ast_channel *chan, const char *cmd, /*! \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 = { diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c index f328aadd1..6db3b02f0 100644 --- a/apps/app_mixmonitor.c +++ b/apps/app_mixmonitor.c @@ -399,7 +399,7 @@ static char *handle_cli_mixmonitor(struct ast_cli_entry *e, int cmd, struct ast_ } 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) diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c index 5455e0f08..aa65257e6 100644 --- a/apps/app_osplookup.c +++ b/apps/app_osplookup.c @@ -2000,7 +2000,7 @@ static const char* descrip4 = " 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) diff --git a/apps/app_playback.c b/apps/app_playback.c index d23235dfa..182b7eac7 100644 --- a/apps/app_playback.c +++ b/apps/app_playback.c @@ -395,9 +395,9 @@ static char *__say_cli_init(struct ast_cli_entry *e, int cmd, struct ast_cli_arg } 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) diff --git a/apps/app_queue.c b/apps/app_queue.c index 96fc2bd5d..87345b01c 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -5004,10 +5004,10 @@ static const char qum_cmd_usage[] = "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) diff --git a/apps/app_rpt.c b/apps/app_rpt.c index 7ea02ac0f..7d63b961e 100644 --- a/apps/app_rpt.c +++ b/apps/app_rpt.c @@ -706,12 +706,12 @@ static char *handle_cli_rpt_reload(struct ast_cli_entry *e, int cmd, struct ast_ 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") }; /* diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 525342ea5..6859859e3 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -7735,8 +7735,8 @@ static char *handle_voicemail_show_zones(struct ast_cli_entry *e, int cmd, struc } 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) 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) diff --git a/codecs/codec_zap.c b/codecs/codec_zap.c index afc2d324e..df400a9f9 100644 --- a/codecs/codec_zap.c +++ b/codecs/codec_zap.c @@ -70,7 +70,7 @@ static struct channel_usage { 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 { diff --git a/funcs/func_devstate.c b/funcs/func_devstate.c index af1c10c43..261dd41dd 100644 --- a/funcs/func_devstate.c +++ b/funcs/func_devstate.c @@ -174,7 +174,7 @@ static char *cli_funcdevstate_list(struct ast_cli_entry *e, int cmd, struct ast_ } 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 = { diff --git a/include/asterisk/cli.h b/include/asterisk/cli.h index ba0596d84..f478c4eb0 100644 --- a/include/asterisk/cli.h +++ b/include/asterisk/cli.h @@ -84,7 +84,7 @@ void ast_cli(int fd, const char *fmt, ...) ... // 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 @@ struct ast_cli_entry { /* 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. diff --git a/main/asterisk.c b/main/asterisk.c index 1f7d91f55..61c4ea526 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -1734,26 +1734,26 @@ static char *show_license(struct ast_cli_entry *e, int cmd, struct ast_cli_args #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"), + AST_CLI_DEFINE(handle_stop_now, "Shut down Asterisk immediately"), + AST_CLI_DEFINE(handle_stop_gracefully, "Gracefully shut down Asterisk"), + AST_CLI_DEFINE(handle_stop_when_convenient, "Shut down Asterisk at empty call volume"), + AST_CLI_DEFINE(handle_restart_now, "Restart Asterisk immediately"), + AST_CLI_DEFINE(handle_restart_gracefully, "Restart Asterisk gracefully"), + AST_CLI_DEFINE(handle_restart_when_convenient, "Restart Asterisk at empty call volume"), + AST_CLI_DEFINE(show_warranty, "Show the warranty (if any) for this copy of Asterisk"), + AST_CLI_DEFINE(show_license, "Show the license(s) for this copy of Asterisk"), + AST_CLI_DEFINE(handle_version, "Display version info"), + AST_CLI_DEFINE(handle_bang, "Execute a shell command"), #if !defined(LOW_MEMORY) - AST_CLI(handle_show_version_files, "List versions of files used to build Asterisk"), - AST_CLI(handle_show_threads, "Show running threads"), + AST_CLI_DEFINE(handle_show_version_files, "List versions of files used to build Asterisk"), + AST_CLI_DEFINE(handle_show_threads, "Show running threads"), #if defined(HAVE_SYSINFO) - AST_CLI(handle_show_sysinfo, "Show System Information"), + AST_CLI_DEFINE(handle_show_sysinfo, "Show System Information"), #endif - AST_CLI(handle_show_profile, "Display profiling info"), - AST_CLI(handle_show_settings, "Show some core settings"), - AST_CLI(handle_clear_profile, "Clear profiling info"), + AST_CLI_DEFINE(handle_show_profile, "Display profiling info"), + AST_CLI_DEFINE(handle_show_settings, "Show some core settings"), + AST_CLI_DEFINE(handle_clear_profile, "Clear profiling info"), #endif /* ! LOW_MEMORY */ }; diff --git a/main/astmm.c b/main/astmm.c index 0529a8f5f..4bd4a6b75 100644 --- a/main/astmm.c +++ b/main/astmm.c @@ -459,8 +459,8 @@ static char *handle_memory_show_summary(struct ast_cli_entry *e, int cmd, struct } static struct ast_cli_entry cli_memory[] = { - AST_CLI(handle_memory_show, "Display outstanding memory allocations"), - AST_CLI(handle_memory_show_summary, "Summarize outstanding memory allocations"), + AST_CLI_DEFINE(handle_memory_show, "Display outstanding memory allocations"), + AST_CLI_DEFINE(handle_memory_show_summary, "Summarize outstanding memory allocations"), }; void __ast_mm_init(void) diff --git a/main/astobj2.c b/main/astobj2.c index 8fbdf016c..c9c468017 100644 --- a/main/astobj2.c +++ b/main/astobj2.c @@ -715,8 +715,8 @@ static char *handle_astobj2_test(struct ast_cli_entry *e, int cmd, struct ast_cl } static struct ast_cli_entry cli_astobj2[] = { - AST_CLI(handle_astobj2_stats, "Print astobj2 statistics"), - AST_CLI(handle_astobj2_test, "Test astobj2"), + AST_CLI_DEFINE(handle_astobj2_stats, "Print astobj2 statistics"), + AST_CLI_DEFINE(handle_astobj2_test, "Test astobj2"), }; #endif /* AO2_DEBUG */ diff --git a/main/cdr.c b/main/cdr.c index a6cdaeaad..b4a185c03 100644 --- a/main/cdr.c +++ b/main/cdr.c @@ -1291,8 +1291,8 @@ static char *handle_cli_submit(struct ast_cli_entry *e, int cmd, struct ast_cli_ return CLI_SUCCESS; } -static struct ast_cli_entry cli_submit = AST_CLI(handle_cli_submit, "Posts all pending batched CDR data"); -static struct ast_cli_entry cli_status = AST_CLI(handle_cli_status, "Display the CDR status"); +static struct ast_cli_entry cli_submit = AST_CLI_DEFINE(handle_cli_submit, "Posts all pending batched CDR data"); +static struct ast_cli_entry cli_status = AST_CLI_DEFINE(handle_cli_status, "Display the CDR status"); static int do_reload(int reload) { diff --git a/main/channel.c b/main/channel.c index acc851aac..ace4d4eb0 100644 --- a/main/channel.c +++ b/main/channel.c @@ -316,8 +316,8 @@ static char *handle_cli_core_show_channeltype(struct ast_cli_entry *e, int cmd, } static struct ast_cli_entry cli_channel[] = { - AST_CLI(handle_cli_core_show_channeltypes, "List available channel types"), - AST_CLI(handle_cli_core_show_channeltype, "Give more details on that channel type") + AST_CLI_DEFINE(handle_cli_core_show_channeltypes, "List available channel types"), + AST_CLI_DEFINE(handle_cli_core_show_channeltype, "Give more details on that channel type") }; /*! \brief Checks to see if a channel is needing hang up */ diff --git a/main/cli.c b/main/cli.c index 06c1b9ca2..d454694dc 100644 --- a/main/cli.c +++ b/main/cli.c @@ -1108,47 +1108,47 @@ static char *group_show_channels(struct ast_cli_entry *e, int cmd, struct ast_cl #undef FORMAT_STRING } -static struct ast_cli_entry cli_debug_channel_deprecated = AST_CLI(handle_debugchan_deprecated, "Enable debugging on channel"); -static struct ast_cli_entry cli_module_load_deprecated = AST_CLI(handle_load_deprecated, "Load a module"); -static struct ast_cli_entry cli_module_reload_deprecated = AST_CLI(handle_reload_deprecated, "reload modules by name"); -static struct ast_cli_entry cli_module_unload_deprecated = AST_CLI(handle_unload_deprecated, "unload modules by name"); +static struct ast_cli_entry cli_debug_channel_deprecated = AST_CLI_DEFINE(handle_debugchan_deprecated, "Enable debugging on channel"); +static struct ast_cli_entry cli_module_load_deprecated = AST_CLI_DEFINE(handle_load_deprecated, "Load a module"); +static struct ast_cli_entry cli_module_reload_deprecated = AST_CLI_DEFINE(handle_reload_deprecated, "reload modules by name"); +static struct ast_cli_entry cli_module_unload_deprecated = AST_CLI_DEFINE(handle_unload_deprecated, "unload modules by name"); static char *handle_help(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a); static struct ast_cli_entry cli_cli[] = { /* Deprecated, but preferred command is now consolidated (and already has a deprecated command for it). */ - AST_CLI(handle_commandcomplete, "Command complete"), - AST_CLI(handle_commandnummatches, "Returns number of command matches"), - AST_CLI(handle_commandmatchesarray, "Returns command matches array"), + AST_CLI_DEFINE(handle_commandcomplete, "Command complete"), + AST_CLI_DEFINE(handle_commandnummatches, "Returns number of command matches"), + AST_CLI_DEFINE(handle_commandmatchesarray, "Returns command matches array"), - AST_CLI(handle_nodebugchan_deprecated, "Disable debugging on channel(s)"), + AST_CLI_DEFINE(handle_nodebugchan_deprecated, "Disable debugging on channel(s)"), - AST_CLI(handle_chanlist, "Display information on channels"), + AST_CLI_DEFINE(handle_chanlist, "Display information on channels"), - AST_CLI(handle_showchan, "Display information on a specific channel"), + AST_CLI_DEFINE(handle_showchan, "Display information on a specific channel"), - AST_CLI(handle_core_set_debug_channel, "Enable/disable debugging on a channel", + AST_CLI_DEFINE(handle_core_set_debug_channel, "Enable/disable debugging on a channel", .deprecate_cmd = &cli_debug_channel_deprecated), - AST_CLI(handle_verbose, "Set level of debug/verbose chattiness"), + AST_CLI_DEFINE(handle_verbose, "Set level of debug/verbose chattiness"), - AST_CLI(group_show_channels, "Display active channels with group(s)"), + AST_CLI_DEFINE(group_show_channels, "Display active channels with group(s)"), - AST_CLI(handle_help, "Display help list, or specific help on a command"), + AST_CLI_DEFINE(handle_help, "Display help list, or specific help on a command"), - AST_CLI(handle_logger_mute, "Toggle logging output to a console"), + AST_CLI_DEFINE(handle_logger_mute, "Toggle logging output to a console"), - AST_CLI(handle_modlist, "List modules and info"), + AST_CLI_DEFINE(handle_modlist, "List modules and info"), - AST_CLI(handle_load, "Load a module by name", .deprecate_cmd = &cli_module_load_deprecated), + AST_CLI_DEFINE(handle_load, "Load a module by name", .deprecate_cmd = &cli_module_load_deprecated), - AST_CLI(handle_reload, "Reload configuration", .deprecate_cmd = &cli_module_reload_deprecated), + AST_CLI_DEFINE(handle_reload, "Reload configuration", .deprecate_cmd = &cli_module_reload_deprecated), - AST_CLI(handle_unload, "Unload a module by name", .deprecate_cmd = &cli_module_unload_deprecated ), + AST_CLI_DEFINE(handle_unload, "Unload a module by name", .deprecate_cmd = &cli_module_unload_deprecated ), - AST_CLI(handle_showuptime, "Show uptime information"), + AST_CLI_DEFINE(handle_showuptime, "Show uptime information"), - AST_CLI(handle_softhangup, "Request a hangup on a given channel"), + AST_CLI_DEFINE(handle_softhangup, "Request a hangup on a given channel"), }; /*! diff --git a/main/config.c b/main/config.c index 29f0f9d08..88bfd8a5f 100644 --- a/main/config.c +++ b/main/config.c @@ -2178,7 +2178,7 @@ static char *handle_cli_core_show_config_mappings(struct ast_cli_entry *e, int c } static struct ast_cli_entry cli_config[] = { - AST_CLI(handle_cli_core_show_config_mappings, "Display config mappings (file names to config engines)"), + AST_CLI_DEFINE(handle_cli_core_show_config_mappings, "Display config mappings (file names to config engines)"), }; int register_config_cli() @@ -549,12 +549,12 @@ void ast_db_freetree(struct ast_db_entry *dbe) } struct ast_cli_entry cli_database[] = { - AST_CLI(handle_cli_database_show, "Shows database contents"), - AST_CLI(handle_cli_database_showkey, "Shows database contents"), - AST_CLI(handle_cli_database_get, "Gets database value"), - AST_CLI(handle_cli_database_put, "Adds/updates database value"), - AST_CLI(handle_cli_database_del, "Removes database key/value"), - AST_CLI(handle_cli_database_deltree, "Removes database keytree/values") + AST_CLI_DEFINE(handle_cli_database_show, "Shows database contents"), + AST_CLI_DEFINE(handle_cli_database_showkey, "Shows database contents"), + AST_CLI_DEFINE(handle_cli_database_get, "Gets database value"), + AST_CLI_DEFINE(handle_cli_database_put, "Adds/updates database value"), + AST_CLI_DEFINE(handle_cli_database_del, "Removes database key/value"), + AST_CLI_DEFINE(handle_cli_database_deltree, "Removes database keytree/values") }; static int manager_dbput(struct mansession *s, const struct message *m) diff --git a/main/dnsmgr.c b/main/dnsmgr.c index f6372e62b..b4c8e6307 100644 --- a/main/dnsmgr.c +++ b/main/dnsmgr.c @@ -338,9 +338,9 @@ static char *handle_cli_status(struct ast_cli_entry *e, int cmd, struct ast_cli_ return CLI_SUCCESS; } -static struct ast_cli_entry cli_reload = AST_CLI(handle_cli_reload, "Reloads the DNS manager configuration"); -static struct ast_cli_entry cli_refresh = AST_CLI(handle_cli_refresh, "Performs an immediate refresh"); -static struct ast_cli_entry cli_status = AST_CLI(handle_cli_status, "Display the DNS manager status"); +static struct ast_cli_entry cli_reload = AST_CLI_DEFINE(handle_cli_reload, "Reloads the DNS manager configuration"); +static struct ast_cli_entry cli_refresh = AST_CLI_DEFINE(handle_cli_refresh, "Performs an immediate refresh"); +static struct ast_cli_entry cli_status = AST_CLI_DEFINE(handle_cli_status, "Display the DNS manager status"); int dnsmgr_init(void) { diff --git a/main/file.c b/main/file.c index ed7541bf6..453d82f8e 100644 --- a/main/file.c +++ b/main/file.c @@ -1239,7 +1239,7 @@ static char *handle_cli_core_show_file_formats(struct ast_cli_entry *e, int cmd, } struct ast_cli_entry cli_file[] = { - AST_CLI(handle_cli_core_show_file_formats, "Displays file formats") + AST_CLI_DEFINE(handle_cli_core_show_file_formats, "Displays file formats") }; int ast_file_init(void) diff --git a/main/frame.c b/main/frame.c index 24170997c..98b0800c9 100644 --- a/main/frame.c +++ b/main/frame.c @@ -913,10 +913,10 @@ static char *show_frame_stats(struct ast_cli_entry *e, int cmd, struct ast_cli_a /* Builtin Asterisk CLI-commands for debugging */ static struct ast_cli_entry my_clis[] = { - AST_CLI(show_codecs, "Displays a list of codecs"), - AST_CLI(show_codec_n, "Shows a specific codec"), + AST_CLI_DEFINE(show_codecs, "Displays a list of codecs"), + AST_CLI_DEFINE(show_codec_n, "Shows a specific codec"), #ifdef TRACE_FRAMES - AST_CLI(show_frame_stats, "Shows frame statistics"), + AST_CLI_DEFINE(show_frame_stats, "Shows frame statistics"), #endif }; diff --git a/main/http.c b/main/http.c index b2310f481..d4e692ea6 100644 --- a/main/http.c +++ b/main/http.c @@ -1299,7 +1299,7 @@ int ast_http_reload(void) } static struct ast_cli_entry cli_http[] = { - AST_CLI(handle_show_http, "Display HTTP server status"), + AST_CLI_DEFINE(handle_show_http, "Display HTTP server status"), }; int ast_http_init(void) diff --git a/main/image.c b/main/image.c index df6b194cb..5e6ce552c 100644 --- a/main/image.c +++ b/main/image.c @@ -211,7 +211,7 @@ static char *handle_core_show_image_formats(struct ast_cli_entry *e, int cmd, st } struct ast_cli_entry cli_image[] = { - AST_CLI(handle_core_show_image_formats, "Displays image formats") + AST_CLI_DEFINE(handle_core_show_image_formats, "Displays image formats") }; int ast_image_init(void) diff --git a/main/logger.c b/main/logger.c index 618a855c9..82badbb92 100644 --- a/main/logger.c +++ b/main/logger.c @@ -708,9 +708,9 @@ struct verb { static AST_RWLIST_HEAD_STATIC(verbosers, verb); static struct ast_cli_entry cli_logger[] = { - AST_CLI(handle_logger_show_channels, "List configured log channels"), - AST_CLI(handle_logger_reload, "Reopens the log files"), - AST_CLI(handle_logger_rotate, "Rotates and reopens the log files") + AST_CLI_DEFINE(handle_logger_show_channels, "List configured log channels"), + AST_CLI_DEFINE(handle_logger_reload, "Reopens the log files"), + AST_CLI_DEFINE(handle_logger_rotate, "Rotates and reopens the log files") }; static int handle_SIGXFSZ(int sig) diff --git a/main/manager.c b/main/manager.c index 4077d0606..bc5ca1ba9 100644 --- a/main/manager.c +++ b/main/manager.c @@ -717,13 +717,13 @@ static char *handle_showmaneventq(struct ast_cli_entry *e, int cmd, struct ast_c } static struct ast_cli_entry cli_manager[] = { - AST_CLI(handle_showmancmd, "Show a manager interface command"), - AST_CLI(handle_showmancmds, "List manager interface commands"), - AST_CLI(handle_showmanconn, "List connected manager interface users"), - AST_CLI(handle_showmaneventq, "List manager interface queued events"), - AST_CLI(handle_showmanagers, "List configured manager users"), - AST_CLI(handle_showmanager, "Display information on a specific manager user"), - AST_CLI(handle_mandebug, "Show, enable, disable debugging of the manager code"), + AST_CLI_DEFINE(handle_showmancmd, "Show a manager interface command"), + AST_CLI_DEFINE(handle_showmancmds, "List manager interface commands"), + AST_CLI_DEFINE(handle_showmanconn, "List connected manager interface users"), + AST_CLI_DEFINE(handle_showmaneventq, "List manager interface queued events"), + AST_CLI_DEFINE(handle_showmanagers, "List configured manager users"), + AST_CLI_DEFINE(handle_showmanager, "Display information on a specific manager user"), + AST_CLI_DEFINE(handle_mandebug, "Show, enable, disable debugging of the manager code"), }; /* diff --git a/main/pbx.c b/main/pbx.c index 1de2f09b0..5fb02016b 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -3967,15 +3967,15 @@ static char *handle_set_global(struct ast_cli_entry *e, int cmd, struct ast_cli_ * CLI entries for upper commands ... */ static struct ast_cli_entry pbx_cli[] = { - AST_CLI(handle_show_applications, "Shows registered dialplan applications"), - AST_CLI(handle_show_functions, "Shows registered dialplan functions"), - AST_CLI(handle_show_switches, "Show alternative switches"), - AST_CLI(handle_show_hints, "Show dialplan hints"), - AST_CLI(handle_show_globals, "Show global dialplan variables"), - AST_CLI(handle_show_function, "Describe a specific dialplan function"), - AST_CLI(handle_show_application, "Describe a specific dialplan application"), - AST_CLI(handle_set_global, "Set global dialplan variable"), - AST_CLI(handle_show_dialplan, "Show dialplan"), + AST_CLI_DEFINE(handle_show_applications, "Shows registered dialplan applications"), + AST_CLI_DEFINE(handle_show_functions, "Shows registered dialplan functions"), + AST_CLI_DEFINE(handle_show_switches, "Show alternative switches"), + AST_CLI_DEFINE(handle_show_hints, "Show dialplan hints"), + AST_CLI_DEFINE(handle_show_globals, "Show global dialplan variables"), + AST_CLI_DEFINE(handle_show_function, "Describe a specific dialplan function"), + AST_CLI_DEFINE(handle_show_application, "Describe a specific dialplan application"), + AST_CLI_DEFINE(handle_set_global, "Set global dialplan variable"), + AST_CLI_DEFINE(handle_show_dialplan, "Show dialplan"), }; static void unreference_cached_app(struct ast_app *app) diff --git a/main/rtp.c b/main/rtp.c index ccb846d3d..5b5223cf2 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -3979,10 +3979,10 @@ static char *handle_cli_stun_debug(struct ast_cli_entry *e, int cmd, struct ast_ } static struct ast_cli_entry cli_rtp[] = { - AST_CLI(handle_cli_rtp_debug, "Enable/Disable RTP debugging"), - AST_CLI(handle_cli_rtcp_debug, "Enable/Disable RTCP debugging"), - AST_CLI(handle_cli_rtcp_stats, "Enable/Disable RTCP stats"), - AST_CLI(handle_cli_stun_debug, "Enable/Disable STUN debugging"), + AST_CLI_DEFINE(handle_cli_rtp_debug, "Enable/Disable RTP debugging"), + AST_CLI_DEFINE(handle_cli_rtcp_debug, "Enable/Disable RTCP debugging"), + AST_CLI_DEFINE(handle_cli_rtcp_stats, "Enable/Disable RTCP stats"), + AST_CLI_DEFINE(handle_cli_stun_debug, "Enable/Disable STUN debugging"), }; static int __ast_rtp_reload(int reload) diff --git a/main/threadstorage.c b/main/threadstorage.c index e5bfc484a..01bab356b 100644 --- a/main/threadstorage.c +++ b/main/threadstorage.c @@ -222,8 +222,8 @@ static char *handle_cli_threadstorage_show_summary(struct ast_cli_entry *e, int } static struct ast_cli_entry cli[] = { - AST_CLI(handle_cli_threadstorage_show_allocations, "Display outstanding thread local storage allocations"), - AST_CLI(handle_cli_threadstorage_show_summary, "Summarize outstanding memory allocations") + AST_CLI_DEFINE(handle_cli_threadstorage_show_allocations, "Display outstanding thread local storage allocations"), + AST_CLI_DEFINE(handle_cli_threadstorage_show_summary, "Summarize outstanding memory allocations") }; void threadstorage_init(void) diff --git a/main/translate.c b/main/translate.c index 0da2c4be9..535257afa 100644 --- a/main/translate.c +++ b/main/translate.c @@ -575,7 +575,7 @@ static char *handle_cli_core_show_translation(struct ast_cli_entry *e, int cmd, } static struct ast_cli_entry cli_translate[] = { - AST_CLI(handle_cli_core_show_translation, "Display translation matrix") + AST_CLI_DEFINE(handle_cli_core_show_translation, "Display translation matrix") }; /*! \brief register codec translator */ diff --git a/main/udptl.c b/main/udptl.c index d906d0549..beb76a988 100644 --- a/main/udptl.c +++ b/main/udptl.c @@ -1197,9 +1197,9 @@ static char *handle_cli_udptl_debug_off(struct ast_cli_entry *e, int cmd, struct } static struct ast_cli_entry cli_udptl[] = { - AST_CLI(handle_cli_udptl_debug, "Enable UDPTL debugging"), - AST_CLI(handle_cli_udptl_debug_ip, "Enable UDPTL debugging on IP"), - AST_CLI(handle_cli_udptl_debug_off, "Disable UDPTL debugging") + AST_CLI_DEFINE(handle_cli_udptl_debug, "Enable UDPTL debugging"), + AST_CLI_DEFINE(handle_cli_udptl_debug_ip, "Enable UDPTL debugging on IP"), + AST_CLI_DEFINE(handle_cli_udptl_debug_off, "Disable UDPTL debugging") }; static void __ast_udptl_reload(int reload) diff --git a/main/utils.c b/main/utils.c index ed3c47b2d..34e4650e6 100644 --- a/main/utils.c +++ b/main/utils.c @@ -786,7 +786,7 @@ static char *handle_show_locks(struct ast_cli_entry *e, int cmd, struct ast_cli_ } static struct ast_cli_entry utils_cli[] = { - AST_CLI(handle_show_locks, "Show which locks are held by which thread"), + AST_CLI_DEFINE(handle_show_locks, "Show which locks are held by which thread"), }; #endif /* DEBUG_THREADS */ diff --git a/pbx/pbx_ael.c b/pbx/pbx_ael.c index 20a0138b4..506c75184 100644 --- a/pbx/pbx_ael.c +++ b/pbx/pbx_ael.c @@ -1002,8 +1002,8 @@ static char *handle_cli_ael_reload(struct ast_cli_entry *e, int cmd, struct ast_ } static struct ast_cli_entry cli_ael[] = { - AST_CLI(handle_cli_ael_reload, "Reload AEL configuration"), - AST_CLI(handle_cli_ael_debug_multiple, "Enable AEL debugging flags") + AST_CLI_DEFINE(handle_cli_ael_reload, "Reload AEL configuration"), + AST_CLI_DEFINE(handle_cli_ael_debug_multiple, "Enable AEL debugging flags") }; static int unload_module(void) diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c index 80f64964f..9b112dc18 100644 --- a/pbx/pbx_config.c +++ b/pbx/pbx_config.c @@ -1336,17 +1336,17 @@ static char *handle_cli_dialplan_reload(struct ast_cli_entry *e, int cmd, struct * CLI entries for commands provided by this module */ static struct ast_cli_entry cli_pbx_config[] = { - AST_CLI(handle_cli_dialplan_add_extension, "Add new extension into context"), - AST_CLI(handle_cli_dialplan_remove_extension, "Remove a specified extension"), - AST_CLI(handle_cli_dialplan_add_ignorepat, "Add new ignore pattern"), - AST_CLI(handle_cli_dialplan_remove_ignorepat, "Remove ignore pattern from context"), - AST_CLI(handle_cli_dialplan_add_include, "Include context in other context"), - AST_CLI(handle_cli_dialplan_remove_include, "Remove a specified include from context"), - AST_CLI(handle_cli_dialplan_reload, "Reload extensions and *only* extensions") + AST_CLI_DEFINE(handle_cli_dialplan_add_extension, "Add new extension into context"), + AST_CLI_DEFINE(handle_cli_dialplan_remove_extension, "Remove a specified extension"), + AST_CLI_DEFINE(handle_cli_dialplan_add_ignorepat, "Add new ignore pattern"), + AST_CLI_DEFINE(handle_cli_dialplan_remove_ignorepat, "Remove ignore pattern from context"), + AST_CLI_DEFINE(handle_cli_dialplan_add_include, "Include context in other context"), + AST_CLI_DEFINE(handle_cli_dialplan_remove_include, "Remove a specified include from context"), + AST_CLI_DEFINE(handle_cli_dialplan_reload, "Reload extensions and *only* extensions") }; static struct ast_cli_entry cli_dialplan_save = - AST_CLI(handle_cli_dialplan_save, "Save dialplan"); + AST_CLI_DEFINE(handle_cli_dialplan_save, "Save dialplan"); /*! * Standard module functions ... diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c index 989c07a92..afce62221 100644 --- a/pbx/pbx_dundi.c +++ b/pbx/pbx_dundi.c @@ -2866,21 +2866,21 @@ static char *dundi_show_precache(struct ast_cli_entry *e, int cmd, struct ast_cl } static struct ast_cli_entry cli_dundi[] = { - AST_CLI(dundi_do_debug, "Enable DUNDi debugging"), - AST_CLI(dundi_no_debug, "Disable DUNDi debugging"), - AST_CLI(dundi_do_store_history, "Enable DUNDi historic records"), - AST_CLI(dundi_no_store_history, "Disable DUNDi historic records"), - AST_CLI(dundi_flush, "Flush DUNDi cache"), - AST_CLI(dundi_show_peers, "Show defined DUNDi peers"), - AST_CLI(dundi_show_trans, "Show active DUNDi transactions"), - AST_CLI(dundi_show_entityid, "Display Global Entity ID"), - AST_CLI(dundi_show_mappings, "Show DUNDi mappings"), - AST_CLI(dundi_show_precache, "Show DUNDi precache"), - AST_CLI(dundi_show_requests, "Show DUNDi requests"), - AST_CLI(dundi_show_peer, "Show info on a specific DUNDi peer"), - AST_CLI(dundi_do_precache, "Precache a number in DUNDi"), - AST_CLI(dundi_do_lookup, "Lookup a number in DUNDi"), - AST_CLI(dundi_do_query, "Query a DUNDi EID"), + AST_CLI_DEFINE(dundi_do_debug, "Enable DUNDi debugging"), + AST_CLI_DEFINE(dundi_no_debug, "Disable DUNDi debugging"), + AST_CLI_DEFINE(dundi_do_store_history, "Enable DUNDi historic records"), + AST_CLI_DEFINE(dundi_no_store_history, "Disable DUNDi historic records"), + AST_CLI_DEFINE(dundi_flush, "Flush DUNDi cache"), + AST_CLI_DEFINE(dundi_show_peers, "Show defined DUNDi peers"), + AST_CLI_DEFINE(dundi_show_trans, "Show active DUNDi transactions"), + AST_CLI_DEFINE(dundi_show_entityid, "Display Global Entity ID"), + AST_CLI_DEFINE(dundi_show_mappings, "Show DUNDi mappings"), + AST_CLI_DEFINE(dundi_show_precache, "Show DUNDi precache"), + AST_CLI_DEFINE(dundi_show_requests, "Show DUNDi requests"), + AST_CLI_DEFINE(dundi_show_peer, "Show info on a specific DUNDi peer"), + AST_CLI_DEFINE(dundi_do_precache, "Precache a number in DUNDi"), + AST_CLI_DEFINE(dundi_do_lookup, "Lookup a number in DUNDi"), + AST_CLI_DEFINE(dundi_do_query, "Query a DUNDi EID"), }; static struct dundi_transaction *create_transaction(struct dundi_peer *p) diff --git a/res/res_agi.c b/res/res_agi.c index 994c83e08..8f722f082 100644 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -2217,9 +2217,9 @@ static int deadagi_exec(struct ast_channel *chan, void *data) } static struct ast_cli_entry cli_agi[] = { - AST_CLI(handle_cli_agi_debug, "Enable/Disable AGI debugging"), - AST_CLI(handle_cli_agi_show, "List AGI commands or specific help"), - AST_CLI(handle_cli_agi_dumphtml, "Dumps a list of AGI commands in HTML format") + AST_CLI_DEFINE(handle_cli_agi_debug, "Enable/Disable AGI debugging"), + AST_CLI_DEFINE(handle_cli_agi_show, "List AGI commands or specific help"), + AST_CLI_DEFINE(handle_cli_agi_dumphtml, "Dumps a list of AGI commands in HTML format") }; static int unload_module(void) diff --git a/res/res_clioriginate.c b/res/res_clioriginate.c index 2a4780ca9..3cc3f2db2 100644 --- a/res/res_clioriginate.c +++ b/res/res_clioriginate.c @@ -176,7 +176,7 @@ static char *handle_orig(struct ast_cli_entry *e, int cmd, struct ast_cli_args * } static struct ast_cli_entry cli_cliorig[] = { - AST_CLI(handle_orig, "Originate a call"), + AST_CLI_DEFINE(handle_orig, "Originate a call"), }; /*! \brief Unload orginate module */ diff --git a/res/res_config_pgsql.c b/res/res_config_pgsql.c index a2396d310..6dbeae146 100644 --- a/res/res_config_pgsql.c +++ b/res/res_config_pgsql.c @@ -67,7 +67,7 @@ static int pgsql_reconnect(const char *database); static char *handle_cli_realtime_pgsql_status(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a); static struct ast_cli_entry cli_realtime[] = { - AST_CLI(handle_cli_realtime_pgsql_status, "Shows connection information for the PostgreSQL RealTime driver"), + AST_CLI_DEFINE(handle_cli_realtime_pgsql_status, "Shows connection information for the PostgreSQL RealTime driver"), }; static struct ast_variable *realtime_pgsql(const char *database, const char *table, va_list ap) diff --git a/res/res_config_sqlite.c b/res/res_config_sqlite.c index 095b827f8..4cbed3685 100644 --- a/res/res_config_sqlite.c +++ b/res/res_config_sqlite.c @@ -500,7 +500,7 @@ AST_MUTEX_DEFINE_STATIC(mutex); * command. */ static struct ast_cli_entry cli_status[] = { - AST_CLI(handle_cli_show_sqlite_status, "Show status information about the SQLite 2 driver"), + AST_CLI_DEFINE(handle_cli_show_sqlite_status, "Show status information about the SQLite 2 driver"), }; /* diff --git a/res/res_convert.c b/res/res_convert.c index 2c753741b..98f51774e 100644 --- a/res/res_convert.c +++ b/res/res_convert.c @@ -147,7 +147,7 @@ fail_out: } static struct ast_cli_entry cli_convert[] = { - AST_CLI(handle_cli_file_convert, "Convert audio file") + AST_CLI_DEFINE(handle_cli_file_convert, "Convert audio file") }; static int unload_module(void) diff --git a/res/res_crypto.c b/res/res_crypto.c index 5f33369af..9ef65d652 100644 --- a/res/res_crypto.c +++ b/res/res_crypto.c @@ -582,8 +582,8 @@ static char *handle_cli_keys_init(struct ast_cli_entry *e, int cmd, struct ast_c } static struct ast_cli_entry cli_crypto[] = { - AST_CLI(handle_cli_keys_show, "Displays RSA key information"), - AST_CLI(handle_cli_keys_init, "Initialize RSA key passcodes") + AST_CLI_DEFINE(handle_cli_keys_show, "Displays RSA key information"), + AST_CLI_DEFINE(handle_cli_keys_init, "Initialize RSA key passcodes") }; /*! \brief initialise the res_crypto module */ diff --git a/res/res_features.c b/res/res_features.c index 993d1b90f..298a63e64 100644 --- a/res/res_features.c +++ b/res/res_features.c @@ -2629,11 +2629,11 @@ static char *handle_parkedcalls_deprecated(struct ast_cli_entry *e, int cmd, str return res; } -static struct ast_cli_entry cli_show_parkedcalls_deprecated = AST_CLI(handle_parkedcalls_deprecated, "List currently parked calls."); +static struct ast_cli_entry cli_show_parkedcalls_deprecated = AST_CLI_DEFINE(handle_parkedcalls_deprecated, "List currently parked calls."); static struct ast_cli_entry cli_features[] = { - AST_CLI(handle_feature_show, "Lists configured features"), - AST_CLI(handle_parkedcalls, "List currently parked calls", .deprecate_cmd = &cli_show_parkedcalls_deprecated), + AST_CLI_DEFINE(handle_feature_show, "Lists configured features"), + AST_CLI_DEFINE(handle_parkedcalls, "List currently parked calls", .deprecate_cmd = &cli_show_parkedcalls_deprecated), }; /*! diff --git a/res/res_indications.c b/res/res_indications.c index 475a79d31..74d6288e1 100644 --- a/res/res_indications.c +++ b/res/res_indications.c @@ -382,9 +382,9 @@ out: v = v->next; /*! \brief CLI entries for commands provided by this module */ static struct ast_cli_entry cli_indications[] = { - AST_CLI(handle_cli_indication_add, "Add the given indication to the country"), - AST_CLI(handle_cli_indication_remove, "Remove the given indication from the country"), - AST_CLI(handle_cli_indication_show, "Display a list of all countries/indications") + AST_CLI_DEFINE(handle_cli_indication_add, "Add the given indication to the country"), + AST_CLI_DEFINE(handle_cli_indication_remove, "Remove the given indication from the country"), + AST_CLI_DEFINE(handle_cli_indication_show, "Display a list of all countries/indications") }; /*! \brief Unload indicators module */ diff --git a/res/res_jabber.c b/res/res_jabber.c index 94649874a..fb118c1ab 100644 --- a/res/res_jabber.c +++ b/res/res_jabber.c @@ -115,12 +115,12 @@ static int aji_register_transport2(void *data, ikspak *pak); */ static struct ast_cli_entry aji_cli[] = { - AST_CLI(aji_do_debug, "Enable jabber debugging"), - AST_CLI(aji_no_debug, "Disable Jabber debug"), - AST_CLI(aji_do_reload, "Reload Jabber configuration"), - AST_CLI(aji_show_clients, "Show state of clients and components"), - AST_CLI(aji_show_buddies, "Show buddy lists of our clients"), - AST_CLI(aji_test, "Shows roster, but is generally used for mog's debugging."), + AST_CLI_DEFINE(aji_do_debug, "Enable jabber debugging"), + AST_CLI_DEFINE(aji_no_debug, "Disable Jabber debug"), + AST_CLI_DEFINE(aji_do_reload, "Reload Jabber configuration"), + AST_CLI_DEFINE(aji_show_clients, "Show state of clients and components"), + AST_CLI_DEFINE(aji_show_buddies, "Show buddy lists of our clients"), + AST_CLI_DEFINE(aji_test, "Shows roster, but is generally used for mog's debugging."), }; static char *app_ajisend = "JabberSend"; diff --git a/res/res_limit.c b/res/res_limit.c index 9d6d2699c..de2c7da9a 100644 --- a/res/res_limit.c +++ b/res/res_limit.c @@ -204,7 +204,7 @@ static char *handle_cli_ulimit(struct ast_cli_entry *e, int cmd, struct ast_cli_ } static struct ast_cli_entry cli_ulimit = - AST_CLI(handle_cli_ulimit, "Set or show process resource limits"); + AST_CLI_DEFINE(handle_cli_ulimit, "Set or show process resource limits"); static int unload_module(void) { diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index eec830627..b074394b3 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -1273,9 +1273,9 @@ static char *handle_cli_moh_show_classes(struct ast_cli_entry *e, int cmd, struc } static struct ast_cli_entry cli_moh[] = { - AST_CLI(handle_cli_moh_reload, "Reload MusicOnHold"), - AST_CLI(handle_cli_moh_show_classes, "List MusicOnHold classes"), - AST_CLI(handle_cli_moh_show_files, "List MusicOnHold file-based classes") + AST_CLI_DEFINE(handle_cli_moh_reload, "Reload MusicOnHold"), + AST_CLI_DEFINE(handle_cli_moh_show_classes, "List MusicOnHold classes"), + AST_CLI_DEFINE(handle_cli_moh_show_files, "List MusicOnHold file-based classes") }; static int init_classes(int reload) diff --git a/res/res_odbc.c b/res/res_odbc.c index 7d27bfd4f..30b084382 100644 --- a/res/res_odbc.c +++ b/res/res_odbc.c @@ -396,7 +396,7 @@ static char *handle_cli_odbc_show(struct ast_cli_entry *e, int cmd, struct ast_c } static struct ast_cli_entry cli_odbc[] = { - AST_CLI(handle_cli_odbc_show, "List ODBC DSN(s)") + AST_CLI_DEFINE(handle_cli_odbc_show, "List ODBC DSN(s)") }; static int odbc_register_class(struct odbc_class *class, int connect) diff --git a/res/res_realtime.c b/res/res_realtime.c index 7806c82f2..8f96c8f54 100644 --- a/res/res_realtime.c +++ b/res/res_realtime.c @@ -117,8 +117,8 @@ static char *cli_realtime_update(struct ast_cli_entry *e, int cmd, struct ast_cl } static struct ast_cli_entry cli_realtime[] = { - AST_CLI(cli_realtime_load, "Used to print out RealTime variables."), - AST_CLI(cli_realtime_update, "Used to update RealTime variables."), + AST_CLI_DEFINE(cli_realtime_load, "Used to print out RealTime variables."), + AST_CLI_DEFINE(cli_realtime_update, "Used to update RealTime variables."), }; static int unload_module(void) |