kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-06-21 15:02:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 293648 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r293648 | rmudgett | 2010-11-02 16:29:25 -0500 (Tue, 02 Nov 2010) | 20 lines
  
  Merged revisions 293647 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r293647 | rmudgett | 2010-11-02 16:26:30 -0500 (Tue, 02 Nov 2010) | 13 lines
    
    Merged revisions 293639 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r293639 | rmudgett | 2010-11-02 16:24:13 -0500 (Tue, 02 Nov 2010) | 6 lines
      
      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/trunk@293649 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2010-11-02 21:31:17 +00:00
parent 0aacbecacc
commit ed500a9e99
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/chan_dahdi.c
+5 -2
View File
@@ -3539,7 +3539,8 @@ static struct analog_callback dahdi_analog_callbacks =
/*! Round robin search locations. */
static struct dahdi_pvt *round_robin[32];
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)
@@ -3551,7 +3552,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;
}
channels/sig_analog.c
+5 -2
View File
@@ -373,7 +373,8 @@ static int analog_send_callerid(struct analog_pvt *p, int cwcid, struct ast_part
return 0;
}
static int analog_get_index(struct ast_channel *ast, struct analog_pvt *p, int nullok)
#define analog_get_index(ast, p, nullok) _analog_get_index(ast, p, nullok, __PRETTY_FUNCTION__, __LINE__)
static int _analog_get_index(struct ast_channel *ast, struct analog_pvt *p, int nullok, const char *fname, unsigned long line)
{
int res;
if (p->subs[ANALOG_SUB_REAL].owner == ast) {
@@ -385,7 +386,9 @@ static int analog_get_index(struct ast_channel *ast, struct analog_pvt *p, int n
} 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;