Use proper type to represent the group variable (issue #8025 reported by makoto)

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 859b30312812206ce03299485e8c61e573f1990d..20a11d289bef5a16289c67d75c7888def9a74a0c 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -7743,7 +7743,7 @@ static int sip_show_objects(int fd, int argc, char *argv[])
        return RESULT_SUCCESS;
 }
 /*! \brief  print_group: Print call group and pickup group ---*/
-static void  print_group(int fd, unsigned int group, int crlf) 
+static void  print_group(int fd, ast_group_t group, int crlf) 
 {
        char buf[256];
        ast_cli(fd, crlf ? "%s\r\n" : "%s\n", ast_print_group(buf, sizeof(buf), group) );

diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index ae2f7a7814557ffdad972642e39f0067d1dbaf81..38b33ed2d31859b21f3bca7516b2b769f56faba6 100644 (file)
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -389,8 +389,8 @@ struct ast_channel {
        /* A linked list for variables */
        struct varshead varshead;
 
-       unsigned int callgroup;
-       unsigned int pickupgroup;
+       ast_group_t callgroup;
+       ast_group_t pickupgroup;
 
        /*! channel flags of AST_FLAG_ type */
        unsigned int flags;