From eca91ef1f347049d4c672e5974d0a01509a3a774 Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Tue, 2 Nov 2010 21:24:13 +0000 Subject: [PATCH] Make warning message have more useful information in it. Change "Unable to get index, and nullok is not asserted" to "Unable to get index for '' on channel ((), line )". git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@293639 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_dahdi.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index f293703faa..620e3c2ff1 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -1106,7 +1106,8 @@ static int cidrings[NUM_CADENCE_MAX] = { #define CANBUSYDETECT(p) (ISTRUNK(p) || (p->sig & (SIG_EM | SIG_EM_E1 | SIG_SF)) /* || (p->sig & __DAHDI_SIG_FXO) */) #define CANPROGRESSDETECT(p) (ISTRUNK(p) || (p->sig & (SIG_EM | SIG_EM_E1 | SIG_SF)) /* || (p->sig & __DAHDI_SIG_FXO) */) -static int dahdi_get_index(struct ast_channel *ast, struct dahdi_pvt *p, int nullok) +#define dahdi_get_index(ast, p, nullok) _dahdi_get_index(ast, p, nullok, __PRETTY_FUNCTION__, __LINE__) +static int _dahdi_get_index(struct ast_channel *ast, struct dahdi_pvt *p, int nullok, const char *fname, unsigned long line) { int res; if (p->subs[SUB_REAL].owner == ast) @@ -1118,7 +1119,9 @@ static int dahdi_get_index(struct ast_channel *ast, struct dahdi_pvt *p, int nul else { res = -1; if (!nullok) - ast_log(LOG_WARNING, "Unable to get index, and nullok is not asserted\n"); + ast_log(LOG_WARNING, + "Unable to get index for '%s' on channel %d (%s(), line %lu)\n", + ast ? ast->name : "", p->channel, fname, line); } return res; } -- 2.47.3