diff options
| author | Kinsey Moore <kmoore@digium.com> | 2014-05-09 22:49:26 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2014-05-09 22:49:26 +0000 |
| commit | abd3e4040bd76058d0148884879858894258fb9f (patch) | |
| tree | c5695a0880c4928731b1aa864f862c6cffa57428 /apps/app_confbridge.c | |
| parent | f3b55da1b855b12a59f84fd9bf6768eb101cd910 (diff) | |
Allow Asterisk to compile under GCC 4.10
This resolves a large number of compiler warnings from GCC 4.10 which
cause the build to fail under dev mode. The vast majority are
signed/unsigned mismatches in printf-style format strings.
........
Merged revisions 413586 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 413587 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 413588 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@413589 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_confbridge.c')
| -rw-r--r-- | apps/app_confbridge.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c index 48573d54c..bf8773d32 100644 --- a/apps/app_confbridge.c +++ b/apps/app_confbridge.c @@ -2392,7 +2392,7 @@ static char *handle_cli_confbridge_list(struct ast_cli_entry *e, int cmd, struct ast_cli(a->fd, "================================ ====== ====== ========\n"); iter = ao2_iterator_init(conference_bridges, 0); while ((conference = ao2_iterator_next(&iter))) { - ast_cli(a->fd, "%-32s %6i %6i %s\n", conference->name, conference->activeusers + conference->waitingusers, conference->markedusers, (conference->locked ? "locked" : "unlocked")); + ast_cli(a->fd, "%-32s %6u %6u %s\n", conference->name, conference->activeusers + conference->waitingusers, conference->markedusers, (conference->locked ? "locked" : "unlocked")); ao2_ref(conference, -1); } ao2_iterator_destroy(&iter); @@ -2848,8 +2848,8 @@ static int action_confbridgelistrooms(struct mansession *s, const struct message "Event: ConfbridgeListRooms\r\n" "%s" "Conference: %s\r\n" - "Parties: %d\r\n" - "Marked: %d\r\n" + "Parties: %u\r\n" + "Marked: %u\r\n" "Locked: %s\r\n" "\r\n", id_text, |