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 '<channel-name>' on channel <number> (<function>(), line
<number>)".


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@293639 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.4
Richard Mudgett 15 years ago
parent 0761ad1f97
commit eca91ef1f3

@ -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;
}

Loading…
Cancel
Save