Resolve a subtle bug where we would never successfully be able to get
authorSean Bright <sean@malleable.com>
Fri, 3 Oct 2008 22:10:18 +0000 (22:10 +0000)
committerSean Bright <sean@malleable.com>
Fri, 3 Oct 2008 22:10:18 +0000 (22:10 +0000)
the first item in the CLI entry list.  This was preventing '!' from
showing up in either 'help' or in tab completion.

(closes issue #13578)
Reported by: mvanbaak

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@146198 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/cli.c

index be62352..7846282 100644 (file)
@@ -1255,11 +1255,11 @@ void ast_builtins_init(void)
 
 static struct ast_cli_entry *cli_next(struct ast_cli_entry *e)
 {
 
 static struct ast_cli_entry *cli_next(struct ast_cli_entry *e)
 {
-       if (e == NULL)
-               e = AST_LIST_FIRST(&helpers);
-       if (e) 
-               e = AST_LIST_NEXT(e, list);
-       return e;
+       if (e) {
+               return AST_LIST_NEXT(e, list);
+       } else {
+               return AST_LIST_FIRST(&helpers);
+       }
 }
 
 /*!
 }
 
 /*!