Changeset 5170 for pjproject/trunk/pjsip-apps/src/samples/stateful_proxy.c

Timestamp:

Aug 25, 2015 8:45:46 AM (9 years ago)

Author:

nanang

Message:

Re #1881: Fixed compile warnings on VS2015 about declaration hides previous declaration.

File:

• pjproject/trunk/pjsip-apps/src/samples/stateful_proxy.c (modified) (2 diffs)

pjproject/trunk/pjsip-apps/src/samples/stateful_proxy.c

@@ -248 +248 @@
         /* This is CANCEL request */
         pjsip_transaction *invite_uas;
-        struct uas_data *uas_data;
+        struct uas_data *uas_data2;
         pj_str_t key;
         
@@ -270 +270 @@
          * we receive final response from the UAC INVITE transaction.
          */
-        uas_data = (struct uas_data*) invite_uas->mod_data[mod_tu.id];
-        if (uas_data->uac_tsx && uas_data->uac_tsx->status_code < 200) {
+        uas_data2 = (struct uas_data*) invite_uas->mod_data[mod_tu.id];
+        if (uas_data2->uac_tsx && uas_data2->uac_tsx->status_code < 200) {
             pjsip_tx_data *cancel;
 
-            pj_grp_lock_acquire(uas_data->uac_tsx->grp_lock);
-
-            pjsip_endpt_create_cancel(global.endpt, uas_data->uac_tsx->last_tx,
+            pj_grp_lock_acquire(uas_data2->uac_tsx->grp_lock);
+
+            pjsip_endpt_create_cancel(global.endpt, uas_data2->uac_tsx->last_tx,
                                       &cancel);
             pjsip_endpt_send_request(global.endpt, cancel, -1, NULL, NULL);
 
-            pj_grp_lock_release(uas_data->uac_tsx->grp_lock);
+            pj_grp_lock_release(uas_data2->uac_tsx->grp_lock);
         }