提交 364e2c53 authored 作者: Michael Jerris's avatar Michael Jerris

variable type fixes and msvc tweaks

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1262 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 f69aafcf
...@@ -665,7 +665,9 @@ SWITCH_DECLARE(void) switch_channel_clear_state_handler(switch_channel *channel, ...@@ -665,7 +665,9 @@ SWITCH_DECLARE(void) switch_channel_clear_state_handler(switch_channel *channel,
new_handlers[i++] = channel->state_handlers[index]; new_handlers[i++] = channel->state_handlers[index];
} }
} }
memset(channel->state_handlers, 0, sizeof(channel->state_handlers)); for (index = 0; index < SWITCH_MAX_STATE_HANDLERS; index++) {
channel->state_handlers[index] = NULL;
}
for (index = 0; index < i; index++) { for (index = 0; index < i; index++) {
channel->state_handlers[index] = new_handlers[i]; channel->state_handlers[index] = new_handlers[i];
} }
......
...@@ -2393,7 +2393,7 @@ static void *SWITCH_THREAD_FUNC switch_core_sql_thread(switch_thread *thread, vo ...@@ -2393,7 +2393,7 @@ static void *SWITCH_THREAD_FUNC switch_core_sql_thread(switch_thread *thread, vo
} }
if (diff < freq) { if (diff < freq) {
diff = (switch_time_now() - last_commit) / 1000; diff = (uint32_t)((switch_time_now() - last_commit) / 1000);
} }
if (trans && (itterations == target || diff >= freq)) { if (trans && (itterations == target || diff >= freq)) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论