[asterisk-commits] rizzo: trunk r44751 - /trunk/channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: rizzo
Date: Mon Oct  9 03:33:52 2006
New Revision: 44751

URL: http://svn.digium.com/view/asterisk?rev=44751&view=rev
Log:
use S_OR in one place


Modified:
    trunk/channels/chan_sip.c

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?rev=44751&r1=44750&r2=44751&view=diff
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Mon Oct  9 03:33:52 2006
@@ -14311,7 +14311,7 @@
 			append_history(p, "Rx", "%s / %s / %s", req.data, get_header(&req, "CSeq"), req.rlPart2);
 
 		if (!lockretry) {
-			ast_log(LOG_ERROR, "We could NOT get the channel lock for %s! \n", p->owner->name ? p->owner->name : "- no channel name ??? - ");
+			ast_log(LOG_ERROR, "We could NOT get the channel lock for %s! \n", S_OR(p->owner->name, "- no channel name ??? - "));
 			ast_log(LOG_ERROR, "SIP transaction failed: %s \n", p->callid);
 			transmit_response(p, "503 Server error", &req);	/* We must respond according to RFC 3261 sec 12.2 */
 					/* XXX We could add retry-after to make sure they come back */