use S_OR in one place
authorLuigi Rizzo <rizzo@icir.org>
Mon, 9 Oct 2006 08:33:52 +0000 (08:33 +0000)
committerLuigi Rizzo <rizzo@icir.org>
Mon, 9 Oct 2006 08:33:52 +0000 (08:33 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44751 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_sip.c

index 75e8b06..45f348a 100644 (file)
@@ -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 */