simplify this code and eliminate the return value cast that is no longer necessary
authorKevin P. Fleming <kpfleming@digium.com>
Wed, 30 Jan 2008 12:48:32 +0000 (12:48 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Wed, 30 Jan 2008 12:48:32 +0000 (12:48 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@101196 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_sip.c

index f9a7069..deeaae1 100644 (file)
@@ -3261,10 +3261,7 @@ static int sip_sendhtml(struct ast_channel *chan, int subclass, const char *data
 /*! \brief Deliver SIP call ID for the call */
 static const char *sip_get_callid(struct ast_channel *chan)
 {
-       struct sip_pvt *p = chan->tech_pvt;
-       if (!p)
-               return "";
-       return ((char *)p->callid);
+       return chan->tech_pvt ? ((struct sip_pvt *) chan->tech_pvt)->callid : "";
 }
 
 /*! \brief Send SIP MESSAGE text within a call