[asterisk-commits] mmichelson: branch 1.6.0 r114260 - in /branches/1.6.0: ./ channels/ main/

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Fri Apr 18 13:04:05 2008
New Revision: 114260

URL: http://svn.digium.com/view/asterisk?view=rev&rev=114260
Log:
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


........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_zap.c
    branches/1.6.0/main/callerid.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_zap.c?view=diff&rev=114260&r1=114259&r2=114260
==============================================================================
--- branches/1.6.0/channels/chan_zap.c (original)
+++ branches/1.6.0/channels/chan_zap.c Fri Apr 18 13:04:05 2008
@@ -6856,7 +6856,7 @@
 							}
 
 							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 @@
 					if (res == 1) {
 						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) {

Modified: branches/1.6.0/main/callerid.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/callerid.c?view=diff&rev=114260&r1=114259&r2=114260
==============================================================================
--- branches/1.6.0/main/callerid.c (original)
+++ branches/1.6.0/main/callerid.c Fri Apr 18 13:04:05 2008
@@ -302,7 +302,7 @@
 		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 @@
 		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);