[svn-commits] rmudgett: branch rmudgett/digitmanip r270218 - /team/rmudgett/digitmanip/chan...

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Mon Jun 14 10:49:08 2010
New Revision: 270218

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=270218
Log:
S_OR is not needed when the caller->id.tag has already been tested for NULL.

Modified:
    team/rmudgett/digitmanip/channels/chan_dahdi.c

Modified: team/rmudgett/digitmanip/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/digitmanip/channels/chan_dahdi.c?view=diff&rev=270218&r1=270217&r2=270218
==============================================================================
--- team/rmudgett/digitmanip/channels/chan_dahdi.c (original)
+++ team/rmudgett/digitmanip/channels/chan_dahdi.c Mon Jun 14 10:49:08 2010
@@ -2849,7 +2849,7 @@
 	p->cid_ton = caller->id.number_type;
 	p->callingpres = caller->id.number_presentation;
 	if (caller->id.tag) {
-		ast_copy_string(p->cid_tag, S_OR(caller->id.tag, ""), sizeof(p->cid_tag));
+		ast_copy_string(p->cid_tag, caller->id.tag, sizeof(p->cid_tag));
 	}
 	ast_copy_string(p->cid_ani, S_OR(caller->ani, ""), sizeof(p->cid_ani));
 	p->cid_ani2 = caller->ani2;