Changeset 1240 for pjproject/trunk

Timestamp:

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

Author:

bennylp

Message:

PJSDP port to Symbian

Location:

pjproject/trunk

Files:

• build.symbian/pjsdp.mmp (added)
• build.symbian/pjsip.mmp (added)
• build.symbian/pjsip_simple.mmp (added)
• build.symbian/pjsip_ua.mmp (added)
• pjlib/include/pj/config_site_sample.h (modified) (1 diff)
• pjmedia/src/pjmedia/sdp.c (modified) (16 diffs)
• pjmedia/src/pjmedia/sdp_neg.c (modified) (8 diffs)
• pjsip/include/pjsip/print_util.h (modified) (1 diff)
• pjsip/src/pjsip/sip_auth_client.c (modified) (7 diffs)
• pjsip/src/pjsip/sip_auth_msg.c (modified) (6 diffs)
• pjsip/src/pjsip/sip_auth_parser.c (modified) (2 diffs)
• pjsip/src/pjsip/sip_auth_server.c (modified) (1 diff)
• pjsip/src/pjsip/sip_dialog.c (modified) (25 diffs)
• pjsip/src/pjsip/sip_endpoint.c (modified) (3 diffs)
• pjsip/src/pjsip/sip_msg.c (modified) (49 diffs)
• pjsip/src/pjsip/sip_parser.c (modified) (11 diffs)
• pjsip/src/pjsip/sip_resolve.c (modified) (4 diffs)

pjproject/trunk/pjlib/include/pj/config_site_sample.h

@@ -27 +27 @@
 #endif
 
+/*
+ * Typical configuration for Symbian OS target
+ */
+#if defined(PJ_SYMBIAN) && PJ_SYMBIAN!=0
+#   define PJMEDIA_SOUND_IMPLEMENTATION PJMEDIA_SOUND_NULL_SOUND
+#endif
 
 

pjproject/trunk/pjmedia/src/pjmedia/sdp.c

@@ -104 +104 @@
     PJ_ASSERT_RETURN(pool && name, NULL);
 
-    attr = pj_pool_alloc(pool, sizeof(pjmedia_sdp_attr));
+    attr = PJ_POOL_ALLOC_T(pool, pjmedia_sdp_attr);
     pj_strdup2(pool, &attr->name, name);
 
@@ -124 +124 @@
     PJ_ASSERT_RETURN(pool && rhs, NULL);
 
-    attr = pj_pool_alloc(pool, sizeof(pjmedia_sdp_attr));
+    attr = PJ_POOL_ALLOC_T(pool, pjmedia_sdp_attr);
 
     pj_strdup(pool, &attr->name, &rhs->name);
@@ -308 +308 @@
         status = PJ_SUCCESS;
     }
-    PJ_CATCH(SYNTAX_ERROR) {
+    PJ_CATCH_ANY {
         status = PJMEDIA_SDP_EINRTPMAP;
     }
@@ -403 +403 @@
 
     }
-    PJ_CATCH(SYNTAX_ERROR) {
+    PJ_CATCH_ANY {
         status = PJMEDIA_SDP_EINRTCP;
     }
@@ -420 +420 @@
     PJ_ASSERT_RETURN(pool && attr && p_rtpmap, PJ_EINVAL);
 
-    *p_rtpmap = pj_pool_alloc(pool, sizeof(pjmedia_sdp_rtpmap));
+    *p_rtpmap = PJ_POOL_ALLOC_T(pool, pjmedia_sdp_rtpmap);
     PJ_ASSERT_RETURN(*p_rtpmap, PJ_ENOMEM);
 
@@ -443 +443 @@
 
 
-    attr = pj_pool_alloc(pool, sizeof(pjmedia_sdp_attr));
+    attr = PJ_POOL_ALLOC_T(pool, pjmedia_sdp_attr);
     PJ_ASSERT_RETURN(attr != NULL, PJ_ENOMEM);
 
@@ -465 +465 @@
 
     attr->value.slen = len;
-    attr->value.ptr = pj_pool_alloc(pool, attr->value.slen);
+    attr->value.ptr = (char*) pj_pool_alloc(pool, attr->value.slen);
     pj_memcpy(attr->value.ptr, tempbuf, attr->value.slen);
 
@@ -494 +494 @@
                                                   const pjmedia_sdp_conn *rhs)
 {
-    pjmedia_sdp_conn *c = pj_pool_alloc (pool, sizeof(pjmedia_sdp_conn));
+    pjmedia_sdp_conn *c = PJ_POOL_ALLOC_T(pool, pjmedia_sdp_conn);
     if (!c) return NULL;
 
@@ -589 +589 @@
 {
     unsigned int i;
-    pjmedia_sdp_media *m = pj_pool_alloc (pool, sizeof(pjmedia_sdp_media));
+    pjmedia_sdp_media *m = PJ_POOL_ALLOC_T(pool, pjmedia_sdp_media);
     PJ_ASSERT_RETURN(m != NULL, NULL);
 
@@ -968 +968 @@
     ctx->last_error = PJMEDIA_SDP_EINATTR;
 
-    attr = pj_pool_alloc(pool, sizeof(pjmedia_sdp_attr));
+    attr = PJ_POOL_ALLOC_T(pool, pjmedia_sdp_attr);
 
     /* check equal sign */
@@ -1016 +1016 @@
     pjmedia_sdp_session *session;
     pjmedia_sdp_media *media = NULL;
-    void *attr;
+    pjmedia_sdp_attr *attr;
     pjmedia_sdp_conn *conn;
     pj_str_t dummy;
@@ -1028 +1028 @@
 
     pj_scan_init(&scanner, buf, len, 0, &on_scanner_error);
-    session = pj_pool_calloc(pool, 1, sizeof(pjmedia_sdp_session));
+    session = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_session);
     PJ_ASSERT_RETURN(session != NULL, PJ_ENOMEM);
 
@@ -1052 +1052 @@
                     break;
                 case 'c':
-                    conn = pj_pool_calloc(pool, 1, sizeof(*conn));
+                    conn = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_conn);
                     parse_connection_info(&scanner, conn, &ctx);
                     if (media) {
@@ -1064 +1064 @@
                     break;
                 case 'm':
-                    media = pj_pool_calloc(pool, 1, sizeof(*media));
+                    media = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_media);
                     parse_media(&scanner, media, &ctx);
                     session->media[ session->media_count++ ] = media;
@@ -1095 +1095 @@
 
     }
-    PJ_CATCH(SYNTAX_ERROR) {
+    PJ_CATCH_ANY {
         
         char errmsg[PJ_ERR_MSG_SIZE];
@@ -1138 +1138 @@
     PJ_ASSERT_RETURN(pool && rhs, NULL);
 
-    sess = pj_pool_zalloc(pool, sizeof(pjmedia_sdp_session));
+    sess = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_session);
     PJ_ASSERT_RETURN(sess != NULL, NULL);
 

pjproject/trunk/pjmedia/src/pjmedia/sdp_neg.c

@@ -84 +84 @@
 
     /* Create and initialize negotiator. */
-    neg = pj_pool_zalloc(pool, sizeof(pjmedia_sdp_neg));
+    neg = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_neg);
     PJ_ASSERT_RETURN(neg != NULL, PJ_ENOMEM);
 
@@ -119 +119 @@
 
     /* Create and initialize negotiator. */
-    neg = pj_pool_zalloc(pool, sizeof(pjmedia_sdp_neg));
+    neg = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_neg);
     PJ_ASSERT_RETURN(neg != NULL, PJ_ENOMEM);
 
@@ -564 +564 @@
                  */
                 const pjmedia_sdp_attr *a;
-                pjmedia_sdp_rtpmap or;
+                pjmedia_sdp_rtpmap or_;
 
                 /* Get the rtpmap for the payload type in the offer. */
@@ -572 +572 @@
                     return PJ_EBUG;
                 }
-                pjmedia_sdp_attr_get_rtpmap(a, &or);
+                pjmedia_sdp_attr_get_rtpmap(a, &or_);
 
                 /* Find paylaod in answer SDP with matching 
@@ -587 +587 @@
                          * count match 
                          */
-                        if (!pj_stricmp(&or.enc_name, &ar.enc_name) &&
-                            or.clock_rate == ar.clock_rate &&
-                            (pj_stricmp(&or.param, &ar.param)==0 ||
+                        if (!pj_stricmp(&or_.enc_name, &ar.enc_name) &&
+                            or_.clock_rate == ar.clock_rate &&
+                            (pj_stricmp(&or_.param, &ar.param)==0 ||
                              (ar.param.slen==1 && *ar.param.ptr=='1')))
                         {
@@ -745 +745 @@
                  */
                 const pjmedia_sdp_attr *a;
-                pjmedia_sdp_rtpmap or;
+                pjmedia_sdp_rtpmap or_;
                 pj_bool_t is_codec;
 
@@ -755 +755 @@
                     return PJMEDIA_SDP_EMISSINGRTPMAP;
                 }
-                pjmedia_sdp_attr_get_rtpmap(a, &or);
-
-                if (!pj_strcmp2(&or.enc_name, "telephone-event")) {
+                pjmedia_sdp_attr_get_rtpmap(a, &or_);
+
+                if (!pj_strcmp2(&or_.enc_name, "telephone-event")) {
                     offer_has_telephone_event = 1;
                     if (found_matching_telephone_event)
@@ -782 +782 @@
                          * channel count  match 
                          */
-                        if (!pj_stricmp(&or.enc_name, &lr.enc_name) &&
-                            or.clock_rate == lr.clock_rate &&
-                            (pj_strcmp(&or.param, &lr.param)==0 ||
-                             (or.param.slen==1 && *or.param.ptr=='1'))) 
+                        if (!pj_stricmp(&or_.enc_name, &lr.enc_name) &&
+                            or_.clock_rate == lr.clock_rate &&
+                            (pj_strcmp(&or_.param, &lr.param)==0 ||
+                             (or_.param.slen==1 && *or_.param.ptr=='1'))) 
                         {
                             /* Match! */

pjproject/trunk/pjsip/include/pjsip/print_util.h

@@ -106 +106 @@
 PJ_INLINE(void) init_hdr(void *hptr, pjsip_hdr_e htype, void *vptr)
 {
-    pjsip_hdr *hdr = hptr;
+    pjsip_hdr *hdr = (pjsip_hdr*) hptr;
     hdr->type = htype;
     hdr->name = hdr->sname = pjsip_hdr_names[htype];
-    hdr->vptr = vptr;
+    hdr->vptr = (pjsip_hdr_vptr*) vptr;
     pj_list_init(hdr);
 }

pjproject/trunk/pjsip/src/pjsip/sip_auth_client.c

@@ -214 +214 @@
     
     /* Allocate memory. */
-    cred->response.ptr = pj_pool_alloc(pool, PJSIP_MD5STRLEN);
+    cred->response.ptr = (char*) pj_pool_alloc(pool, PJSIP_MD5STRLEN);
     cred->response.slen = PJSIP_MD5STRLEN;
 
@@ -229 +229 @@
          */
         cred->qop = pjsip_AUTH_STR;
-        cred->nc.ptr = pj_pool_alloc(pool, 16);
+        cred->nc.ptr = (char*) pj_pool_alloc(pool, 16);
         cred->nc.slen = pj_ansi_snprintf(cred->nc.ptr, 16, "%08u", nc);
 
@@ -267 +267 @@
     if (cached_auth->cnonce.slen == 0) {
         /* Save the whole challenge */
-        cached_auth->last_chal = pjsip_hdr_clone(ses_pool, hdr);
+        cached_auth->last_chal = (pjsip_www_authenticate_hdr*)
+                                 pjsip_hdr_clone(ses_pool, hdr);
 
         /* Create cnonce */
@@ -367 +368 @@
     sess->endpt = (pjsip_endpoint*)rhs->endpt;
     sess->cred_cnt = rhs->cred_cnt;
-    sess->cred_info = pj_pool_alloc(pool, 
+    sess->cred_info = (pjsip_cred_info*)
+                      pj_pool_alloc(pool, 
                                     sess->cred_cnt*sizeof(pjsip_cred_info));
     for (i=0; i<rhs->cred_cnt; ++i) {
@@ -402 +404 @@
     } else {
         int i;
-        sess->cred_info = pj_pool_alloc(sess->pool, cred_cnt * sizeof(*c));
+        sess->cred_info = (pjsip_cred_info*)
+                          pj_pool_alloc(sess->pool, cred_cnt * sizeof(*c));
         for (i=0; i<cred_cnt; ++i) {
             sess->cred_info[i].data_type = c[i].data_type;
@@ -817 +820 @@
         cached_auth = find_cached_auth(sess, &hchal->challenge.common.realm );
         if (!cached_auth) {
-            cached_auth = pj_pool_zalloc( sess->pool, sizeof(*cached_auth));
+            cached_auth = PJ_POOL_ZALLOC_T( sess->pool, pjsip_cached_auth);
             pj_strdup( sess->pool, &cached_auth->realm, &hchal->challenge.common.realm);
             cached_auth->is_proxy = (hchal->type == PJSIP_H_PROXY_AUTHENTICATE);
@@ -845 +848 @@
 
     /* Remove branch param in Via header. */
-    via = pjsip_msg_find_hdr(tdata->msg, PJSIP_H_VIA, NULL);
+    via = (pjsip_via_hdr*) pjsip_msg_find_hdr(tdata->msg, PJSIP_H_VIA, NULL);
     via->branch_param.slen = 0;
 

pjproject/trunk/pjsip/src/pjsip/sip_auth_msg.c

@@ -47 +47 @@
 PJ_DEF(pjsip_authorization_hdr*) pjsip_authorization_hdr_create(pj_pool_t *pool)
 {
-    pjsip_authorization_hdr *hdr = pj_pool_calloc(pool, 1, sizeof(*hdr));
+    pjsip_authorization_hdr *hdr;
+    hdr = PJ_POOL_ZALLOC_T(pool, pjsip_authorization_hdr);
     init_hdr(hdr, PJSIP_H_AUTHORIZATION, &authorization_hdr_vptr);
     pj_list_init(&hdr->credential.common.other_param);
@@ -55 +56 @@
 PJ_DEF(pjsip_proxy_authorization_hdr*) pjsip_proxy_authorization_hdr_create(pj_pool_t *pool)
 {
-    pjsip_proxy_authorization_hdr *hdr = pj_pool_calloc(pool, 1, sizeof(*hdr));
+    pjsip_proxy_authorization_hdr *hdr;
+    hdr = PJ_POOL_ZALLOC_T(pool, pjsip_proxy_authorization_hdr);
     init_hdr(hdr, PJSIP_H_PROXY_AUTHORIZATION, &authorization_hdr_vptr);
     pj_list_init(&hdr->credential.common.other_param);
@@ -169 +171 @@
 }
 
-static pjsip_authorization_hdr* pjsip_authorization_hdr_shallow_clone( pj_pool_t *pool,
-                                                                       const pjsip_authorization_hdr *rhs)
+static pjsip_authorization_hdr* 
+pjsip_authorization_hdr_shallow_clone(  pj_pool_t *pool,
+                                        const pjsip_authorization_hdr *rhs)
 {
     /* This function also serves Proxy-Authorization header. */
-    pjsip_authorization_hdr *hdr = pj_pool_alloc(pool, sizeof(*hdr));
+    pjsip_authorization_hdr *hdr;
+    hdr = PJ_POOL_ALLOC_T(pool, pjsip_authorization_hdr);
     pj_memcpy(hdr, rhs, sizeof(*hdr));
     pjsip_param_shallow_clone(pool, &hdr->credential.common.other_param, 
@@ -202 +206 @@
 PJ_DEF(pjsip_www_authenticate_hdr*) pjsip_www_authenticate_hdr_create(pj_pool_t *pool)
 {
-    pjsip_www_authenticate_hdr *hdr = pj_pool_calloc(pool, 1, sizeof(*hdr));
+    pjsip_www_authenticate_hdr *hdr;
+    hdr = PJ_POOL_ZALLOC_T(pool, pjsip_www_authenticate_hdr);
     init_hdr(hdr, PJSIP_H_WWW_AUTHENTICATE, &www_authenticate_hdr_vptr);
     pj_list_init(&hdr->challenge.common.other_param);
@@ -211 +216 @@
 PJ_DEF(pjsip_proxy_authenticate_hdr*) pjsip_proxy_authenticate_hdr_create(pj_pool_t *pool)
 {
-    pjsip_proxy_authenticate_hdr *hdr = pj_pool_calloc(pool, 1, sizeof(*hdr));
+    pjsip_proxy_authenticate_hdr *hdr;
+    hdr = PJ_POOL_ZALLOC_T(pool, pjsip_proxy_authenticate_hdr);
     init_hdr(hdr, PJSIP_H_PROXY_AUTHENTICATE, &www_authenticate_hdr_vptr);
     pj_list_init(&hdr->challenge.common.other_param);
@@ -323 +329 @@
 {
     /* This function also serves Proxy-Authenticate header. */
-    pjsip_www_authenticate_hdr *hdr = pj_pool_alloc(pool, sizeof(*hdr));
+    pjsip_www_authenticate_hdr *hdr;
+    hdr = PJ_POOL_ALLOC_T(pool, pjsip_www_authenticate_hdr);
     pj_memcpy(hdr, rhs, sizeof(*hdr));
     pjsip_param_shallow_clone(pool, &hdr->challenge.common.other_param, 

pjproject/trunk/pjsip/src/pjsip/sip_auth_parser.c

@@ -107 +107 @@
 
         } else {
-            pjsip_param *p = pj_pool_alloc(pool, sizeof(pjsip_param));
+            pjsip_param *p = PJ_POOL_ALLOC_T(pool, pjsip_param);
             p->name = name;
             p->value = value;
@@ -169 +169 @@
 
         } else {
-            pjsip_param *p = pj_pool_alloc(pool, sizeof(pjsip_param));
+            pjsip_param *p = PJ_POOL_ALLOC_T(pool, pjsip_param);
             p->name = name;
             p->value = value;

pjproject/trunk/pjsip/src/pjsip/sip_auth_server.c

@@ -115 +115 @@
     pjsip_authorization_hdr *h_auth;
     pjsip_msg *msg = rdata->msg_info.msg;
-    int htype;
+    pjsip_hdr_e htype;
     pj_str_t acc_name;
     pjsip_cred_info cred_info;

pjproject/trunk/pjsip/src/pjsip/sip_dialog.c

@@ -70 +70 @@
         return PJ_ENOMEM;
 
-    dlg = pj_pool_zalloc(pool, sizeof(pjsip_dialog));
+    dlg = PJ_POOL_ZALLOC_T(pool, pjsip_dialog);
     PJ_ASSERT_RETURN(dlg != NULL, PJ_ENOMEM);
 
@@ -155 +155 @@
             param->value.ptr[param->value.slen] = '\0';
 
-            hdr = pjsip_parse_hdr(dlg->pool, &param->name, param->value.ptr,
+            hdr = (pjsip_hdr*)
+                  pjsip_parse_hdr(dlg->pool, &param->name, param->value.ptr,
                                   param->value.slen, NULL);
 
@@ -223 +224 @@
         PJSIP_URI_SCHEME_IS_SIPS(dlg->remote.info->uri))
     {
-        pjsip_sip_uri *sip_uri = pjsip_uri_get_uri(dlg->remote.info->uri);
+        pjsip_sip_uri *sip_uri = (pjsip_sip_uri *) 
+                                 pjsip_uri_get_uri(dlg->remote.info->uri);
         if (!pj_list_empty(&sip_uri->header_param)) {
             pj_str_t tmp;
@@ -231 +233 @@
 
             /* Print URI */
-            tmp.ptr = pj_pool_alloc(dlg->pool, dlg->remote.info_str.slen);
+            tmp.ptr = (char*) pj_pool_alloc(dlg->pool, 
+                                            dlg->remote.info_str.slen);
             tmp.slen = pjsip_uri_print(PJSIP_URI_IN_FROMTO_HDR,
                                        sip_uri, tmp.ptr, 
@@ -331 +334 @@
      * both local and remote URI.
      */
-    tmp.ptr = pj_pool_alloc(rdata->tp_info.pool, TMP_LEN);
+    tmp.ptr = (char*) pj_pool_alloc(rdata->tp_info.pool, TMP_LEN);
 
     /* Init local info from the To header. */
-    dlg->local.info = pjsip_hdr_clone(dlg->pool, rdata->msg_info.to);
+    dlg->local.info = (pjsip_fromto_hdr*)
+                      pjsip_hdr_clone(dlg->pool, rdata->msg_info.to);
     pjsip_fromto_hdr_set_from(dlg->local.info);
 
@@ -389 +393 @@
 
     /* Init remote info from the From header. */
-    dlg->remote.info = pjsip_hdr_clone(dlg->pool, rdata->msg_info.from);
+    dlg->remote.info = (pjsip_fromto_hdr*) 
+                       pjsip_hdr_clone(dlg->pool, rdata->msg_info.from);
     pjsip_fromto_hdr_set_to(dlg->remote.info);
 
@@ -406 +411 @@
 
     /* Init remote's contact from Contact header. */
-    contact_hdr = pjsip_msg_find_hdr(rdata->msg_info.msg, PJSIP_H_CONTACT, 
+    contact_hdr = (pjsip_hdr*)
+                  pjsip_msg_find_hdr(rdata->msg_info.msg, PJSIP_H_CONTACT, 
                                      NULL);
     if (!contact_hdr) {
@@ -412 +418 @@
         goto on_error;
     }
-    dlg->remote.contact = pjsip_hdr_clone(dlg->pool, contact_hdr);
+    dlg->remote.contact = (pjsip_contact_hdr*) 
+                          pjsip_hdr_clone(dlg->pool, contact_hdr);
 
     /* Init remote's CSeq from CSeq header */
@@ -432 +439 @@
 
     /* Call-ID */
-    dlg->call_id = pjsip_hdr_clone(dlg->pool, rdata->msg_info.cid);
+    dlg->call_id = (pjsip_cid_hdr*) 
+                   pjsip_hdr_clone(dlg->pool, rdata->msg_info.cid);
 
     /* Route set. 
@@ -447 +455 @@
 
         /* Clone the Record-Route, change the type to Route header. */
-        route = pjsip_hdr_clone(dlg->pool, rr);
+        route = (pjsip_route_hdr*) pjsip_hdr_clone(dlg->pool, rr);
         pjsip_routing_hdr_set_route(route);
 
@@ -457 +465 @@
         if (rr == (void*)&rdata->msg_info.msg->hdr)
             break;
-        rr = pjsip_msg_find_hdr(rdata->msg_info.msg, PJSIP_H_RECORD_ROUTE, rr);
+        rr = (pjsip_route_hdr*) pjsip_msg_find_hdr(rdata->msg_info.msg, 
+                                                   PJSIP_H_RECORD_ROUTE, rr);
     }
 
@@ -570 +579 @@
 
     /* Clone remote target. */
-    dlg->target = pjsip_uri_clone(dlg->pool, first_dlg->target);
+    dlg->target = (pjsip_uri*) pjsip_uri_clone(dlg->pool, first_dlg->target);
 
     /* Clone local info. */
-    dlg->local.info = pjsip_hdr_clone(dlg->pool, first_dlg->local.info);
+    dlg->local.info = (pjsip_fromto_hdr*) 
+                      pjsip_hdr_clone(dlg->pool, first_dlg->local.info);
 
     /* Clone local tag. */
@@ -584 +594 @@
 
     /* Clone local Contact. */
-    dlg->local.contact = pjsip_hdr_clone(dlg->pool, first_dlg->local.contact);
+    dlg->local.contact = (pjsip_contact_hdr*) 
+                         pjsip_hdr_clone(dlg->pool, first_dlg->local.contact);
 
     /* Clone remote info. */
-    dlg->remote.info = pjsip_hdr_clone(dlg->pool, first_dlg->remote.info);
+    dlg->remote.info = (pjsip_fromto_hdr*) 
+                       pjsip_hdr_clone(dlg->pool, first_dlg->remote.info);
 
     /* Set remote tag from the response. */
@@ -611 +623 @@
 
     /* Clone Call-ID header. */
-    dlg->call_id = pjsip_hdr_clone(dlg->pool, first_dlg->call_id);
+    dlg->call_id = (pjsip_cid_hdr*) 
+                   pjsip_hdr_clone(dlg->pool, first_dlg->call_id);
 
     /* Duplicate Route-Set. */
@@ -619 +632 @@
         pjsip_route_hdr *h;
 
-        h = pjsip_hdr_clone(dlg->pool, r);
+        h = (pjsip_route_hdr*) pjsip_hdr_clone(dlg->pool, r);
         pj_list_push_back(&dlg->route_set, h);
 
@@ -721 +734 @@
         pjsip_route_hdr *new_r;
 
-        new_r = pjsip_hdr_clone(dlg->pool, r);
+        new_r = (pjsip_route_hdr*) pjsip_hdr_clone(dlg->pool, r);
         pj_list_push_back(&dlg->route_set, new_r);
 
@@ -980 +993 @@
     for (; route != end_list; route = route->next ) {
         pjsip_route_hdr *r;
-        r = pjsip_hdr_shallow_clone( tdata->pool, route );
+        r = (pjsip_route_hdr*) pjsip_hdr_shallow_clone( tdata->pool, route );
         pjsip_routing_hdr_set_route(r);
         pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr*)r);
@@ -1177 +1190 @@
                 pjsip_msg_find_hdr_by_name(tdata->msg, &hcontact, NULL) == 0) 
             {
-                hdr = pjsip_hdr_clone(tdata->pool, dlg->local.contact);
+                hdr = (pjsip_hdr*) pjsip_hdr_clone(tdata->pool, 
+                                                   dlg->local.contact);
                 pjsip_msg_add_hdr(tdata->msg, hdr);
             }
@@ -1189 +1203 @@
                                                PJSIP_H_ALLOW, NULL);
             if (c_hdr) {
-                hdr = pjsip_hdr_clone(tdata->pool, c_hdr);
+                hdr = (pjsip_hdr*) pjsip_hdr_clone(tdata->pool, c_hdr);
                 pjsip_msg_add_hdr(tdata->msg, hdr);
             }
@@ -1201 +1215 @@
                                                PJSIP_H_SUPPORTED, NULL);
             if (c_hdr) {
-                hdr = pjsip_hdr_clone(tdata->pool, c_hdr);
+                hdr = (pjsip_hdr*) pjsip_hdr_clone(tdata->pool, c_hdr);
                 pjsip_msg_add_hdr(tdata->msg, hdr);
             }
@@ -1286 +1300 @@
      * 180 and then 302, the Contact in 302 will not get updated).
      */
-    hdr = pjsip_msg_find_hdr(tdata->msg, PJSIP_H_CONTACT, NULL);
+    hdr = (pjsip_hdr*) pjsip_msg_find_hdr(tdata->msg, PJSIP_H_CONTACT, NULL);
     if (hdr)
         pj_list_erase(hdr);
@@ -1399 +1413 @@
         while (hdr != hdr_list) {
             pjsip_msg_add_hdr(tdata->msg,
-                              pjsip_hdr_clone(tdata->pool, hdr));
+                              (pjsip_hdr*)pjsip_hdr_clone(tdata->pool, hdr));
             hdr = hdr->next;
         }
@@ -1527 +1541 @@
         if (hdr->type == PJSIP_H_RECORD_ROUTE) {
             pjsip_route_hdr *r;
-            r = pjsip_hdr_clone(dlg->pool, hdr);
+            r = (pjsip_route_hdr*) pjsip_hdr_clone(dlg->pool, hdr);
             pjsip_routing_hdr_set_route(r);
             pj_list_push_back(&dlg->route_set, r);
@@ -1599 +1613 @@
          * field of the response.
          */
-        contact = pjsip_msg_find_hdr(rdata->msg_info.msg, PJSIP_H_CONTACT, 
+        contact = (pjsip_contact_hdr*)
+                  pjsip_msg_find_hdr(rdata->msg_info.msg, PJSIP_H_CONTACT, 
                                      NULL);
         if (contact) {
-            dlg->remote.contact = pjsip_hdr_clone(dlg->pool, contact);
+            dlg->remote.contact = (pjsip_contact_hdr*) 
+                                  pjsip_hdr_clone(dlg->pool, contact);
             dlg->target = dlg->remote.contact->uri;
         }
@@ -1643 +1659 @@
         pjsip_contact_hdr *contact;
 
-        contact = pjsip_msg_find_hdr(rdata->msg_info.msg, PJSIP_H_CONTACT, 
-                                     NULL);
+        contact = (pjsip_contact_hdr*) pjsip_msg_find_hdr(rdata->msg_info.msg,
+                                                          PJSIP_H_CONTACT, 
+                                                          NULL);
         if (contact) {
-            dlg->remote.contact = pjsip_hdr_clone(dlg->pool, contact);
+            dlg->remote.contact = (pjsip_contact_hdr*) 
+                                  pjsip_hdr_clone(dlg->pool, contact);
             dlg->target = dlg->remote.contact->uri;
         }

pjproject/trunk/pjsip/src/pjsip/sip_endpoint.c

@@ -154 +154 @@
 static int cmp_mod_name(void *name, const void *mod)
 {
-    return pj_stricmp(name, &((pjsip_module*)mod)->name);
+    return pj_stricmp((const pj_str_t*)name, &((pjsip_module*)mod)->name);
 }
 
@@ -446 +446 @@
 
     /* Create endpoint. */
-    endpt = pj_pool_zalloc(pool, sizeof(*endpt));
+    endpt = PJ_POOL_ZALLOC_T(pool, pjsip_endpoint);
     endpt->pool = pool;
     endpt->pf = pf;
@@ -829 +829 @@
         pj_bool_t mismatch = PJ_FALSE;
         if (port == 0) {
-            int type;
+            pjsip_transport_type_e type;
             type = rdata->tp_info.transport->key.type;
             port = pjsip_transport_get_default_port_for_type(type);

pjproject/trunk/pjsip/src/pjsip/sip_msg.c

@@ -241 +241 @@
 PJ_DEF(pjsip_msg*) pjsip_msg_create( pj_pool_t *pool, pjsip_msg_type_e type)
 {
-    pjsip_msg *msg = pj_pool_alloc(pool, sizeof(pjsip_msg));
+    pjsip_msg *msg = PJ_POOL_ALLOC_T(pool, pjsip_msg);
     pj_list_init(&msg->hdr);
     msg->type = type;
@@ -258 +258 @@
     if (src->type == PJSIP_REQUEST_MSG) {
         pjsip_method_copy(pool, &dst->line.req.method, &src->line.req.method);
-        dst->line.req.uri = pjsip_uri_clone(pool, src->line.req.uri);
+        dst->line.req.uri = (pjsip_uri*) pjsip_uri_clone(pool, 
+                                                         src->line.req.uri);
     } else {
         dst->line.status.code = src->line.status.code;
@@ -267 +268 @@
     sh = src->hdr.next;
     while (sh != &src->hdr) {
-        pjsip_hdr *dh = pjsip_hdr_clone(pool, sh);
+        pjsip_hdr *dh = (pjsip_hdr*) pjsip_hdr_clone(pool, sh);
         pjsip_msg_add_hdr(dst, dh);
         sh = sh->next;
@@ -283 +284 @@
                                    pjsip_hdr_e hdr_type, const void *start)
 {
-    const pjsip_hdr *hdr=start, *end=&msg->hdr;
+    const pjsip_hdr *hdr=(const pjsip_hdr*) start, *end=&msg->hdr;
 
     if (hdr == NULL) {
@@ -299 +300 @@
                                            const void *start)
 {
-    const pjsip_hdr *hdr=start, *end=&msg->hdr;
+    const pjsip_hdr *hdr=(const pjsip_hdr*)start, *end=&msg->hdr;
 
     if (hdr == NULL) {
@@ -319 +320 @@
                                          pjsip_hdr_e hdr_type, void *start)
 {
-    pjsip_hdr *hdr = pjsip_msg_find_hdr(msg, hdr_type, start);
+    pjsip_hdr *hdr = (pjsip_hdr*) pjsip_msg_find_hdr(msg, hdr_type, start);
     if (hdr) {
         pj_list_erase(hdr);
@@ -351 +352 @@
 
         /* Add URI */
-        uri = pjsip_uri_get_uri(msg->line.req.uri);
+        uri = (pjsip_uri*) pjsip_uri_get_uri(msg->line.req.uri);
         len = pjsip_uri_print( PJSIP_URI_IN_REQ_URI, uri, p, end-p);
         if (len < 1)
@@ -485 +486 @@
 PJ_DEF(void*) pjsip_hdr_clone( pj_pool_t *pool, const void *hdr_ptr )
 {
-    const pjsip_hdr *hdr = hdr_ptr;
+    const pjsip_hdr *hdr = (const pjsip_hdr*) hdr_ptr;
     return (*hdr->vptr->clone)(pool, hdr_ptr);
 }
@@ -492 +493 @@
 PJ_DEF(void*) pjsip_hdr_shallow_clone( pj_pool_t *pool, const void *hdr_ptr )
 {
-    const pjsip_hdr *hdr = hdr_ptr;
+    const pjsip_hdr *hdr = (const pjsip_hdr*) hdr_ptr;
     return (*hdr->vptr->shallow_clone)(pool, hdr_ptr);
 }
@@ -498 +499 @@
 PJ_DEF(int) pjsip_hdr_print_on( void *hdr_ptr, char *buf, pj_size_t len)
 {
-    pjsip_hdr *hdr = hdr_ptr;
+    pjsip_hdr *hdr = (pjsip_hdr*) hdr_ptr;
     return (*hdr->vptr->print_on)(hdr_ptr, buf, len);
 }
@@ -563 +564 @@
                                const pj_str_t *hvalue)
 {
-    pjsip_generic_string_hdr *hdr = mem;
+    pjsip_generic_string_hdr *hdr = (pjsip_generic_string_hdr*) mem;
     pj_str_t dup_hname, dup_hval;
 
@@ -625 +626 @@
                                                            const pjsip_generic_string_hdr *rhs )
 {
-    pjsip_generic_string_hdr *hdr = pj_pool_alloc(pool, sizeof(*hdr));
+    pjsip_generic_string_hdr *hdr = PJ_POOL_ALLOC_T(pool, pjsip_generic_string_hdr);
     pj_memcpy(hdr, rhs, sizeof(*hdr));
     return hdr;
@@ -654 +655 @@
                                                             int value)
 {
-    pjsip_generic_int_hdr *hdr = mem;
+    pjsip_generic_int_hdr *hdr = (pjsip_generic_int_hdr*) mem;
 
     init_hdr(hdr, PJSIP_H_OTHER, &generic_int_hdr_vptr);
@@ -694 +695 @@
                                                    const pjsip_generic_int_hdr *rhs)
 {
-    pjsip_generic_int_hdr *hdr = pj_pool_alloc(pool, sizeof(*hdr));
+    pjsip_generic_int_hdr *hdr = PJ_POOL_ALLOC_T(pool, pjsip_generic_int_hdr);
     pj_memcpy(hdr, rhs, sizeof(*hdr));
     return hdr;
@@ -702 +703 @@
                                                            const pjsip_generic_int_hdr *rhs )
 {
-    pjsip_generic_int_hdr *hdr = pj_pool_alloc(pool, sizeof(*hdr));
+    pjsip_generic_int_hdr *hdr = PJ_POOL_ALLOC_T(pool, pjsip_generic_int_hdr);
     pj_memcpy(hdr, rhs, sizeof(*hdr));
     return hdr;
@@ -729 +730 @@
                                                                const pj_str_t *hnames)
 {
-    pjsip_generic_array_hdr *hdr = mem;
+    pjsip_generic_array_hdr *hdr = (pjsip_generic_array_hdr*) mem;
 
     init_hdr(hdr, PJSIP_H_OTHER, &generic_array_hdr_vptr);
@@ -773 +774 @@
 {
     unsigned i;
-    pjsip_generic_array_hdr *hdr = pj_pool_alloc(pool, sizeof(*hdr));
+    pjsip_generic_array_hdr *hdr = PJ_POOL_ALLOC_T(pool, pjsip_generic_array_hdr);
 
     pj_memcpy(hdr, rhs, sizeof(*hdr));
@@ -787 +788 @@
                                                  const pjsip_generic_array_hdr *rhs)
 {
-    pjsip_generic_array_hdr *hdr = pj_pool_alloc(pool, sizeof(*hdr));
+    pjsip_generic_array_hdr *hdr = PJ_POOL_ALLOC_T(pool, pjsip_generic_array_hdr);
     pj_memcpy(hdr, rhs, sizeof(*hdr));
     return hdr;
@@ -799 +800 @@
                                                  void *mem )
 {
-    pjsip_accept_hdr *hdr = mem;
+    pjsip_accept_hdr *hdr = (pjsip_accept_hdr*) mem;
 
     PJ_UNUSED_ARG(pool);
@@ -823 +824 @@
                                                void *mem )
 {
-    pjsip_allow_hdr *hdr = mem;
+    pjsip_allow_hdr *hdr = (pjsip_allow_hdr*) mem;
 
     PJ_UNUSED_ARG(pool);
@@ -846 +847 @@
                                            void *mem )
 {
-    pjsip_cid_hdr *hdr = mem;
+    pjsip_cid_hdr *hdr = (pjsip_cid_hdr*) mem;
 
     PJ_UNUSED_ARG(pool);
@@ -880 +881 @@
                                              void *mem )
 {
-    pjsip_clen_hdr *hdr = mem;
+    pjsip_clen_hdr *hdr = (pjsip_clen_hdr*) mem;
 
     PJ_UNUSED_ARG(pool);
@@ -942 +943 @@
                                              void *mem )
 {
-    pjsip_cseq_hdr *hdr = mem;
+    pjsip_cseq_hdr *hdr = (pjsip_cseq_hdr*) mem;
 
     PJ_UNUSED_ARG(pool);
@@ -997 +998 @@
                                                      const pjsip_cseq_hdr *rhs )
 {
-    pjsip_cseq_hdr *hdr = pj_pool_alloc(pool, sizeof(*hdr));
+    pjsip_cseq_hdr *hdr = PJ_POOL_ALLOC_T(pool, pjsip_cseq_hdr);
     pj_memcpy(hdr, rhs, sizeof(*hdr));
     return hdr;
@@ -1021 +1022 @@
                                                    void *mem )
 {
-    pjsip_contact_hdr *hdr = mem;
+    pjsip_contact_hdr *hdr = (pjsip_contact_hdr*) mem;
 
     PJ_UNUSED_ARG(pool);
@@ -1113 +1114 @@
         return hdr;
 
-    hdr->uri = pjsip_uri_clone(pool, rhs->uri);
+    hdr->uri = (pjsip_uri*) pjsip_uri_clone(pool, rhs->uri);
     hdr->q1000 = rhs->q1000;
     hdr->expires = rhs->expires;
@@ -1124 +1125 @@
                                  const pjsip_contact_hdr *rhs)
 {
-    pjsip_contact_hdr *hdr = pj_pool_alloc(pool, sizeof(*hdr));
+    pjsip_contact_hdr *hdr = PJ_POOL_ALLOC_T(pool, pjsip_contact_hdr);
     pj_memcpy(hdr, rhs, sizeof(*hdr));
     pjsip_param_shallow_clone(pool, &hdr->other_param, &rhs->other_param);
@@ -1150 +1151 @@
                                                void *mem )
 {
-    pjsip_ctype_hdr *hdr = mem;
+    pjsip_ctype_hdr *hdr = (pjsip_ctype_hdr*) mem;
 
     PJ_UNUSED_ARG(pool);
@@ -1228 +1229 @@
                                                    int value)
 {
-    pjsip_expires_hdr *hdr = mem;
+    pjsip_expires_hdr *hdr = (pjsip_expires_hdr*) mem;
 
     PJ_UNUSED_ARG(pool);
@@ -1267 +1268 @@
                                              void *mem )
 {
-    pjsip_from_hdr *hdr = mem;
+    pjsip_from_hdr *hdr = (pjsip_from_hdr*) mem;
 
     PJ_UNUSED_ARG(pool);
@@ -1286 +1287 @@
                                          void *mem )
 {
-    pjsip_to_hdr *hdr = mem;
+    pjsip_to_hdr *hdr = (pjsip_to_hdr*) mem;
 
     PJ_UNUSED_ARG(pool);
@@ -1355 +1356 @@
     hdr->name = rhs->name;
     hdr->sname = rhs->sname;
-    hdr->uri = pjsip_uri_clone(pool, rhs->uri);
+    hdr->uri = (pjsip_uri*) pjsip_uri_clone(pool, rhs->uri);
     pj_strdup( pool, &hdr->tag, &rhs->tag);
     pjsip_param_clone( pool, &hdr->other_param, &rhs->other_param);
@@ -1366 +1367 @@
                                 const pjsip_fromto_hdr *rhs)
 {
-    pjsip_fromto_hdr *hdr = pj_pool_alloc(pool, sizeof(*hdr));
+    pjsip_fromto_hdr *hdr = PJ_POOL_ALLOC_T(pool, pjsip_fromto_hdr);
     pj_memcpy(hdr, rhs, sizeof(*hdr));
     pjsip_param_shallow_clone( pool, &hdr->other_param, &rhs->other_param);
@@ -1381 +1382 @@
                                                    int value)
 {
-    pjsip_max_fwd_hdr *hdr = mem;
+    pjsip_max_fwd_hdr *hdr = (pjsip_max_fwd_hdr*) mem;
 
     PJ_UNUSED_ARG(pool);
@@ -1407 +1408 @@
                                                            int value )
 {
-    pjsip_min_expires_hdr *hdr = mem;
+    pjsip_min_expires_hdr *hdr = (pjsip_min_expires_hdr*) mem;
 
     PJ_UNUSED_ARG(pool);
@@ -1441 +1442 @@
                                          void *mem )
 {
-    pjsip_rr_hdr *hdr = mem;
+    pjsip_rr_hdr *hdr = (pjsip_rr_hdr*) mem;
 
     PJ_UNUSED_ARG(pool);
@@ -1461 +1462 @@
                                                void *mem )
 {
-    pjsip_route_hdr *hdr = mem;
+    pjsip_route_hdr *hdr = (pjsip_route_hdr*) mem;
 
     PJ_UNUSED_ARG(pool);
@@ -1521 +1522 @@
                                                    const pjsip_routing_hdr *rhs )
 {
-    pjsip_routing_hdr *hdr = pj_pool_alloc(pool, sizeof(*hdr));
+    pjsip_routing_hdr *hdr = PJ_POOL_ALLOC_T(pool, pjsip_routing_hdr);
 
     init_hdr(hdr, rhs->type, rhs->vptr);
@@ -1533 +1534 @@
                                                            const pjsip_routing_hdr *rhs )
 {
-    pjsip_routing_hdr *hdr = pj_pool_alloc(pool, sizeof(*hdr));
+    pjsip_routing_hdr *hdr = PJ_POOL_ALLOC_T(pool, pjsip_routing_hdr);
     pj_memcpy(hdr, rhs, sizeof(*hdr));
     pjsip_param_shallow_clone( pool, &hdr->other_param, &rhs->other_param);
@@ -1547 +1548 @@
                                                    void *mem )
 {
-    pjsip_require_hdr *hdr = mem;
+    pjsip_require_hdr *hdr = (pjsip_require_hdr*) mem;
 
     PJ_UNUSED_ARG(pool);
@@ -1570 +1571 @@
                                                            int value )
 {
-    pjsip_retry_after_hdr *hdr = mem;
+    pjsip_retry_after_hdr *hdr = (pjsip_retry_after_hdr*) mem;
 
     PJ_UNUSED_ARG(pool);
@@ -1594 +1595 @@
                                                        void *mem )
 {
-    pjsip_supported_hdr *hdr = mem;
+    pjsip_supported_hdr *hdr = (pjsip_supported_hdr*) mem;
 
     PJ_UNUSED_ARG(pool);
@@ -1616 +1617 @@
                                                            void *mem )
 {
-    pjsip_unsupported_hdr *hdr = mem;
+    pjsip_unsupported_hdr *hdr = (pjsip_unsupported_hdr*) mem;
     
     PJ_UNUSED_ARG(pool);
@@ -1649 +1650 @@
                                            void *mem )
 {
-    pjsip_via_hdr *hdr = mem;
+    pjsip_via_hdr *hdr = (pjsip_via_hdr*) mem;
 
     PJ_UNUSED_ARG(pool);
@@ -1756 +1757 @@
                                                    const pjsip_via_hdr *rhs )
 {
-    pjsip_via_hdr *hdr = pj_pool_alloc(pool, sizeof(*hdr));
+    pjsip_via_hdr *hdr = PJ_POOL_ALLOC_T(pool, pjsip_via_hdr);
     pj_memcpy(hdr, rhs, sizeof(*hdr));
     pjsip_param_shallow_clone(pool, &hdr->other_param, &rhs->other_param);
@@ -1774 +1775 @@
     pj_str_t hvalue;
 
-    hvalue.ptr = pj_pool_alloc(pool, 10 +               /* code */
-                                     host->slen + 2 +   /* host */
-                                     text->slen + 2);   /* text */
+    hvalue.ptr = (char*) pj_pool_alloc(pool, 10 +               /* code */
+                                             host->slen + 2 +   /* host */
+                                             text->slen + 2);   /* text */
     hvalue.slen = pj_ansi_sprintf(hvalue.ptr, "%u %.*s \"%.*s\"",
                                   code, (int)host->slen, host->ptr,
@@ -1814 +1815 @@
 
     if (len) {
-        newdata = pj_pool_alloc(pool, len);
+        newdata = (char*) pj_pool_alloc(pool, len);
         pj_memcpy(newdata, data, len);
     }
@@ -1856 +1857 @@
     pj_status_t status;
 
-    new_body = pj_pool_alloc(pool, sizeof(pjsip_msg_body));
+    new_body = PJ_POOL_ALLOC_T(pool, pjsip_msg_body);
     PJ_ASSERT_RETURN(new_body, NULL);
 
@@ -1874 +1875 @@
     PJ_ASSERT_RETURN(pool && type && subtype && text, NULL);
 
-    body = pj_pool_zalloc(pool, sizeof(pjsip_msg_body));
+    body = PJ_POOL_ZALLOC_T(pool, pjsip_msg_body);
     PJ_ASSERT_RETURN(body != NULL, NULL);
 

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);

pjproject/trunk/pjsip/src/pjsip/sip_resolve.c

@@ -104 +104 @@
 
     PJ_ASSERT_RETURN(pool && p_res, PJ_EINVAL);
-    resolver = pj_pool_zalloc(pool, sizeof(*resolver));
+    resolver = PJ_POOL_ZALLOC_T(pool, pjsip_resolver_t);
     *p_res = resolver;
 
@@ -279 +279 @@
 
     /* Build the query state */
-    query = pj_pool_zalloc(pool, sizeof(struct query));
+    query = PJ_POOL_ZALLOC_T(pool, struct query);
     pj_ansi_snprintf(query->objname, sizeof(query->objname), "rsvjob%X",
                      resolver->job_id++);
@@ -299 +299 @@
     query->naptr[0].pref = 0;
     query->naptr[0].type = type;
-    query->naptr[0].target_name.ptr = 
+    query->naptr[0].target_name.ptr = (char*)
         pj_pool_alloc(pool, target->addr.host.slen + 12);
 
@@ -640 +640 @@
                          pj_dns_parsed_packet *pkt)
 {
-    struct query *query = user_data;
+    struct query *query = (struct query*) user_data;
     unsigned i;