diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-11-21 08:17:27 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-11-21 08:17:27 -0600 |
| commit | 65606471dd904c08fc89b10d79de340f4ac24d2f (patch) | |
| tree | cba368e32db1131a9c796f8fb233d6223cdea52f | |
| parent | e472aee810e183ef841c6288b6b561af753d99fd (diff) | |
| parent | 69e3fb73d00c9f5c01a7b06eebddddf724efa622 (diff) | |
Merge "cli: Remove silly usage of RAII_VAR." into 15
| -rw-r--r-- | main/cli.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/main/cli.c b/main/cli.c index b7626d4a7..eae14adc4 100644 --- a/main/cli.c +++ b/main/cli.c @@ -959,7 +959,7 @@ static char *handle_chanlist(struct ast_cli_entry *e, int cmd, struct ast_cli_ar #define VERBOSE_FORMAT_STRING "%-20.20s %-20.20s %-16.16s %4d %-7.7s %-12.12s %-25.25s %-15.15s %8.8s %-11.11s %-11.11s %-20.20s\n" #define VERBOSE_FORMAT_STRING2 "%-20.20s %-20.20s %-16.16s %-4.4s %-7.7s %-12.12s %-25.25s %-15.15s %8.8s %-11.11s %-11.11s %-20.20s\n" - RAII_VAR(struct ao2_container *, channels, NULL, ao2_cleanup); + struct ao2_container *channels; struct ao2_iterator it_chans; struct stasis_message *msg; int numchans = 0, concise = 0, verbose = 0, count = 0; @@ -1073,6 +1073,7 @@ static char *handle_chanlist(struct ast_cli_entry *e, int cmd, struct ast_cli_ar ast_cli(a->fd, "%d call%s processed\n", ast_processed_calls(), ESS(ast_processed_calls())); } + ao2_ref(channels, -1); return CLI_SUCCESS; @@ -1685,7 +1686,7 @@ char *ast_cli_complete(const char *word, const char * const choices[], int state char *ast_complete_channels(const char *line, const char *word, int pos, int state, int rpos) { int wordlen = strlen(word), which = 0; - RAII_VAR(struct ao2_container *, cached_channels, NULL, ao2_cleanup); + struct ao2_container *cached_channels; char *ret = NULL; struct ao2_iterator iter; struct stasis_message *msg; @@ -1709,6 +1710,7 @@ char *ast_complete_channels(const char *line, const char *word, int pos, int sta } } ao2_iterator_destroy(&iter); + ao2_ref(cached_channels, -1); return ret; } |