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

Timestamp:

Jan 10, 2006 1:31:40 PM (18 years ago)

Author:

bennylp

Message:

Renamed pjsip_url to pjsip_sip_uri

File:

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

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

@@ -155 +155 @@
                                                 pj_pool_t *pool, 
                                                 unsigned option);
-static pjsip_url *  int_parse_sip_url( pj_scanner *scanner, 
-                                       pj_pool_t *pool,
-                                       pj_bool_t parse_params);
+static pjsip_sip_uri* int_parse_sip_url( pj_scanner *scanner, 
+                                         pj_pool_t *pool,
+                                         pj_bool_t parse_params);
 static pjsip_name_addr *
                     int_parse_name_addr( pj_scanner *scanner, 
@@ -954 +954 @@
     *pname = pj_str_unescape(pool, pname);
 
+    /* init pvalue */
+    pvalue->ptr = NULL;
+    pvalue->slen = 0;
+
     /* pvalue, if any */
     if (*scanner->curptr == '=') {
         pj_scan_get_char(scanner);
-        /* pvalue can be a quoted string. */
-        if (*scanner->curptr == '"') {
-            pj_scan_get_quote( scanner, '"', '"', pvalue);
-            if (option & PJSIP_PARSE_REMOVE_QUOTE) {
-                pvalue->ptr++;
-                pvalue->slen -= 2;
+        if (!pj_scan_is_eof(scanner)) {
+            /* pvalue can be a quoted string. */
+            if (*scanner->curptr == '"') {
+                pj_scan_get_quote( scanner, '"', '"', pvalue);
+                if (option & PJSIP_PARSE_REMOVE_QUOTE) {
+                    pvalue->ptr++;
+                    pvalue->slen -= 2;
+                }
+            } else if(pj_cis_match(&pjsip_PARAM_CHAR_SPEC, *scanner->curptr)) {
+                pj_scan_get(scanner, &pjsip_PARAM_CHAR_SPEC, pvalue);
+                *pvalue = pj_str_unescape(pool, pvalue);
             }
-        } else {
-            pj_scan_get(scanner, &pjsip_PARAM_CHAR_SPEC, pvalue);
-            *pvalue = pj_str_unescape(pool, pvalue);
-        }
-    } else {
-        pvalue->ptr = NULL;
-        pvalue->slen = 0;
+        }
     }
 }
@@ -997 +1000 @@
     *hname = pj_str_unescape(pool, hname);
 
+    /* Init hvalue */
+    hvalue->ptr = NULL;
+    hvalue->slen = 0;
+
     /* pvalue, if any */
     if (*scanner->curptr == '=') {
         pj_scan_get_char(scanner);
-        pj_scan_get(scanner, &pjsip_HDR_CHAR_SPEC, hvalue);
-        *hvalue = pj_str_unescape(pool, hvalue);
-    } else {
-        hvalue->ptr = NULL;
-        hvalue->slen = 0;
+        if (!pj_scan_is_eof(scanner) && 
+            pj_cis_match(&pjsip_HDR_CHAR_SPEC, *scanner->curptr))
+        {
+            pj_scan_get(scanner, &pjsip_HDR_CHAR_SPEC, hvalue);
+            *hvalue = pj_str_unescape(pool, hvalue);
+        }
     }
 }
@@ -1143 +1151 @@
 
 /* Parse "sip:" and "sips:" URI. */
-static pjsip_url *int_parse_sip_url( pj_scanner *scanner, 
-                                     pj_pool_t *pool,
-                                     pj_bool_t parse_params)
+static pjsip_sip_uri *int_parse_sip_url( pj_scanner *scanner, 
+                                         pj_pool_t *pool,
+                                         pj_bool_t parse_params)
 {
     pj_str_t scheme;
-    pjsip_url *url = NULL;
+    pjsip_sip_uri *url = NULL;
     int colon;
     int skip_ws = scanner->skip_ws;