From 89a2799c98603c826a91c41e062e5d53584cb0bc Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Fri, 13 Feb 2009 19:03:34 +0000 Subject: [PATCH] fix msvc 2005 core warnings git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11991 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/include/switch_resample.h | 2 +- src/switch_event.c | 2 +- src/switch_resample.c | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/include/switch_resample.h b/src/include/switch_resample.h index d5f638b83b..7f4ce7dbbf 100644 --- a/src/include/switch_resample.h +++ b/src/include/switch_resample.h @@ -171,7 +171,7 @@ SWITCH_DECLARE(void) switch_change_sln_volume(int16_t *data, uint32_t samples, i SWITCH_DECLARE(uint32_t) switch_merge_sln(int16_t *data, uint32_t samples, int16_t *other_data, uint32_t other_samples); -SWITCH_DECLARE(void) switch_mux_channels(int16_t *data, uint32_t samples, uint32_t channels); +SWITCH_DECLARE(void) switch_mux_channels(int16_t *data, switch_size_t samples, uint32_t channels); SWITCH_END_EXTERN_C #endif diff --git a/src/switch_event.c b/src/switch_event.c index b3dbd2b660..a74490da6c 100644 --- a/src/switch_event.c +++ b/src/switch_event.c @@ -933,7 +933,7 @@ static switch_xml_t add_xml_header(switch_xml_t xml, char *name, char *value, in switch_xml_t header = switch_xml_add_child_d(xml, name, offset); if (header) { - int encode_len = (strlen(value) * 3) + 1; + switch_size_t encode_len = (strlen(value) * 3) + 1; char *encode_buf = malloc(encode_len); switch_assert(encode_buf); diff --git a/src/switch_resample.c b/src/switch_resample.c index 07d43f0302..ba8cd6e639 100644 --- a/src/switch_resample.c +++ b/src/switch_resample.c @@ -239,7 +239,7 @@ SWITCH_DECLARE(void) switch_generate_sln_silence(int16_t *data, uint32_t samples for (i = 0; i < samples; i++, sum_rnd = 0) { for (x = 0; x < 10; x++) { - rnd += (int16_t)((x + i) * rnd2); + rnd = rnd + (int16_t)((x + i) * rnd2); sum_rnd += rnd; } switch_normalize_to_16bit(sum_rnd); @@ -271,11 +271,12 @@ SWITCH_DECLARE(uint32_t) switch_merge_sln(int16_t *data, uint32_t samples, int16 return x; } -SWITCH_DECLARE(void) switch_mux_channels(int16_t *data, uint32_t samples, uint32_t channels) +SWITCH_DECLARE(void) switch_mux_channels(int16_t *data, switch_size_t samples, uint32_t channels) { int16_t *buf; switch_size_t len = samples * sizeof(int16_t); - uint32_t i = 0, j = 0, k = 0; + switch_size_t i = 0; + uint32_t j = 0, k = 0; switch_zmalloc(buf, len);