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 /main | |
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 'main')
-rw-r--r-- | main/callerid.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |