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

13 files changed, 28 insertions, 28 deletions

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)