From: Mark Spencer <markster@digium.com>
Date: Thu, 12 Jan 2006 17:34:10 +0000 (+0000)
Subject: Remove unnecessary (but unexecutable) unlocks, cleanup code (bug #6220)
X-Git-Tag: 1.4.0-beta1~2969
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af155f9c28a83aa6b35a900c56b39def2e9ade28;p=thirdparty%2Fasterisk.git

Remove unnecessary (but unexecutable) unlocks, cleanup code (bug #6220)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8017 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/pbx.c b/pbx.c
index 8c12d556e2..a70f922fca 100644
--- a/pbx.c
+++ b/pbx.c
@@ -5058,7 +5058,7 @@ void __ast_context_destroy(struct ast_context *con, const char *registrar)
 			   is searching through it. */
 			if (ast_mutex_lock(&tmp->lock)) {
 				ast_log(LOG_WARNING, "Unable to lock context lock\n");
-				return;
+				break;
 			}
 			if (tmpl)
 				tmpl->next = tmp->next;
@@ -5105,8 +5105,7 @@ void __ast_context_destroy(struct ast_context *con, const char *registrar)
 				tmpil = NULL;
 				continue;
 			}
-			ast_mutex_unlock(&conlock);
-			return;
+			break;
 		}
 		tmpl = tmp;
 		tmp = tmp->next;