From 1ce6ea6437258eb66acee424693aad5f39dc90ae Mon Sep 17 00:00:00 2001 From: root Date: Fri, 29 Sep 2006 14:01:57 +0000 Subject: automerge commit git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@43991 f38db490-d61c-443f-a65b-d21fe96a405b --- cli.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cli.c b/cli.c index 371d73e36..4a96624ee 100644 --- a/cli.c +++ b/cli.c @@ -772,8 +772,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", @@ -784,7 +784,7 @@ static int handle_showchan(int fd, int argc, char *argv[]) c->fds[0], c->fin & 0x7fffffff, (c->fin & 0x80000000) ? " (DEBUGGED)" : "", c->fout & 0x7fffffff, (c->fout & 0x80000000) ? " (DEBUGGED)" : "", (long)c->whentohangup, cdrtime, c->_bridge ? c->_bridge->name : "", ast_bridged_channel(c) ? ast_bridged_channel(c)->name : "", - 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 ? (!ast_strlen_zero(c->data) ? c->data : "(Empty)") : "(None)"), (ast_test_flag(c, AST_FLAG_BLOCKING) ? c->blockproc : "(Not Blocking)")); -- cgit v1.2.3