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 /res/parking | |
| 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 'res/parking')
| -rw-r--r-- | res/parking/parking_bridge.c | 2 | ||||
| -rw-r--r-- | res/parking/parking_bridge_features.c | 6 | ||||
| -rw-r--r-- | res/parking/parking_manager.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/res/parking/parking_bridge.c b/res/parking/parking_bridge.c index e1fd5f8fe..4f7198b4f 100644 --- a/res/parking/parking_bridge.c +++ b/res/parking/parking_bridge.c @@ -304,7 +304,7 @@ static int bridge_parking_push(struct ast_bridge_parking *self, struct ast_bridg if (!strcmp(blind_transfer, ast_channel_name(bridge_channel->chan)) && !park_datastore->silence_announce) { char saynum_buf[16]; - snprintf(saynum_buf, sizeof(saynum_buf), "%u %u", 0, pu->parking_space); + snprintf(saynum_buf, sizeof(saynum_buf), "%d %d", 0, pu->parking_space); ast_bridge_channel_queue_playfile(bridge_channel, say_parking_space, saynum_buf, NULL); } diff --git a/res/parking/parking_bridge_features.c b/res/parking/parking_bridge_features.c index 9840b294c..f9295ccc3 100644 --- a/res/parking/parking_bridge_features.c +++ b/res/parking/parking_bridge_features.c @@ -115,7 +115,7 @@ static void parker_parked_call_message_response(struct ast_parked_call_payload * if (message->event_type == PARKED_CALL) { /* queue the saynum on the bridge channel and hangup */ - snprintf(saynum_buf, sizeof(saynum_buf), "%u %u", data->hangup_after, message->parkingspace); + snprintf(saynum_buf, sizeof(saynum_buf), "%d %u", data->hangup_after, message->parkingspace); ast_bridge_channel_queue_playfile(bridge_channel, say_parking_space, saynum_buf, NULL); wipe_subscription_datastore(bridge_channel->chan); } @@ -609,8 +609,8 @@ abandon_extension_creation: void say_parking_space(struct ast_bridge_channel *bridge_channel, const char *payload) { - int numeric_value; - int hangup_after; + unsigned int numeric_value; + unsigned int hangup_after; if (sscanf(payload, "%u %u", &hangup_after, &numeric_value) != 2) { /* If say_parking_space is called with a non-numeric string, we have a problem. */ diff --git a/res/parking/parking_manager.c b/res/parking/parking_manager.c index 55ce85a35..92854feb2 100644 --- a/res/parking/parking_manager.c +++ b/res/parking/parking_manager.c @@ -389,7 +389,7 @@ static int manager_append_event_parking_lot_data_cb(void *obj, void *arg, void * "Name: %s\r\n" "StartSpace: %d\r\n" "StopSpace: %d\r\n" - "Timeout: %d\r\n" + "Timeout: %u\r\n" "%s" /* The Action ID */ "\r\n", curlot->name, |