diff options
| author | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-27 22:18:09 +0000 |
|---|---|---|
| committer | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-27 22:18:09 +0000 |
| commit | d4fdec1c79446ae6e200048dd9946a8eba38709e (patch) | |
| tree | 79744b0e7fd0bf6dae35abdca2501edb95e5f3fb /channels | |
| parent | dceb3ccc37a10711decda5aceedd5ed34590bd7f (diff) | |
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/trunk@259538 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_dahdi.c | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 187779611..f0d4ad18a 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -1685,9 +1685,12 @@ static int my_get_callerid(void *pvt, char *namebuf, char *numbuf, enum analog_e } else { res = callerid_feed(p->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\n"); return -1; } @@ -9789,9 +9792,14 @@ static void *analog_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; @@ -10056,7 +10064,13 @@ static void *analog_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; @@ -10321,7 +10335,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; |