normalize/simplify a bit of the command completion code.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@15856 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2006-03-28 23:20:13 +00:00
parent fb75d34e70
commit b94f6a6df4

View File

@@ -9394,20 +9394,19 @@ static int start_pri(struct zt_pri *pri)
static char *complete_span_helper(const char *line, const char *word, int pos, int state, int rpos)
{
int span=1;
char tmp[50];
int which, span;
char *ret = NULL;
if (pos != rpos)
return 0;
while(span <= NUM_SPANS) {
if (span > state && pris[span-1].pri)
return ret;
for (which = span = 0; span < NUM_SPANS; span++) {
if (pris[span].pri && ++which > state) {
asprintf(&ret, "%d", span + 1); /* user indexes start from 1 */
break;
span++;
}
}
if (span <= NUM_SPANS) {
snprintf(tmp, sizeof(tmp), "%d", span);
return ast_strdup(tmp);
} else
return NULL;
return ret;
}
static char *complete_span_4(const char *line, const char *word, int pos, int state)