[svn-commits] kpfleming: branch 1.6.1 r181987 - in /branches/1.6.1: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Fri Mar 13 11:58:00 2009
New Revision: 181987

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

........
  r181985 | kpfleming | 2009-03-13 11:55:38 -0500 (Fri, 13 Mar 2009) | 1 line
  
  improve a bit of suboptimal code
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_sip.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_sip.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=181987&r1=181986&r2=181987
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Fri Mar 13 11:58:00 2009
@@ -18950,11 +18950,7 @@
 	} else if (!strcasecmp(args.param, "peername")) {
 		ast_copy_string(buf, p->peername, buflen);
 	} else if (!strcasecmp(args.param, "t38passthrough")) {
-		if (p->t38.state == T38_DISABLED) {
-			ast_copy_string(buf, "0", sizeof("0"));
-		} else {  /* T38 is offered or enabled in this call */
-			ast_copy_string(buf, "1", sizeof("1"));
-		}
+		ast_copy_string(buf, (p->t38.state == T38_DISABLED) ? "0" : "1", buflen);
 	} else if (!strcasecmp(args.param, "rtpdest")) {
 		struct sockaddr_in sin;