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

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

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 841aa405bb95d7d709483a0128da1d27178596a8..28bdebe28c236914be24f9df01479dcc97676d42 100644 (file)
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -6683,9 +6683,14 @@ static void *ss_thread(void *data)
                                                        } 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 @@ static void *ss_thread(void *data)
                                                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;