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

pjproject/trunk/pjnath/src/pjnath-test/stun.c

@@ -693 +693 @@
             if (PJ_STUN_IS_REQUEST(msg->hdr.type)) {
                 pj_stun_auth_cred cred;
-                pj_status_t status;
+                pj_status_t status2;
 
                 pj_bzero(&cred, sizeof(cred));
@@ -702 +702 @@
                 cred.data.static_cred.nonce = pj_str(v->nonce);
 
-                status = pj_stun_authenticate_request(buf, (unsigned)len, msg, 
+                status2 = pj_stun_authenticate_request(buf, (unsigned)len, msg, 
                                                       &cred, pool, NULL, NULL);
-                if (status != PJ_SUCCESS) {
+                if (status2 != PJ_SUCCESS) {
                     char errmsg[PJ_ERR_MSG_SIZE];
-                    pj_strerror(status, errmsg, sizeof(errmsg));
+                    pj_strerror(status2, errmsg, sizeof(errmsg));
                     PJ_LOG(1,(THIS_FILE, 
                               "    Request authentication failed: %s",
@@ -715 +715 @@
 
             } else if (PJ_STUN_IS_RESPONSE(msg->hdr.type)) {
-                pj_status_t status;
-                status = pj_stun_authenticate_response(buf, (unsigned)len, 
+                pj_status_t status2;
+                status2 = pj_stun_authenticate_response(buf, (unsigned)len, 
                                                        msg, &key);
-                if (status != PJ_SUCCESS) {
+                if (status2 != PJ_SUCCESS) {
                     char errmsg[PJ_ERR_MSG_SIZE];
-                    pj_strerror(status, errmsg, sizeof(errmsg));
+                    pj_strerror(status2, errmsg, sizeof(errmsg));
                     PJ_LOG(1,(THIS_FILE, 
                               "    Response authentication failed: %s",