Changeset 1417 for pjproject/trunk/pjsip/src/pjsip/sip_tel_uri.c

Timestamp:

Aug 16, 2007 10:11:44 AM (17 years ago)

Author:

bennylp

Message:

Ticket #354: continuing work to port the Symbian libraries to .DSO format

File:

• pjproject/trunk/pjsip/src/pjsip/sip_tel_uri.c (modified) (6 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_tel_uri.c

@@ -106 +106 @@
 {
     PJ_UNUSED_ARG(uri);
-    return &pjsip_TEL_STR;
+    return &pjsip_parser_const()->pjsip_TEL_STR;
 }
 
@@ -183 +183 @@
     char *startbuf = buf;
     char *endbuf = buf+size;
+    const pjsip_parser_const_t *pc = pjsip_parser_const();
 
     PJ_UNUSED_ARG(context);
 
     /* Print scheme. */
-    copy_advance(buf, pjsip_TEL_STR);
+    copy_advance(buf, pc->pjsip_TEL_STR);
     *buf++ = ':';
 
@@ -371 +372 @@
     pj_str_t token;
     int skip_ws = scanner->skip_ws;
+    const pjsip_parser_const_t *pc = pjsip_parser_const();
 
     scanner->skip_ws = 0;
 
     /* Parse scheme. */
-    pj_scan_get(scanner, &pjsip_TOKEN_SPEC, &token);
+    pj_scan_get(scanner, &pc->pjsip_TOKEN_SPEC, &token);
     if (pj_scan_get_char(scanner) != ':')
         PJ_THROW(PJSIP_SYN_ERR_EXCEPTION);
-    if (pj_stricmp_alnum(&token, &pjsip_TEL_STR) != 0)
+    if (pj_stricmp_alnum(&token, &pc->pjsip_TEL_STR) != 0)
         PJ_THROW(PJSIP_SYN_ERR_EXCEPTION);
 
@@ -395 +397 @@
     if (parse_params && *scanner->curptr==';') {
         pj_str_t pname, pvalue;
+        const pjsip_parser_const_t *pc = pjsip_parser_const();
 
         do {
@@ -401 +404 @@
 
             /* Get pname. */
-            pj_scan_get(scanner, &pjsip_PARAM_CHAR_SPEC, &pname);
+            pj_scan_get(scanner, &pc->pjsip_PARAM_CHAR_SPEC, &pname);
 
             if (*scanner->curptr == '=') {
@@ -407 +410 @@
 
 #               if defined(PJSIP_UNESCAPE_IN_PLACE) && PJSIP_UNESCAPE_IN_PLACE!=0
-                    pj_scan_get_unescape( scanner, 
-                                          &pjsip_TEL_PARSING_PVALUE_SPEC_ESC,
-                                          &pvalue);
+                    pj_scan_get_unescape(scanner, 
+                                         &pjsip_TEL_PARSING_PVALUE_SPEC_ESC,
+                                         &pvalue);
 #               else
                     pj_scan_get(scanner, &pjsip_TEL_PARSING_PVALUE_SPEC,