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

pjproject/trunk/pjsip/src/pjsip/sip_parser.c

@@ -675 +675 @@
     char hname_copy[PJSIP_MAX_HNAME_LEN];
     pj_str_t tmp;
-    pjsip_parse_hdr_func *handler;
+    pjsip_parse_hdr_func *func;
 
     if (hname->slen >= PJSIP_MAX_HNAME_LEN) {
@@ -684 +684 @@
     /* First, common case, try to find handler with exact name */
     hash = pj_hash_calc(0, hname->ptr, (unsigned)hname->slen);
-    handler = find_handler_imp(hash, hname);
-    if (handler)
-        return handler;
+    func = find_handler_imp(hash, hname);
+    if (func)
+        return func;
 
 
@@ -981 +981 @@
         /* Parse headers. */
         do {
-            pjsip_parse_hdr_func * handler;
+            pjsip_parse_hdr_func * func;
             pjsip_hdr *hdr = NULL;
 
@@ -996 +996 @@
             
             /* Find handler. */
-            handler = find_handler(&hname);
+            func = find_handler(&hname);
             
             /* Call the handler if found.
@@ -1002 +1002 @@
              * hname/hvalue pair.
              */
-            if (handler) {
-                hdr = (*handler)(ctx);
+            if (func) {
+                hdr = (*func)(ctx);
 
                 /* Note:
@@ -2263 +2263 @@
 
     PJ_TRY {
-        pjsip_parse_hdr_func *handler = find_handler(hname);
-        if (handler) {
-            hdr = (*handler)(&context);
+        pjsip_parse_hdr_func *func = find_handler(hname);
+        if (func) {
+            hdr = (*func)(&context);
         } else {
             hdr = parse_hdr_generic_string(&context);
@@ -2311 +2311 @@
         /* Parse headers. */
         do {
-            pjsip_parse_hdr_func * handler;
+            pjsip_parse_hdr_func * func;
             pjsip_hdr *hdr = NULL;
 
@@ -2326 +2326 @@
 
             /* Find handler. */
-            handler = find_handler(&hname);
+            func = find_handler(&hname);
 
             /* Call the handler if found.
@@ -2332 +2332 @@
              * hname/hvalue pair.
              */
-            if (handler) {
-                hdr = (*handler)(&ctx);
+            if (func) {
+                hdr = (*func)(&ctx);
             } else {
                 hdr = parse_hdr_generic_string(&ctx);