diff options
| author | Joshua Colp <jcolp@digium.com> | 2006-09-26 20:51:36 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2006-09-26 20:51:36 +0000 |
| commit | 98873d34bdbeae77f539d7d64cb57c0a43a49c27 (patch) | |
| tree | 681f0f9d281cafbb2cd86570f3c2b858258e7168 | |
| parent | d34c8392929040df69924c14296fe83c12409f79 (diff) | |
Merged revisions 43707 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r43707 | file | 2006-09-26 16:47:26 -0400 (Tue, 26 Sep 2006) | 10 lines
Merged revisions 43705 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r43705 | file | 2006-09-26 16:38:06 -0400 (Tue, 26 Sep 2006) | 2 lines
Use proper type to represent the group variable (issue #8025 reported by makoto)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43709 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | .cleancount | 2 | ||||
| -rw-r--r-- | channels/chan_sip.c | 4 | ||||
| -rw-r--r-- | include/asterisk/channel.h | 4 | ||||
| -rw-r--r-- | main/cli.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/.cleancount b/.cleancount index a45fd52cc..7273c0fa8 100644 --- a/.cleancount +++ b/.cleancount @@ -1 +1 @@ -24 +25 diff --git a/channels/chan_sip.c b/channels/chan_sip.c index e3c7f3b68..34ac44678 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -1305,7 +1305,7 @@ static int _sip_show_peers(int fd, int *total, struct mansession *s, struct mess static int manager_sip_show_peers( struct mansession *s, struct message *m ); static int sip_show_peers(int fd, int argc, char *argv[]); static int sip_show_objects(int fd, int argc, char *argv[]); -static void print_group(int fd, unsigned int group, int crlf); +static void print_group(int fd, ast_group_t group, int crlf); static const char *dtmfmode2str(int mode) attribute_const; static const char *insecure2str(int port, int invite) attribute_const; static void cleanup_stale_contexts(char *new, char *old); @@ -9371,7 +9371,7 @@ static int sip_show_objects(int fd, int argc, char *argv[]) return RESULT_SUCCESS; } /*! \brief 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 4f636d185..bf67fc9d2 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -407,8 +407,8 @@ struct ast_channel { unsigned int fout; int hangupcause; /*!< Why is the channel hanged up. See causes.h */ struct varshead varshead; /*!< A linked list for channel variables */ - unsigned int callgroup; /*!< Call group for call pickups */ - unsigned int pickupgroup; /*!< Pickup group - which calls groups can be picked up? */ + ast_group_t callgroup; /*!< Call group for call pickups */ + ast_group_t pickupgroup; /*!< Pickup group - which calls groups can be picked up? */ unsigned int flags; /*!< channel flags of AST_FLAG_ type */ unsigned short transfercapability; /*!< ISDN Transfer Capbility - AST_FLAG_DIGITAL is not enough */ AST_LIST_HEAD_NOLOCK(, ast_frame) readq; diff --git a/main/cli.c b/main/cli.c index 698f249f4..d45e3ff4e 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: %lld\n" + " Pickup Group: %lld\n" " Application: %s\n" " Data: %s\n" " Blocking in: %s\n", |