[svn-commits] seanbright: branch seanbright/resolve-shadow-warnings r135232 - in /team/sean...

[SVN commits to the Digium repositories]

Author: seanbright
Date: Fri Aug  1 16:10:47 2008
New Revision: 135232

URL: http://svn.digium.com/view/asterisk?view=rev&rev=135232
Log:
Merged revisions 135197 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r135197 | seanbright | 2008-08-01 15:29:26 -0400 (Fri, 01 Aug 2008) | 6 lines

Remove some code that used to do something but does not anymore, mainly
to get rid of a shadow warning (but this seemed legitimate enough to fix
here instead of in my branch).

Thanks to putnopvut for taking a look as well.

........

Modified:
    team/seanbright/resolve-shadow-warnings/   (props changed)
    team/seanbright/resolve-shadow-warnings/channels/chan_mgcp.c

Propchange: team/seanbright/resolve-shadow-warnings/
------------------------------------------------------------------------------
    automerge = ok, sure.

Propchange: team/seanbright/resolve-shadow-warnings/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Aug  1 16:10:47 2008
@@ -1,1 +1,1 @@
-/trunk:1-135179
+/trunk:1-135231

Modified: team/seanbright/resolve-shadow-warnings/channels/chan_mgcp.c
URL: http://svn.digium.com/view/asterisk/team/seanbright/resolve-shadow-warnings/channels/chan_mgcp.c?view=diff&rev=135232&r1=135231&r2=135232
==============================================================================
--- team/seanbright/resolve-shadow-warnings/channels/chan_mgcp.c (original)
+++ team/seanbright/resolve-shadow-warnings/channels/chan_mgcp.c Fri Aug  1 16:10:47 2008
@@ -2169,15 +2169,8 @@
 	char local[256];
 	char tmp[80];
 	int x;
-	/* int capability; */
 	struct mgcp_endpoint *p = sub->parent;
 
-	/* XXX SHADOW - This value isn't used in this function anymore, should this
-	   be setting the global capability?
-	capability = p->capability;
-	if (codecs)
-		capability = codecs;
-	*/
 	if (ast_strlen_zero(sub->cxident) && rtp) {
 		/* We don't have a CXident yet, store the destination and
 		   wait a bit */