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
........

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index e11e19a078de5708b670021cd6209041174dac58..45d4541c056748683c0923b126ee094ead1c6079 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -18950,11 +18950,7 @@ static int acf_channel_read(struct ast_channel *chan, const char *funcname, char
        } 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;