kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-10 00:16:50 -07:00
Code Issues Packages Projects Releases Wiki Activity

minor cleanups

Browse Source 
- use appropriate types in some assignments
- use ast_strlen_zero()
- don't manually free cid fields since ast_set_callerid() will handle it


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@39058 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2006-08-07 00:26:11 +00:00
parent ce72e83a39
commit 954ed66a0a
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/chan_zap.c
+7 -14
View File
@@ -6020,7 +6020,7 @@ static void *ss_thread(void *data)
chan->_state == AST_STATE_RINGING)
break; /* Got ring */
}
dtmfbuf[i] = 0;
dtmfbuf[i] = '\0';
zt_setlinear(p->subs[index].zfd, p->subs[index].linear);
/* Got cid and ring. */
ast_log(LOG_DEBUG, "CID got string '%s'\n", dtmfbuf);
@@ -6028,10 +6028,10 @@ static void *ss_thread(void *data)
ast_log(LOG_DEBUG, "CID is '%s', flags %d\n",
dtmfcid, flags);
/* If first byte is NULL, we have no cid */
if (dtmfcid[0])
if (!ast_strlen_zero(dtmfcid))
number = dtmfcid;
else
number = 0;
number = NULL;
/* If set to use V23 Signalling, launch our FSK gubbins and listen for it */
} else if ((p->cid_signalling == CID_SIG_V23) || (p->cid_signalling == CID_SIG_V23_JP)) {
cs = callerid_new(p->cid_signalling);
@@ -6396,24 +6396,17 @@ static void *ss_thread(void *data)
}
else
cs = NULL;
if (number || name) {
if (chan->cid.cid_num) {
free(chan->cid.cid_num);
chan->cid.cid_num = NULL;
}
if (chan->cid.cid_name) {
free(chan->cid.cid_name);
chan->cid.cid_name = NULL;
}
}
if (number)
ast_shrink_phone_number(number);
ast_set_callerid(chan, number, name, number);
if (smdi_msg)
ASTOBJ_UNREF(smdi_msg, ast_smdi_md_message_destroy);
if (cs)
callerid_free(cs);
ast_setstate(chan, AST_STATE_RING);
chan->rings = 1;
p->ringt = p->ringt_base;