[svn-commits] rmudgett: branch 1.4 r259531 - /branches/1.4/channels/chan_dahdi.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Tue Apr 27 16:53:07 2010
New Revision: 259531

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=259531
Log:
DAHDI "WARNING" message is confusing and vague

"WARNING[28406]: chan_dahdi.c:6873 ss_thread: CallerID feed failed: Success"

Changed the warning to "Failed to decode CallerID on channel 'name'".  The
message before it is likely more specific about why the CallerID decode
failed.

SWP-501
AST-283

Modified:
    branches/1.4/channels/chan_dahdi.c

Modified: branches/1.4/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/channels/chan_dahdi.c?view=diff&rev=259531&r1=259530&r2=259531
==============================================================================
--- branches/1.4/channels/chan_dahdi.c (original)
+++ branches/1.4/channels/chan_dahdi.c Tue Apr 27 16:53:07 2010
@@ -6683,9 +6683,14 @@
 							} else {
 								res = callerid_feed(cs, buf, res, AST_LAW(p));
 							}
-
 							if (res < 0) {
-								ast_log(LOG_WARNING, "CallerID feed failed on channel '%s'\n", chan->name);
+								/*
+								 * The previous diagnostic message output likely
+								 * explains why it failed.
+								 */
+								ast_log(LOG_WARNING,
+									"Failed to decode CallerID on channel '%s'\n",
+									chan->name);
 								break;
 							} else if (res)
 								break;
@@ -6906,7 +6911,13 @@
 						samples += res;
 						res = callerid_feed(cs, buf, res, AST_LAW(p));
 						if (res < 0) {
-							ast_log(LOG_WARNING, "CallerID feed failed: %s\n", strerror(errno));
+							/*
+							 * The previous diagnostic message output likely
+							 * explains why it failed.
+							 */
+							ast_log(LOG_WARNING,
+								"Failed to decode CallerID on channel '%s'\n",
+								chan->name);
 							break;
 						} else if (res)
 							break;