Changeset 5170 for pjproject/trunk/pjsip/src/pjsip/sip_dialog.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/src/pjsip/sip_dialog.c (modified) (4 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_dialog.c

@@ -243 +243 @@
                                  pjsip_uri_get_uri(dlg->remote.info->uri);
         if (!pj_list_empty(&sip_uri->header_param)) {
-            pj_str_t tmp;
+            pj_str_t tmp2;
 
             /* Remove all header param */
@@ -249 +249 @@
 
             /* Print URI */
-            tmp.ptr = (char*) pj_pool_alloc(dlg->pool,
+            tmp2.ptr = (char*) pj_pool_alloc(dlg->pool,
                                             dlg->remote.info_str.slen);
-            tmp.slen = pjsip_uri_print(PJSIP_URI_IN_FROMTO_HDR,
-                                       sip_uri, tmp.ptr,
+            tmp2.slen = pjsip_uri_print(PJSIP_URI_IN_FROMTO_HDR,
+                                       sip_uri, tmp2.ptr,
                                        dlg->remote.info_str.slen);
 
-            if (tmp.slen < 1) {
+            if (tmp2.slen < 1) {
                 status = PJSIP_EURITOOLONG;
                 goto on_error;
@@ -261 +261 @@
 
             /* Assign remote.info_str */
-            dlg->remote.info_str = tmp;
+            dlg->remote.info_str = tmp2;
         }
     }
@@ -392 +392 @@
      */
     if (contact) {
-        pj_str_t tmp;
-
-        pj_strdup_with_null(dlg->pool, &tmp, contact);
+        pj_str_t tmp2;
+
+        pj_strdup_with_null(dlg->pool, &tmp2, contact);
         dlg->local.contact = (pjsip_contact_hdr*)
-                             pjsip_parse_hdr(dlg->pool, &HCONTACT, tmp.ptr,
-                                             tmp.slen, NULL);
+                             pjsip_parse_hdr(dlg->pool, &HCONTACT, tmp2.ptr,
+                                             tmp2.slen, NULL);
         if (!dlg->local.contact) {
             status = PJSIP_EINVALIDURI;