[asterisk-commits] alecdavis: branch 1.4 r287684 - /branches/1.4/main/channel.c

[SVN commits to the Asterisk project]

Author: alecdavis
Date: Mon Sep 20 18:15:25 2010
New Revision: 287684

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=287684
Log:
ast_channel_masquerade: remove extra else if

(closes issue #17363,#16057)

Reported by: amorsen;davidw,alecdavis
Patches: 
      based on bug16057.diff4.txt uploaded by alecdavis (license 585)
Tested by: ramonpeek, davidw, alecdavis


Modified:
    branches/1.4/main/channel.c

Modified: branches/1.4/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/main/channel.c?view=diff&rev=287684&r1=287683&r2=287684
==============================================================================
--- branches/1.4/main/channel.c (original)
+++ branches/1.4/main/channel.c Mon Sep 20 18:15:25 2010
@@ -3931,10 +3931,9 @@
 	} else if (clone->masq) {
 		ast_log(LOG_WARNING, "%s is already going to masquerade as %s\n",
 			clone->masq->name, clone->name);
-	} else if (clone->masqr) {
+	} else { /* (clone->masqr) */
 		ast_log(LOG_WARNING, "%s is already going to masquerade as %s\n",
 			clone->name, clone->masqr->name);
-	} else {
 	}
 
 	ast_channel_unlock(clone);