[asterisk-commits] qwell: trunk r97623 - in /trunk: ./ main/cli.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Wed Jan  9 14:30:54 2008
New Revision: 97623

URL: http://svn.digium.com/view/asterisk?view=rev&rev=97623
Log:
Merged revisions 97622 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

(closes issue #11718)
........
r97622 | qwell | 2008-01-09 14:28:43 -0600 (Wed, 09 Jan 2008) | 5 lines

Correctly display a message if a command could not be found.
Also fix a comment which may have led to this happening.

Issue 11718, reported by kshumard.

........

Modified:
    trunk/   (props changed)
    trunk/main/cli.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/cli.c
URL: http://svn.digium.com/view/asterisk/trunk/main/cli.c?view=diff&rev=97623&r1=97622&r2=97623
==============================================================================
--- trunk/main/cli.c (original)
+++ trunk/main/cli.c Wed Jan  9 14:30:54 2008
@@ -1535,10 +1535,8 @@
 }
 
 
-/*! \brief helper for final part of
- * handle_help. if locked = 0 it's just "help_workhorse",
- * otherwise assume the list is already locked and print
- * an error message if not found.
+/*! \brief helper for final part of handle_help
+ *  if locked = 1, assume the list is already locked
  */
 static char *help1(int fd, char *match[], int locked)
 {
@@ -1567,7 +1565,7 @@
 	}
 	if (!locked)
 		AST_RWLIST_UNLOCK(&helpers);
-	if (!locked && !found && matchstr[0])
+	if (!found && matchstr[0])
 		ast_cli(fd, "No such command '%s'.\n", matchstr);
 	return CLI_SUCCESS;
 }