build tweaks

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10121 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/switch_channel.c b/src/switch_channel.c
index d471dcd2ad23fd6e7294c17ee59c027988de8876..9ad01c14cc26192ba3244fb1a4f10a42aef256a9 100644 (file)
--- a/src/switch_channel.c
+++ b/src/switch_channel.c
@@ -1534,14 +1534,14 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_pre_answered(switch_
                        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;
                        }

diff --git a/src/switch_ivr_originate.c b/src/switch_ivr_originate.c
index 5b0fa0db0142f0943be2f3376ab7b343497e17a3..2ab8ea3b3cbf30ea8a57684e6f8f8b122b47e752 100644 (file)
--- a/src/switch_ivr_originate.c
+++ b/src/switch_ivr_originate.c
@@ -878,7 +878,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
 
                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 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
                        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 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
 
                        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 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
                                }
 
                                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;
                                }