automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43991 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/cli.c b/cli.c
index 371d73e369863c5b2d52123819831ee3d85d535f..4a96624eef9b0e39880dfa96fcc06f2ce3406fdd 100644 (file)
--- 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 : "<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 ? (!ast_strlen_zero(c->data) ? c->data : "(Empty)") : "(None)"),
                (ast_test_flag(c, AST_FLAG_BLOCKING) ? c->blockproc : "(Not Blocking)"));