diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-28 16:43:40 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-28 16:43:40 +0000 |
| commit | 5a8f1f7f8a11912aaca75d1f6fb6d4a4bd3b3151 (patch) | |
| tree | 57123399a412128c84b0c56b7f277b8a6c048210 /main/cli.c | |
| parent | 3110b04b51bcc5b9b870ee3d75492f45d5a8d1d9 (diff) | |
Merged revisions 43898 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r43898 | kpfleming | 2006-09-28 11:38:25 -0500 (Thu, 28 Sep 2006) | 10 lines
Merged revisions 43895 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r43895 | kpfleming | 2006-09-28 11:32:44 -0500 (Thu, 28 Sep 2006) | 2 lines
eliminate compiler warning introduced by recent changes
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43900 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/cli.c')
| -rw-r--r-- | main/cli.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/cli.c b/main/cli.c index d45e3ff4e..a5225e7b4 100644 --- a/main/cli.c +++ b/main/cli.c @@ -743,7 +743,7 @@ static int handle_showchan(int fd, int argc, char *argv[]) c->fout & ~DEBUGCHAN_FLAG, (c->fout & DEBUGCHAN_FLAG) ? " (DEBUGGED)" : "", (long)c->whentohangup, cdrtime, c->_bridge ? c->_bridge->name : "<none>", ast_bridged_channel(c) ? ast_bridged_channel(c)->name : "<none>", - c->context, c->exten, c->priority, c->callgroup, c->pickupgroup, ( c->appl ? c->appl : "(N/A)" ), + c->context, c->exten, c->priority, (int) c->callgroup, (int) c->pickupgroup, ( c->appl ? c->appl : "(N/A)" ), ( c-> data ? S_OR(c->data, "(Empty)") : "(None)"), (ast_test_flag(c, AST_FLAG_BLOCKING) ? c->blockproc : "(Not Blocking)")); |