Clearing up error messages so they make a bit more sense. Also removing a redundant...

message.

Issue AST-15

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@114257 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index a7012436893cbc8aa2f2d903ef5cdca16b6665ab..0653a2a368fe7b0acb3f8b790598fd6a83a6c095 100644 (file)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -6223,7 +6223,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;
@@ -6235,9 +6235,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 0ebee03e1ac397fcd7f6daba15cea04aa17719d6..38789c7902b54bf4870df20b6b11dfdce5d7f90a 100644 (file)
--- a/main/callerid.c
+++ b/main/callerid.c
@@ -305,7 +305,7 @@ int callerid_feed_jp(struct callerid_state *cid, unsigned char *ubuf, int len, i
                res = fsk_serie(&cid->fskd, buf, &mylen, &b);
 
                if (mylen < 0) {
-                       ast_log(LOG_ERROR, "fsk_serie made mylen < 0 (%d)\n", mylen);
+                       ast_log(LOG_ERROR, "No start bit found in fsk data.\n");
                        free(obuf);
                        return -1;
                }
@@ -561,7 +561,7 @@ int callerid_feed(struct callerid_state *cid, unsigned char *ubuf, int len, int
                olen = mylen;
                res = fsk_serie(&cid->fskd, buf, &mylen, &b);
                if (mylen < 0) {
-                       ast_log(LOG_ERROR, "fsk_serie made mylen < 0 (%d)\n", mylen);
+                       ast_log(LOG_ERROR, "No start bit found in fsk data.\n");
                        free(obuf);
                        return -1;
                }