[asterisk-commits] oej: branch oej/kill-the-user r97621 - in /team/oej/kill-the-user: ./ main/cli.c

[SVN commits to the Asterisk project]

Author: oej
Date: Wed Jan  9 14:21:54 2008
New Revision: 97621

URL: http://svn.digium.com/view/asterisk?view=rev&rev=97621
Log:
Hmm. why did automerge stop here? No conflicts...

Modified:
    team/oej/kill-the-user/   (props changed)
    team/oej/kill-the-user/main/cli.c

Propchange: team/oej/kill-the-user/
------------------------------------------------------------------------------
--- automerge (original)
+++ automerge Wed Jan  9 14:21:54 2008
@@ -1,1 +1,1 @@
-Sponsor chan_sip3 - visit http://www.codename-pineapple.org
+http://www.codename-pineapple.org/

Propchange: team/oej/kill-the-user/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/oej/kill-the-user/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jan  9 14:21:54 2008
@@ -1,1 +1,1 @@
-/trunk:1-97601
+/trunk:1-97620

Modified: team/oej/kill-the-user/main/cli.c
URL: http://svn.digium.com/view/asterisk/team/oej/kill-the-user/main/cli.c?view=diff&rev=97621&r1=97620&r2=97621
==============================================================================
--- team/oej/kill-the-user/main/cli.c (original)
+++ team/oej/kill-the-user/main/cli.c Wed Jan  9 14:21:54 2008
@@ -1576,6 +1576,7 @@
 {
 	char fullcmd[80];
 	struct ast_cli_entry *my_e;
+	char *res = CLI_SUCCESS;
 
 	if (cmd == CLI_INIT) {
 		e->command = "help";
@@ -1600,8 +1601,11 @@
 
 	AST_RWLIST_RDLOCK(&helpers);
 	my_e = find_cli(a->argv + 1, 1);	/* try exact match first */
-	if (!my_e)
-		return help1(a->fd, a->argv + 1, 1 /* locked */);
+	if (!my_e) {
+		res = help1(a->fd, a->argv + 1, 1 /* locked */);
+		AST_RWLIST_UNLOCK(&helpers);
+		return res;
+	}
 	if (my_e->usage)
 		ast_cli(a->fd, "%s", my_e->usage);
 	else {
@@ -1609,7 +1613,7 @@
 		ast_cli(a->fd, "No help text available for '%s'.\n", fullcmd);
 	}
 	AST_RWLIST_UNLOCK(&helpers);
-	return CLI_SUCCESS;
+	return res;
 }
 
 static char *parse_args(const char *s, int *argc, char *argv[], int max, int *trailingwhitespace)