From f9191c4c9fbc8092532bafe28a2d3db267c550ab Mon Sep 17 00:00:00 2001 From: russell Date: Tue, 4 Mar 2008 04:31:29 +0000 Subject: Backport a minor bug fix from trunk that I found while doing random code cleanup. Properly break out of the loop when a context isn't found when verify that includes are valid. git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@105591 f38db490-d61c-443f-a65b-d21fe96a405b --- main/pbx.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/main/pbx.c b/main/pbx.c index 05e3b2d45..fe3252c0d 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -6305,12 +6305,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 includes 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 includes nonexistent context '%s'\n", + ast_get_context_name(con), inc->rname); + break; + } + return res; } -- cgit v1.2.3