diff options
author | George Joseph <gjoseph@digium.com> | 2017-11-27 12:29:03 -0600 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-11-27 12:29:03 -0600 |
commit | f1f88c40f6ca60d0f4baea3106b61090cfb5ba70 (patch) | |
tree | e724dbdda8fa9dc9b44666467626115f701b3a3e /main | |
parent | 2e3f8784232e785c730787d0d49317eeafa33778 (diff) | |
parent | e07d94111dfdcda5d035c6aab0b213ed2f81a865 (diff) |
Merge "CLI: Refactor ast_cli_display_match_list." into 13
Diffstat (limited to 'main')
-rw-r--r-- | main/asterisk.c | 44 |
1 files changed, 15 insertions, 29 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 964fa254d..b769f6c41 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -3200,51 +3200,37 @@ static int ast_el_sort_compare(const void *i1, const void *i2) return strcasecmp(s1, s2); } -static int ast_cli_display_match_list(char **matches, int len, int max) +static void ast_cli_display_match_list(char **matches, int len, int max) { - int i, idx, limit, count; - int screenwidth = 0; - int numoutput = 0, numoutputline = 0; - - screenwidth = ast_get_termcols(STDOUT_FILENO); - + int idx = 1; /* find out how many entries can be put on one line, with two spaces between strings */ - limit = screenwidth / (max + 2); - if (limit == 0) - limit = 1; + int limit = ast_get_termcols(STDOUT_FILENO) / (max + 2); - /* how many lines of output */ - count = len / limit; - if (count * limit < len) - count++; - - idx = 1; + if (limit == 0) { + limit = 1; + } qsort(&matches[0], (size_t)(len), sizeof(char *), ast_el_sort_compare); - for (; count > 0; count--) { - numoutputline = 0; - for (i = 0; i < limit && matches[idx]; i++, idx++) { + for (;;) { + int numoutputline; + for (numoutputline = 0; numoutputline < limit && matches[idx]; idx++) { /* Don't print dupes */ if ( (matches[idx+1] != NULL && strcmp(matches[idx], matches[idx+1]) == 0 ) ) { - i--; - ast_free(matches[idx]); - matches[idx] = NULL; continue; } - numoutput++; numoutputline++; fprintf(stdout, "%-*s ", max, matches[idx]); - ast_free(matches[idx]); - matches[idx] = NULL; } - if (numoutputline > 0) - fprintf(stdout, "\n"); - } - return numoutput; + if (!numoutputline) { + break; + } + + fprintf(stdout, "\n"); + } } |