From: Luigi Rizzo Date: Mon, 9 Oct 2006 08:33:52 +0000 (+0000) Subject: use S_OR in one place X-Git-Tag: 1.6.0-beta1~3^2~4467 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=69af2cea2f05081261d0a198ad9edbffd3e972de;p=thirdparty%2Fasterisk.git use S_OR in one place git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44751 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 75e8b0629a..45f348a591 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -14311,7 +14311,7 @@ retrylock: 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 */