merge qwell's CLI verbification work

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

1 files changed, 9 insertions, 3 deletions

diff --git a/res/res_clioriginate.c b/res/res_clioriginate.c
index 454dc7815..44afd7b76 100644
--- a/res/res_clioriginate.c
+++ b/res/res_clioriginate.c
@@ -63,7 +63,11 @@ static char orig_help[] =
 static int handle_orig(int fd, int argc, char *argv[]);
 static char *complete_orig(const char *line, const char *word, int pos, int state);
 
-struct ast_cli_entry cli_orig = { { "originate", NULL }, handle_orig, "Originate a call", orig_help, complete_orig };
+struct ast_cli_entry cli_cliorig[] = {
+	{ { "originate", NULL },
+	handle_orig, "Originate a call",
+	orig_help, complete_orig },
+};
 
 static int orig_app(int fd, const char *chan, const char *app, const char *appdata)
 {
@@ -158,12 +162,14 @@ static char *complete_orig(const char *line, const char *word, int pos, int stat
 
 static int unload_module(void)
 {
-	return ast_cli_unregister(&cli_orig);
+	ast_cli_unregister_multiple(cli_cliorig, sizeof(cli_cliorig) / sizeof(struct ast_cli_entry));
+	return 0;
 }
 
 static int load_module(void)
 {
-	return ast_cli_register(&cli_orig);
+	ast_cli_register_multiple(cli_cliorig, sizeof(cli_cliorig) / sizeof(struct ast_cli_entry));
+	return 0;
 }
 
 AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Call origination from the CLI");