mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-08-13 09:36:46 +00:00
fix some races and alter core (do a full rebuild)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5751 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
@@ -342,15 +342,17 @@ SWITCH_DECLARE(void) switch_channel_variable_last(switch_channel_t *channel)
|
||||
}
|
||||
}
|
||||
|
||||
SWITCH_DECLARE(switch_hash_index_t *) switch_channel_variable_first(switch_channel_t *channel, switch_memory_pool_t *pool)
|
||||
SWITCH_DECLARE(switch_hash_index_t *) switch_channel_variable_first(switch_channel_t *channel)
|
||||
{
|
||||
switch_hash_index_t *hi;
|
||||
|
||||
assert(channel != NULL);
|
||||
|
||||
if ((hi = switch_hash_first(pool, channel->variables))) {
|
||||
switch_mutex_lock(channel->profile_mutex);
|
||||
switch_mutex_lock(channel->profile_mutex);
|
||||
if ((hi = switch_hash_first(NULL, channel->variables))) {
|
||||
channel->vi = 1;
|
||||
} else {
|
||||
switch_mutex_unlock(channel->profile_mutex);
|
||||
}
|
||||
|
||||
return hi;
|
||||
@@ -818,7 +820,7 @@ SWITCH_DECLARE(void) switch_channel_event_set_data(switch_channel_t *channel, sw
|
||||
}
|
||||
|
||||
/* Index Variables */
|
||||
for (hi = switch_hash_first(switch_core_session_get_pool(channel->session), channel->variables); hi; hi = switch_hash_next(hi)) {
|
||||
for (hi = switch_hash_first(NULL, channel->variables); hi; hi = switch_hash_next(hi)) {
|
||||
char buf[1024];
|
||||
switch_hash_this(hi, &var, NULL, &val);
|
||||
if (var && val) {
|
||||
|
Reference in New Issue
Block a user