Changeset 5170 for pjproject/trunk/pjmedia/src/pjmedia/endpoint.c

Timestamp:

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

Author:

nanang

Message:

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

File:

• pjproject/trunk/pjmedia/src/pjmedia/endpoint.c (modified) (3 diffs)

pjproject/trunk/pjmedia/src/pjmedia/endpoint.c

@@ -485 +485 @@
             enum { MAX_FMTP_STR_LEN = 160 };
             char buf[MAX_FMTP_STR_LEN];
-            unsigned buf_len = 0, i;
+            unsigned buf_len = 0, ii;
             pjmedia_codec_fmtp *dec_fmtp = &codec_param.setting.dec_fmtp;
 
@@ -494 +494 @@
                                         codec_info->pt);
 
-            for (i = 0; i < dec_fmtp->cnt; ++i) {
+            for (ii = 0; ii < dec_fmtp->cnt; ++ii) {
                 pj_size_t test_len = 2;
 
                 /* Check if buf still available */
-                test_len = dec_fmtp->param[i].val.slen + 
-                           dec_fmtp->param[i].name.slen + 2;
+                test_len = dec_fmtp->param[ii].val.slen + 
+                           dec_fmtp->param[ii].name.slen + 2;
                 if (test_len + buf_len >= MAX_FMTP_STR_LEN)
                     return PJ_ETOOBIG;
@@ -506 +506 @@
                 buf_len += pj_ansi_snprintf(&buf[buf_len], 
                                             MAX_FMTP_STR_LEN - buf_len,
-                                            (i == 0?" ":";"));
+                                            (ii == 0?" ":";"));
 
                 /* Print an fmtp param */
-                if (dec_fmtp->param[i].name.slen)
+                if (dec_fmtp->param[ii].name.slen)
                     buf_len += pj_ansi_snprintf(
                                             &buf[buf_len],
                                             MAX_FMTP_STR_LEN - buf_len,
                                             "%.*s=%.*s",
-                                            (int)dec_fmtp->param[i].name.slen,
-                                            dec_fmtp->param[i].name.ptr,
-                                            (int)dec_fmtp->param[i].val.slen,
-                                            dec_fmtp->param[i].val.ptr);
+                                            (int)dec_fmtp->param[ii].name.slen,
+                                            dec_fmtp->param[ii].name.ptr,
+                                            (int)dec_fmtp->param[ii].val.slen,
+                                            dec_fmtp->param[ii].val.ptr);
                 else
                     buf_len += pj_ansi_snprintf(&buf[buf_len], 
                                             MAX_FMTP_STR_LEN - buf_len,
                                             "%.*s", 
-                                            (int)dec_fmtp->param[i].val.slen,
-                                            dec_fmtp->param[i].val.ptr);
+                                            (int)dec_fmtp->param[ii].val.slen,
+                                            dec_fmtp->param[ii].val.ptr);
             }