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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114260 65c4cc65-6c06-0410-ace0-fbb531ad65f3

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);

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);