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

Timestamp:

May 1, 2007 4:54:54 PM (17 years ago)

Author:

bennylp

Message:

PJSDP port to Symbian

File:

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

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

@@ -251 +251 @@
 
     len = param->slen + pname->slen + pvalue->slen + 3;
-    p = new_param = pj_pool_alloc(pool, len);
+    p = new_param = (char*) pj_pool_alloc(pool, len);
     
     if (param->slen) {
@@ -1002 +1002 @@
          */
         if (ctype_hdr && scanner->curptr!=scanner->end) {
-            pjsip_msg_body *body = pj_pool_alloc(pool, sizeof(pjsip_msg_body));
+            pjsip_msg_body *body = PJ_POOL_ALLOC_T(pool, pjsip_msg_body);
             body->content_type.type = ctype_hdr->media.type;
             body->content_type.subtype = ctype_hdr->media.subtype;
@@ -1023 +1023 @@
             pjsip_parser_err_report *err_info;
             
-            err_info = pj_pool_alloc(pool, sizeof(*err_info));
+            err_info = PJ_POOL_ALLOC_T(pool, pjsip_parser_err_report);
             err_info->except_code = PJ_GET_EXCEPTION();
             err_info->line = scanner->line;
@@ -1251 +1251 @@
             }
 
-            uri = (*func)( scanner, pool, 
-                          (opt & PJSIP_PARSE_URI_IN_FROM_TO_HDR)== 0);
+            uri = (pjsip_uri*)
+                  (*func)(scanner, pool, 
+                          (opt & PJSIP_PARSE_URI_IN_FROM_TO_HDR)==0);
 
 
@@ -1380 +1381 @@
 
         } else {
-            pjsip_param *p = pj_pool_alloc(pool, sizeof(pjsip_param));
+            pjsip_param *p = PJ_POOL_ALLOC_T(pool, pjsip_param);
             p->name = pname;
             p->value = pvalue;
@@ -1392 +1393 @@
       do {
         pjsip_param *param;
-        param = pj_pool_alloc(pool, sizeof(pjsip_param));
+        param = PJ_POOL_ALLOC_T(pool, pjsip_param);
         int_parse_hparam(scanner, pool, &param->name, &param->value);
         pj_list_insert_before(&url->header_param, param);
@@ -1624 +1625 @@
         int_parse_param( scanner, pool, &pname, &pvalue, 0);
         if (!parser_stricmp(pname, pjsip_Q_STR) && pvalue.slen) {
-            char *dot_pos = pj_memchr(pvalue.ptr, '.', pvalue.slen);
+            char *dot_pos = (char*) pj_memchr(pvalue.ptr, '.', pvalue.slen);
             if (!dot_pos) {
                 hdr->q1000 = pj_strtoul(&pvalue);
@@ -1636 +1637 @@
 
         } else {
-            pjsip_param *p = pj_pool_alloc(pool, sizeof(pjsip_param));
+            pjsip_param *p = PJ_POOL_ALLOC_T(pool, pjsip_param);
             p->name = pname;
             p->value = pvalue;
@@ -1774 +1775 @@
             
         } else {
-            pjsip_param *p = pj_pool_alloc(pool, sizeof(pjsip_param));
+            pjsip_param *p = PJ_POOL_ALLOC_T(pool, pjsip_param);
             p->name = pname;
             p->value = pvalue;
@@ -1872 +1873 @@
                 hdr->rport_param = 0;
         } else {
-            pjsip_param *p = pj_pool_alloc(pool, sizeof(pjsip_param));
+            pjsip_param *p = PJ_POOL_ALLOC_T(pool, pjsip_param);
             p->name = pname;
             p->value = pvalue;
@@ -1912 +1913 @@
 
     while (*scanner->curptr == ';') {
-        pjsip_param *p = pj_pool_alloc(pool, sizeof(pjsip_param));
+        pjsip_param *p = PJ_POOL_ALLOC_T(pool, pjsip_param);
         int_parse_param(scanner, pool, &p->name, &p->value, 0);
         pj_list_insert_before(&hdr->other_param, p);