Changeset 5170 for pjproject/trunk/pjnath/src/pjnath/ice_session.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/pjnath/src/pjnath/ice_session.c (modified) (3 diffs)

pjproject/trunk/pjnath/src/pjnath/ice_session.c

@@ -1601 +1601 @@
                               const pj_str_t *rem_ufrag,
                               const pj_str_t *rem_passwd,
-                              unsigned rcand_cnt,
-                              const pj_ice_sess_cand rcand[])
+                              unsigned rem_cand_cnt,
+                              const pj_ice_sess_cand rem_cand[])
 {
     pj_ice_sess_checklist *clist;
@@ -1612 +1612 @@
     pj_status_t status;
 
-    PJ_ASSERT_RETURN(ice && rem_ufrag && rem_passwd && rcand_cnt && rcand,
-                     PJ_EINVAL);
-    PJ_ASSERT_RETURN(rcand_cnt + ice->rcand_cnt <= PJ_ICE_MAX_CAND, 
+    PJ_ASSERT_RETURN(ice && rem_ufrag && rem_passwd && rem_cand_cnt &&
+                     rem_cand, PJ_EINVAL);
+    PJ_ASSERT_RETURN(rem_cand_cnt + ice->rcand_cnt <= PJ_ICE_MAX_CAND,
                      PJ_ETOOMANY);
 
@@ -1639 +1639 @@
     /* Save remote candidates */
     ice->rcand_cnt = 0;
-    for (i=0; i<rcand_cnt; ++i) {
+    for (i=0; i<rem_cand_cnt; ++i) {
         pj_ice_sess_cand *cn = &ice->rcand[ice->rcand_cnt];
 
         /* Ignore candidate which has no matching component ID */
-        if (rcand[i].comp_id==0 || rcand[i].comp_id > ice->comp_cnt) {
+        if (rem_cand[i].comp_id==0 || rem_cand[i].comp_id > ice->comp_cnt) {
             continue;
         }
 
-        if (rcand[i].comp_id > highest_comp)
-            highest_comp = rcand[i].comp_id;
-
-        pj_memcpy(cn, &rcand[i], sizeof(pj_ice_sess_cand));
-        pj_strdup(ice->pool, &cn->foundation, &rcand[i].foundation);
+        if (rem_cand[i].comp_id > highest_comp)
+            highest_comp = rem_cand[i].comp_id;
+
+        pj_memcpy(cn, &rem_cand[i], sizeof(pj_ice_sess_cand));
+        pj_strdup(ice->pool, &cn->foundation, &rem_cand[i].foundation);
         ice->rcand_cnt++;
     }