Changeset 5170 for pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app_legacy.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/pjsua/pjsua_app_legacy.c (modified) (14 diffs)

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app_legacy.c

@@ -607 +607 @@
 {
     char buf[128];
-    pjsua_msg_data msg_data;
+    pjsua_msg_data msg_data_;
     input_result result;
     pj_str_t tmp;
@@ -632 +632 @@
     }
 
-    pjsua_msg_data_init(&msg_data);
-    TEST_MULTIPART(&msg_data);
+    pjsua_msg_data_init(&msg_data_);
+    TEST_MULTIPART(&msg_data_);
     pjsua_call_make_call(current_acc, &tmp, &call_opt, NULL,
-                         &msg_data, &current_call);
+                         &msg_data_, &current_call);
 }
 
@@ -758 +758 @@
     pjsua_call_info call_info;
     char buf[128];
-    pjsua_msg_data msg_data;
+    pjsua_msg_data msg_data_;
 
     if (current_call != -1) {
@@ -790 +790 @@
             return;
 
-        pjsua_msg_data_init(&msg_data);
+        pjsua_msg_data_init(&msg_data_);
 
         if (st_code/100 == 3) {
@@ -799 +799 @@
             pjsip_generic_string_hdr_init2(&hcontact, &hname, &hvalue);
 
-            pj_list_push_back(&msg_data.hdr_list, &hcontact);
+            pj_list_push_back(&msg_data_.hdr_list, &hcontact);
         }
 
@@ -813 +813 @@
         }
 
-        pjsua_call_answer2(current_call, &call_opt, st_code, NULL, &msg_data);
+        pjsua_call_answer2(current_call, &call_opt, st_code, NULL, &msg_data_);
     }
 }
@@ -1080 +1080 @@
         pjsua_call_info ci;
         input_result result;
-        pjsua_msg_data msg_data;
+        pjsua_msg_data msg_data_;
 
         pjsua_call_get_info(current_call, &ci);
@@ -1095 +1095 @@
         }
 
-        pjsua_msg_data_init(&msg_data);
+        pjsua_msg_data_init(&msg_data_);
         if (no_refersub) {
             /* Add Refer-Sub: false in outgoing REFER request */
             pjsip_generic_string_hdr_init2(&refer_sub, &STR_REFER_SUB,
                 &STR_FALSE);
-            pj_list_push_back(&msg_data.hdr_list, &refer_sub);
+            pj_list_push_back(&msg_data_.hdr_list, &refer_sub);
         }
         if (result.nb_result != PJSUA_APP_NO_NB) {
@@ -1108 +1108 @@
                 pjsua_buddy_info binfo;
                 pjsua_buddy_get_info(result.nb_result-1, &binfo);
-                pjsua_call_xfer( current_call, &binfo.uri, &msg_data);
+                pjsua_call_xfer( current_call, &binfo.uri, &msg_data_);
             }
 
@@ -1114 +1114 @@
             pj_str_t tmp;
             tmp = pj_str(result.uri_result);
-            pjsua_call_xfer( current_call, &tmp, &msg_data);
+            pjsua_call_xfer( current_call, &tmp, &msg_data_);
         }
     }
@@ -1131 +1131 @@
         pjsua_call_id ids[PJSUA_MAX_CALLS];
         pjsua_call_info ci;
-        pjsua_msg_data msg_data;
+        pjsua_msg_data msg_data_;
         char buf[128];
         unsigned i, count;
@@ -1190 +1190 @@
         }
 
-        pjsua_msg_data_init(&msg_data);
+        pjsua_msg_data_init(&msg_data_);
         if (no_refersub) {
             /* Add Refer-Sub: false in outgoing REFER request */
             pjsip_generic_string_hdr_init2(&refer_sub, &STR_REFER_SUB,
                                            &STR_FALSE);
-            pj_list_push_back(&msg_data.hdr_list, &refer_sub);
+            pj_list_push_back(&msg_data_.hdr_list, &refer_sub);
         }
 
         pjsua_call_xfer_replaces(call, dst_call,
                                  PJSUA_XFER_NO_REQUIRE_REPLACES,
-                                 &msg_data);
+                                 &msg_data_);
     }
 }
@@ -1263 +1263 @@
         for (i=0; i<digits.slen; ++i) {
             char body[80];
-            pjsua_msg_data msg_data;
+            pjsua_msg_data msg_data_;
 
             pjsua_msg_data_init(&msg_data);
-            msg_data.content_type = pj_str("application/dtmf-relay");
+            msg_data_.content_type = pj_str("application/dtmf-relay");
 
             pj_ansi_snprintf(body, sizeof(body),
@@ -1272 +1272 @@
                 "Duration=160",
                 buf[i]);
-            msg_data.msg_body = pj_str(body);
+            msg_data_.msg_body = pj_str(body);
 
             status = pjsua_call_send_request(current_call, &SIP_INFO,
-                &msg_data);
+                                             &msg_data_);
             if (status != PJ_SUCCESS) {
                 return;