sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "CLI: Remove compatibility code."

This commit is contained in:
Jenkins2 2017-11-28 12:50:28 -06:00 committed by Gerrit Code Review
parent c7aa6e41c1 d12a2ab400
commit f98dad52d2
3 changed files with 1 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/asterisk/cli.h
View File

@ -293,8 +293,6 @@ int ast_cli_unregister_multiple(struct ast_cli_entry *e, int len);
*/
char *ast_cli_generator(const char *, const char *, int);
int ast_cli_generatornummatches(const char *, const char *);
/*!
* \brief Generates a NULL-terminated array of strings that
* 1) begin with the string in the second parameter, and

8
main/asterisk.c
View File

@ -3015,14 +3015,8 @@ static struct ast_vector_string *ast_el_strtoarr(char *buf)
break;
}
/* Older daemons sent duplicates. */
if (AST_VECTOR_GET_CMP(vec, retstr, strcasecmp)) {
continue;
}
retstr = ast_strdup(retstr);
/* Older daemons sent unsorted. */
if (!retstr || AST_VECTOR_ADD_SORTED(vec, retstr, strcasecmp)) {
if (!retstr || AST_VECTOR_APPEND(vec, retstr)) {
ast_free(retstr);
goto vector_cleanup;
}

45
main/cli.c
View File

@ -1336,33 +1336,6 @@ static char *handle_commandmatchesarray(struct ast_cli_entry *e, int cmd, struct
}
static char *handle_commandnummatches(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
int matches = 0;
switch (cmd) {
case CLI_INIT:
e->command = "_command nummatches";
e->usage =
"Usage: _command nummatches \"<line>\" text \n"
" This function is used internally to help with command completion and should.\n"
" never be called by the user directly.\n";
return NULL;
case CLI_GENERATE:
return NULL;
}
if (a->argc != 4)
return CLI_SHOWUSAGE;
matches = ast_cli_generatornummatches(a->argv[2], a->argv[3]);
ast_cli(a->fd, "%d", matches);
return CLI_SUCCESS;
}
struct channel_set_debug_args {
int fd;
int is_off;
@ -1794,7 +1767,6 @@ static char *handle_cli_wait_fullybooted(struct ast_cli_entry *e, int cmd, struc
static char *handle_help(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a);
static struct ast_cli_entry cli_cli[] = {
AST_CLI_DEFINE(handle_commandnummatches, "Returns number of command matches"),
AST_CLI_DEFINE(handle_commandmatchesarray, "Returns command matches array"),
AST_CLI_DEFINE(handle_nodebugchan_deprecated, "Disable debugging on channel(s)"),
@ -2472,23 +2444,6 @@ static char *parse_args(const char *s, int *argc, const char *argv[], int max, i
return duplicate;
}
/*! \brief Return the number of unique matches for the generator */
int ast_cli_generatornummatches(const char *text, const char *word)
{
int matches;
struct ast_vector_string *vec = ast_cli_completion_vector(text, word);
if (!vec) {
return 0;
}
matches = AST_VECTOR_SIZE(vec) - 1;
AST_VECTOR_CALLBACK_VOID(vec, ast_free);
AST_VECTOR_PTR_FREE(vec);
return matches;
}
char **ast_cli_completion_matches(const char *text, const char *word)
{
struct ast_vector_string *vec = ast_cli_completion_vector(text, word);