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

8 files changed, 26 insertions, 26 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)