kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-25 15:08:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 97618 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r97618 | qwell | 2008-01-09 14:05:45 -0600 (Wed, 09 Jan 2008) | 1 line

Fix some locking and return value funkiness.  We really shouldn't be unlocking this lock inside of a function, unless we locked it there too.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@97620 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2008-01-09 20:13:14 +00:00
parent 87b92b1020
commit 0c1ded4cb5
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
main/cli.c
View File

@@ -1576,6 +1576,7 @@ static char *handle_help(struct ast_cli_entry *e, int cmd, struct ast_cli_args *
{ {
char fullcmd[80]; char fullcmd[80];
struct ast_cli_entry *my_e; struct ast_cli_entry *my_e;
char *res = CLI_SUCCESS;
if (cmd == CLI_INIT) { if (cmd == CLI_INIT) {
e->command = "help"; e->command = "help";
@@ -1600,8 +1601,11 @@ static char *handle_help(struct ast_cli_entry *e, int cmd, struct ast_cli_args *
AST_RWLIST_RDLOCK(&helpers); AST_RWLIST_RDLOCK(&helpers);
my_e = find_cli(a->argv + 1, 1); /* try exact match first */ my_e = find_cli(a->argv + 1, 1); /* try exact match first */
if (!my_e) if (!my_e) {
return help1(a->fd, a->argv + 1, 1 /* locked */); res = help1(a->fd, a->argv + 1, 1 /* locked */);
AST_RWLIST_UNLOCK(&helpers);
return res;
}
if (my_e->usage) if (my_e->usage)
ast_cli(a->fd, "%s", my_e->usage); ast_cli(a->fd, "%s", my_e->usage);
else { else {
@@ -1609,7 +1613,7 @@ static char *handle_help(struct ast_cli_entry *e, int cmd, struct ast_cli_args *
ast_cli(a->fd, "No help text available for '%s'.\n", fullcmd); ast_cli(a->fd, "No help text available for '%s'.\n", fullcmd);
} }
AST_RWLIST_UNLOCK(&helpers); AST_RWLIST_UNLOCK(&helpers);
return CLI_SUCCESS; return res;
} }
static char *parse_args(const char *s, int *argc, char *argv[], int max, int *trailingwhitespace) static char *parse_args(const char *s, int *argc, char *argv[], int max, int *trailingwhitespace)