Merged revisions 214702 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r214702 | tilghman | 2009-08-28 15:14:39 -0500 (Fri, 28 Aug 2009) | 15 lines

  Merged revisions 214701 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r214701 | tilghman | 2009-08-28 15:13:32 -0500 (Fri, 28 Aug 2009) | 8 lines

    Modify comment to be a bit more accurate.
    We have kept this comment around long enough, that it's pretty clear that we're
    keeping the code, because changing the code would require a pretty fundamental
    architectural shift.  We've also taken criticism in some quarters, because it
    was believed that it was referring to the code being nasty.  No, the code isn't
    nasty, just the operation itself is rather odd.  Fixed for eternity (probably
    not).
  ........
................

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

diff --git a/main/channel.c b/main/channel.c
index adfed5bedfb2f27e38d71fc92f41577e44ebcbdf..aa63e2b55c448bfcf0e5231b94b94b2f7e686289 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -4314,10 +4314,10 @@ int ast_do_masquerade(struct ast_channel *original)
        manager_event(EVENT_FLAG_CALL, "Masquerade", "Clone: %s\r\nCloneState: %s\r\nOriginal: %s\r\nOriginalState: %s\r\n",
                      clonechan->name, ast_state2str(clonechan->_state), original->name, ast_state2str(original->_state));
 
-       /* XXX This is a seriously wacked out operation.  We're essentially putting the guts of
-          the clone channel into the original channel.  Start by killing off the original
-          channel's backend.   I'm not sure we're going to keep this function, because
-          while the features are nice, the cost is very high in terms of pure nastiness. XXX */
+       /* XXX This operation is a bit odd.  We're essentially putting the guts of
+        * the clone channel into the original channel.  Start by killing off the
+        * original channel's backend.  While the features are nice, which is the
+        * reason we're keeping it, it's still awesomely weird. XXX */
 
        /* We need the clone's lock, too */
        ast_channel_lock(clonechan);