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

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

@@ -139 +139 @@
 {
     pjsua_call_id call_id = entry->id;
-    pjsua_msg_data msg_data;
+    pjsua_msg_data msg_data_;
     pjsip_generic_string_hdr warn;
     pj_str_t hname = pj_str("Warning");
@@ -152 +152 @@
     
     /* Add warning header */
-    pjsua_msg_data_init(&msg_data);
+    pjsua_msg_data_init(&msg_data_);
     pjsip_generic_string_hdr_init2(&warn, &hname, &hvalue);
-    pj_list_push_back(&msg_data.hdr_list, &warn);
+    pj_list_push_back(&msg_data_.hdr_list, &warn);
 
     /* Call duration has been exceeded; disconnect the call */
@@ -161 +161 @@
                          app_config.duration, call_id));
     entry->id = PJSUA_INVALID_ID;
-    pjsua_call_hangup(call_id, 200, NULL, &msg_data);
+    pjsua_call_hangup(call_id, 200, NULL, &msg_data_);
 }
 
@@ -294 +294 @@
     
     if (app_config.auto_answer > 0) {
-        pjsua_call_setting call_opt;
-
-        pjsua_call_setting_default(&call_opt);
-        call_opt.aud_cnt = app_config.aud_cnt;
-        call_opt.vid_cnt = app_config.vid.vid_cnt;
-
-        pjsua_call_answer2(call_id, &call_opt, app_config.auto_answer, NULL,
+        pjsua_call_setting opt;
+
+        pjsua_call_setting_default(&opt);
+        opt.aud_cnt = app_config.aud_cnt;
+        opt.vid_cnt = app_config.vid.vid_cnt;
+
+        pjsua_call_answer2(call_id, &opt, app_config.auto_answer, NULL,
                            NULL);
     }
@@ -668 +668 @@
                                   pjsip_status_code *code,
                                   pj_str_t *reason,
-                                  pjsua_msg_data *msg_data)
+                                  pjsua_msg_data *msg_data_)
 {
     /* Just accept the request (the default behavior) */
@@ -678 +678 @@
     PJ_UNUSED_ARG(code);
     PJ_UNUSED_ARG(reason);
-    PJ_UNUSED_ARG(msg_data);
+    PJ_UNUSED_ARG(msg_data_);
 }
 
@@ -1413 +1413 @@
         char name[80];
         pj_str_t label;
-        pj_status_t status;
+        pj_status_t status2;
 
         pj_ansi_snprintf(name, sizeof(name), "tone-%d,%d",
@@ -1419 +1419 @@
                          app_config.tones[i].freq2);
         label = pj_str(name);
-        status = pjmedia_tonegen_create2(app_config.pool, &label,
-                                         8000, 1, 160, 16, 
-                                         PJMEDIA_TONEGEN_LOOP,  &tport);
-        if (status != PJ_SUCCESS) {
+        status2 = pjmedia_tonegen_create2(app_config.pool, &label,
+                                          8000, 1, 160, 16, 
+                                          PJMEDIA_TONEGEN_LOOP,  &tport);
+        if (status2 != PJ_SUCCESS) {
             pjsua_perror(THIS_FILE, "Unable to create tone generator", status);
             goto on_error;
         }
 
-        status = pjsua_conf_add_port(app_config.pool, tport, 
+        status2 = pjsua_conf_add_port(app_config.pool, tport,
                                      &app_config.tone_slots[i]);
-        pj_assert(status == PJ_SUCCESS);
-
-        status = pjmedia_tonegen_play(tport, 1, &app_config.tones[i], 0);
-        pj_assert(status == PJ_SUCCESS);
+        pj_assert(status2 == PJ_SUCCESS);
+
+        status2 = pjmedia_tonegen_play(tport, 1, &app_config.tones[i], 0);
+        pj_assert(status2 == PJ_SUCCESS);
     }
 
@@ -1449 +1449 @@
     /* Create ringback tones */
     if (app_config.no_tones == PJ_FALSE) {
-        unsigned i, samples_per_frame;
+        unsigned samples_per_frame;
         pjmedia_tone_desc tone[RING_CNT+RINGBACK_CNT];
         pj_str_t name;