diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-18 18:04:05 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-18 18:04:05 +0000 |
| commit | 9a9c77f53a4c0d8d0c394d88de889a3918943c79 (patch) | |
| tree | e86696e78a1a1e9b6409fcf17009f297a056f613 /channels | |
| parent | 1fa2fc68fe12c449ef33d5a2b0ba92baf338cbca (diff) | |
Merged revisions 114259 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r114259 | mmichelson | 2008-04-18 13:03:06 -0500 (Fri, 18 Apr 2008) | 14 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@114260 f38db490-d61c-443f-a65b-d21fe96a405b
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 1edc53691..16fc3bef1 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -6856,7 +6856,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; @@ -6868,9 +6868,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); |