diff options
author | Mark Michelson <mmichelson@digium.com> | 2008-04-18 18:03:06 +0000 |
---|---|---|
committer | Mark Michelson <mmichelson@digium.com> | 2008-04-18 18:03:06 +0000 |
commit | 0e821d72016baa4cf0a2993522f1f8a9163ff5b7 (patch) | |
tree | 7b75c4c8f28d0f293e742357128e96651f44a6f2 /channels | |
parent | 116859bd19b483b21e05acf2fa11178a4b96da64 (diff) |
Merged revisions 114257 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114257 | mmichelson | 2008-04-18 12:44:29 -0500 (Fri, 18 Apr 2008) | 6 lines
Clearing up error messages so they make a bit more sense. Also removing a redundant error
message.
Issue AST-15
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114259 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_zap.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 61708e45f..579ee43e0 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -6855,7 +6855,7 @@ static void *ss_thread(void *data) } if (res < 0) { - ast_log(LOG_WARNING, "CallerID feed failed: %s\n", strerror(errno)); + ast_log(LOG_WARNING, "CallerID feed failed on channel '%s'\n", chan->name); break; } else if (res) break; @@ -6867,9 +6867,6 @@ static void *ss_thread(void *data) callerid_get(cs, &name, &number, &flags); ast_log(LOG_NOTICE, "CallerID number: %s, name: %s, flags=%d\n", number, name, flags); } - if (res < 0) { - ast_log(LOG_WARNING, "CallerID returned with error on channel '%s'\n", chan->name); - } if (p->cid_signalling == CID_SIG_V23_JP) { res = zt_set_hook(p->subs[SUB_REAL].zfd, ZT_ONHOOK); |