diff options
| author | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-27 22:37:40 +0000 |
|---|---|---|
| committer | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-27 22:37:40 +0000 |
| commit | 969220ea8e0e25217dcdc884e763f61ee04fc949 (patch) | |
| tree | 56ef0ce990525a8b23d3cb3016e75cbcbde6a6e8 | |
| parent | 38e861f8727c441d284bcefce7969b231891c877 (diff) | |
Merged revisions 259538 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r259538 | rmudgett | 2010-04-27 17:18:09 -0500 (Tue, 27 Apr 2010) | 18 lines
Merged revisions 259531 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r259531 | rmudgett | 2010-04-27 16:53:07 -0500 (Tue, 27 Apr 2010) | 11 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@259615 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_dahdi.c | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index f9e3134d3..116270816 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -7341,9 +7341,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; @@ -7610,7 +7615,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; @@ -7888,7 +7899,11 @@ static void *mwi_thread(void *data) samples += res; if (!spill_done) { if ((spill_result = callerid_feed(cs, mtd->buf, res, AST_LAW(mtd->pvt))) < 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\n"); break; } else if (spill_result) { spill_done = 1; |