Merged revisions 43978 via svnmerge from
authorKevin P. Fleming <kpfleming@digium.com>
Fri, 29 Sep 2006 13:46:33 +0000 (13:46 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Fri, 29 Sep 2006 13:46:33 +0000 (13:46 +0000)
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

main/cli.c

index 54c4088..fb11648 100644 (file)
@@ -724,8 +724,8 @@ static int handle_showchan(int fd, int argc, char *argv[])
                "        Context: %s\n"
                "      Extension: %s\n"
                "       Priority: %d\n"
                "        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",
                "    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->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)"));
        
                ( c-> data ? S_OR(c->data, "(Empty)") : "(None)"),
                (ast_test_flag(c, AST_FLAG_BLOCKING) ? c->blockproc : "(Not Blocking)"));