[svn-commits] qwell: trunk r86983 - in /trunk: ./ channels/chan_zap.c

[SVN commits to the Digium repositories]

Author: qwell
Date: Wed Oct 24 15:59:00 2007
New Revision: 86983

URL: http://svn.digium.com/view/asterisk?view=rev&rev=86983
Log:
Merged revisions 86982 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

(closes issue #11079)
........
r86982 | qwell | 2007-10-24 15:56:47 -0500 (Wed, 24 Oct 2007) | 5 lines

Correctly respect hidecalleridname configuration option.
Simplify code slightly in the process.

Issue 11079, reported by ddv2005

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_zap.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_zap.c?view=diff&rev=86983&r1=86982&r2=86983
==============================================================================
--- trunk/channels/chan_zap.c (original)
+++ trunk/channels/chan_zap.c Wed Oct 24 15:59:00 2007
@@ -2336,17 +2336,18 @@
 			c++;
 		else
 			c = dest;
-		if (!p->hidecalleridname)
-			n = ast->cid.cid_name;
-		else
-			n = NULL;
+
+		l = NULL;
+		n = NULL;
+
 		if (!p->hidecallerid) {
 			l = ast->cid.cid_num;
-			n = ast->cid.cid_name;
-		} else {
-			l = NULL;
-			n = NULL;
-		}
+			if (!p->hidecalleridname) {
+				n = ast->cid.cid_name;
+			}
+		}
+
+
 		if (strlen(c) < p->stripmsd) {
 			ast_log(LOG_WARNING, "Number '%s' is shorter than stripmsd (%d)\n", c, p->stripmsd);
 			ast_mutex_unlock(&p->lock);