diff options
| author | Russell Bryant <russell@russellbryant.com> | 2008-03-04 04:28:48 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2008-03-04 04:28:48 +0000 |
| commit | 6d3b25158825ffa09cc4eedf8e67f5d80642c063 (patch) | |
| tree | 1e88d28d52a7519f1c96b7003d73f7f0174fc876 /main | |
| parent | 71173779dca6f759112e0bb5b430a99ce198cf19 (diff) | |
- Add curly braces around the while loop
- Properly break out of the loop on error when an included context is not found
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@105590 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/pbx.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/main/pbx.c b/main/pbx.c index ff39a8c66..f638a4953 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -7758,12 +7758,16 @@ int ast_context_verify_includes(struct ast_context *con) struct ast_include *inc = NULL; int res = 0; - while ( (inc = ast_walk_context_includes(con, inc)) ) - if (!ast_context_find(inc->rname)) { - res = -1; - ast_log(LOG_WARNING, "Context '%s' tries to include nonexistent context '%s'\n", - ast_get_context_name(con), inc->rname); - } + while ( (inc = ast_walk_context_includes(con, inc)) ) { + if (ast_context_find(inc->rname)) + continue; + + res = -1; + ast_log(LOG_WARNING, "Context '%s' tries to include nonexistent context '%s'\n", + ast_get_context_name(con), inc->rname); + break; + } + return res; } |