kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@97618 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2008-01-09 20:05:45 +00:00
parent 2da89b6120
commit 5583996b22
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
main/cli.c
View File

@@ -1755,10 +1755,11 @@ static int help1(int fd, char *match[], int locked)
ast_cli(fd, "%25.25s %s\n", e->_full_cmd, S_OR(e->summary, "")); ast_cli(fd, "%25.25s %s\n", e->_full_cmd, S_OR(e->summary, ""));
found++; found++;
} }
AST_LIST_UNLOCK(&helpers); if (!locked)
AST_LIST_UNLOCK(&helpers);
if (!locked && !found && matchstr[0]) if (!locked && !found && matchstr[0])
ast_cli(fd, "No such command '%s'.\n", matchstr); ast_cli(fd, "No such command '%s'.\n", matchstr);
return 0; return RESULT_SUCCESS;
} }
static int help_workhorse(int fd, char *match[]) static int help_workhorse(int fd, char *match[])
@@ -1770,6 +1771,7 @@ static int handle_help(int fd, int argc, char *argv[])
{ {
char fullcmd[80]; char fullcmd[80];
struct ast_cli_entry *e; struct ast_cli_entry *e;
int res = RESULT_SUCCESS;
if (argc < 1) if (argc < 1)
return RESULT_SHOWUSAGE; return RESULT_SHOWUSAGE;
@@ -1778,8 +1780,11 @@ static int handle_help(int fd, int argc, char *argv[])
AST_LIST_LOCK(&helpers); AST_LIST_LOCK(&helpers);
e = find_cli(argv + 1, 1); /* try exact match first */ e = find_cli(argv + 1, 1); /* try exact match first */
if (!e) if (!e) {
return help1(fd, argv + 1, 1 /* locked */); res = help1(fd, argv + 1, 1 /* locked */);
AST_LIST_UNLOCK(&helpers);
return res;
}
if (e->usage) if (e->usage)
ast_cli(fd, "%s", e->usage); ast_cli(fd, "%s", e->usage);
else { else {
@@ -1787,7 +1792,7 @@ static int handle_help(int fd, int argc, char *argv[])
ast_cli(fd, "No help text available for '%s'.\n", fullcmd); ast_cli(fd, "No help text available for '%s'.\n", fullcmd);
} }
AST_LIST_UNLOCK(&helpers); AST_LIST_UNLOCK(&helpers);
return RESULT_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)