Author: mikej Date: Wed Oct 22 21:39:04 2008 New Revision: 10121 Modified: freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_ivr_originate.c Log: build tweaks Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Wed Oct 22 21:39:04 2008 @@ -1534,14 +1534,14 @@ switch_mutex_lock(channel->profile_mutex); channel->caller_profile->times->progress_media = switch_timestamp_now(); if (channel->caller_profile->originator_caller_profile) { - switch_core_session_t *other_session; - if ((other_session = switch_core_session_locate(channel->caller_profile->originator_caller_profile->uuid))) { + switch_core_session_t *osession; + if ((osession = switch_core_session_locate(channel->caller_profile->originator_caller_profile->uuid))) { switch_channel_t *other_channel; - other_channel = switch_core_session_get_channel(other_session); + other_channel = switch_core_session_get_channel(osession); if (other_channel->caller_profile) { other_channel->caller_profile->times->progress_media = channel->caller_profile->times->progress_media; } - switch_core_session_rwunlock(other_session); + switch_core_session_rwunlock(osession); } channel->caller_profile->originator_caller_profile->times->progress_media = channel->caller_profile->times->progress_media; } Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Wed Oct 22 21:39:04 2008 @@ -878,7 +878,7 @@ for (r = 0; r < or_argc; r++) { uint32_t hups; - char *p, *e = NULL; + char *p, *end = NULL; const char *var_begin, *var_end; reason = SWITCH_CAUSE_NONE; @@ -914,14 +914,14 @@ p = pipe_names[r]; while(p && *p) { if (*p == '[') { - e = switch_find_end_paren(p, '[', ']'); + end = switch_find_end_paren(p, '[', ']'); } - if (e && p && *p == ',') { + if (end && p && *p == ',') { *p = '|'; } - if (p == e) { + if (p == end) { e = NULL; } @@ -937,7 +937,7 @@ for (i = 0; i < and_argc; i++) { char *vdata; - e = NULL; + end = NULL; chan_type = peer_names[i]; while (chan_type && *chan_type && *chan_type == ' ') { @@ -945,12 +945,12 @@ } vdata = chan_type; - e = switch_find_end_paren(vdata, '[', ']'); + end = switch_find_end_paren(vdata, '[', ']'); - if (e) { + if (end) { vdata++; - *e++ = '\0'; - chan_type = e; + *end++ = '\0'; + chan_type = end; } else { vdata = NULL; }