Changeset 74 for pjproject/trunk/pjsip/src/pjsip/sip_parser.c

Timestamp:

Nov 21, 2005 5:07:18 PM (18 years ago)

Author:

bennylp

Message:

Optimization here and there, changes because of PJLIB modifications

File:

• pjproject/trunk/pjsip/src/pjsip/sip_parser.c (modified) (14 diffs)

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

@@ -184 +184 @@
 
 /* Case insensitive comparison */
-#define parser_stricmp(str1, str2)  pj_stricmp(&str1, &str2)
+#define parser_stricmp(s1, s2)  (pj_stricmp_alnum(&s1, &s2))
 
 
@@ -552 +552 @@
         msg = int_parse_msg(&context, err_list);
     } 
-    PJ_DEFAULT {
+    PJ_CATCH_ANY {
         msg = NULL;
     }
@@ -581 +581 @@
         rdata->msg_info.msg = int_parse_msg(&context, &rdata->msg_info.parse_err);
     } 
-    PJ_DEFAULT {
+    PJ_CATCH_ANY {
         rdata->msg_info.msg = NULL;
     }
@@ -657 +657 @@
                 /* Found a valid Content-Length header. */
                 content_length = pj_strtoul(&str_clen);
-            } 
+            }
+            PJ_CATCH_ANY {
+                content_length = -1;
+            }
             PJ_END
 
@@ -692 +695 @@
                                          unsigned option)
 {
-    PJ_USE_EXCEPTION;
     pj_scanner scanner;
     pjsip_uri *uri = NULL;
+    PJ_USE_EXCEPTION;
 
     init_sip_parser();
@@ -703 +706 @@
     PJ_TRY {
         uri = int_parse_uri_or_name_addr(&scanner, pool, option);
+    }
+    PJ_CATCH_ANY {
+        uri = NULL;
     }
     PJ_END;
@@ -739 +745 @@
                                  pjsip_parser_err_report *err_list)
 {
-    PJ_USE_EXCEPTION;
     int ch;
     pjsip_msg *msg;
@@ -745 +750 @@
     pj_scanner *scanner = ctx->scanner;
     pj_pool_t *pool = ctx->pool;
+    PJ_USE_EXCEPTION;
 
     /* Skip leading newlines. */
@@ -801 +807 @@
 
         }
-        PJ_DEFAULT {
+        PJ_CATCH_ANY {
             /* Exception was thrown during parsing. 
              * Skip until newline, and parse next header. 
@@ -816 +822 @@
                 
                 err_info = pj_pool_alloc(pool, sizeof(*err_info));
-                err_info->exception_code = PJ_GET_EXCEPTION();
+                err_info->except_code = PJ_GET_EXCEPTION();
                 err_info->line = scanner->line;
                 err_info->col = scanner->col;
@@ -1080 +1086 @@
 {
     pj_str_t scheme;
-    pjsip_url *url;
+    pjsip_url *url = NULL;
     int colon;
     int skip_ws = scanner->skip_ws;
-    int hsep = '?';
     scanner->skip_ws = 0;
 
@@ -1115 +1120 @@
 
     /* Get URL parameters. */
-    while ( parse_params && *scanner->curptr == ';' ) {
+    if (parse_params) {
+      while (*scanner->curptr == ';' ) {
         pj_str_t pname, pvalue;
 
@@ -1144 +1150 @@
             pj_list_insert_before(&url->other_param, p);
         }
+      }
     }
 
     /* Get header params. */
-    while (parse_params && *scanner->curptr == hsep) {
+    if (parse_params && *scanner->curptr == '?') {
+      do {
         pjsip_param *param;
         param = pj_pool_alloc(pool, sizeof(pjsip_param));
         int_parse_hparam(scanner, pool, &param->name, &param->value);
         pj_list_insert_before(&url->header_param, param);
-        hsep = '&';
+      } while (*scanner->curptr == '&');
     }
 
@@ -1775 +1783 @@
 
     } 
-    PJ_DEFAULT {
+    PJ_CATCH_ANY {
         hdr = NULL;
     }