diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2006-09-29 13:46:33 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-09-29 13:46:33 +0000 |
| commit | 9892363a642eeae6313c6be127dbd07211cbeca0 (patch) | |
| tree | b7db4546d0ffa2f1ad137959498ab4e4abf1a1f9 /main/cli.c | |
| parent | 6c0391c42a0f62d1575128a6a57d1a5822a87364 (diff) | |
Merged revisions 43978 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r43978 | kpfleming | 2006-09-29 08:45:40 -0500 (Fri, 29 Sep 2006) | 2 lines
proper fix for ast_group_t change
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43979 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/cli.c')
| -rw-r--r-- | main/cli.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/cli.c b/main/cli.c index 54c4088ea..fb11648eb 100644 --- a/main/cli.c +++ b/main/cli.c @@ -724,8 +724,8 @@ static int handle_showchan(int fd, int argc, char *argv[]) " Context: %s\n" " Extension: %s\n" " Priority: %d\n" - " Call Group: %d\n" - " Pickup Group: %d\n" + " Call Group: %llu\n" + " Pickup Group: %llu\n" " Application: %s\n" " Data: %s\n" " Blocking in: %s\n", @@ -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, (int) c->callgroup, (int) c->pickupgroup, ( c->appl ? c->appl : "(N/A)" ), + c->context, c->exten, c->priority, c->callgroup, 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)")); |