From 0e821d72016baa4cf0a2993522f1f8a9163ff5b7 Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Fri, 18 Apr 2008 18:03:06 +0000 Subject: 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 --- channels/chan_zap.c | 5 +---- main/callerid.c | 4 ++-- 2 files changed, 3 insertions(+), 6 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); diff --git a/main/callerid.c b/main/callerid.c index 03e9c44f1..4dd290e5a 100644 --- a/main/callerid.c +++ b/main/callerid.c @@ -302,7 +302,7 @@ int callerid_feed_jp(struct callerid_state *cid, unsigned char *ubuf, int len, i res = fsk_serial(&cid->fskd, buf, &mylen, &b); if (mylen < 0) { - ast_log(LOG_ERROR, "fsk_serial made mylen < 0 (%d)\n", mylen); + ast_log(LOG_ERROR, "No start bit found in fsk data.\n"); return -1; } @@ -537,7 +537,7 @@ int callerid_feed(struct callerid_state *cid, unsigned char *ubuf, int len, int olen = mylen; res = fsk_serial(&cid->fskd, buf, &mylen, &b); if (mylen < 0) { - ast_log(LOG_ERROR, "fsk_serial made mylen < 0 (%d)\n", mylen); + ast_log(LOG_ERROR, "No start bit found in fsk data.\n"); return -1; } buf += (olen - mylen); -- cgit v1.2.3