Changeset 789 for pjproject/branches/symbian/pjsip/src/pjsip/sip_uri.c

Timestamp:

Oct 29, 2006 6:13:13 PM (18 years ago)

Author:

bennylp

Message:

Another Symbian commit, ported all PJSIP libraries and sipstateless runs without crashes (still no SIP message though)

File:

• pjproject/branches/symbian/pjsip/src/pjsip/sip_uri.c (modified) (8 diffs)

pjproject/branches/symbian/pjsip/src/pjsip/sip_uri.c

@@ -61 +61 @@
     pj_list_init(dst_list);
     while (p != src_list) {
-        pjsip_param *new_param = pj_pool_alloc(pool, sizeof(pjsip_param));
+        pjsip_param *new_param = (pjsip_param *)
+                                 pj_pool_alloc(pool, sizeof(pjsip_param));
         pj_strdup(pool, &new_param->name, &p->name);
         pj_strdup(pool, &new_param->value, &p->value);
@@ -78 +79 @@
     pj_list_init(dst_list);
     while (p != src_list) {
-        pjsip_param *new_param = pj_pool_alloc(pool, sizeof(pjsip_param));
+        pjsip_param *new_param = (pjsip_param *) 
+                                 pj_pool_alloc(pool, sizeof(pjsip_param));
         new_param->name = p->name;
         new_param->value = p->value;
@@ -156 +158 @@
                                       const pjsip_sip_uri *rhs);
 
+typedef const pj_str_t* (*FGETSCHEME)(const void *uri);
+typedef void* (*FGETURI)(void *uri);
+typedef pj_ssize_t (*FPRINT)(pjsip_uri_context_e context,
+                             const void *uri, 
+                             char *buf, pj_size_t size);
+typedef pj_status_t (*FCOMPARE)(pjsip_uri_context_e context, 
+                                const void *uri1, const void *uri2);
+typedef void *(*FCLONE)(pj_pool_t *pool, const void *uri);
+
+
 static pjsip_uri_vptr sip_url_vptr = 
 {
-    HAPPY_FLAG &pjsip_url_get_scheme,
-    HAPPY_FLAG &pjsip_get_uri,
-    HAPPY_FLAG &pjsip_url_print,
-    HAPPY_FLAG &pjsip_url_compare,
-    HAPPY_FLAG &pjsip_url_clone
+    (FGETSCHEME)&pjsip_url_get_scheme,
+    (FGETURI)   &pjsip_get_uri,
+    (FPRINT)    &pjsip_url_print,
+    (FCOMPARE)  &pjsip_url_compare,
+    (FCLONE)    &pjsip_url_clone
 };
 
 static pjsip_uri_vptr sips_url_vptr = 
 {
-    HAPPY_FLAG &pjsips_url_get_scheme,
-    HAPPY_FLAG &pjsip_get_uri,
-    HAPPY_FLAG &pjsip_url_print,
-    HAPPY_FLAG &pjsip_url_compare,
-    HAPPY_FLAG &pjsip_url_clone
+    (FGETSCHEME)&pjsips_url_get_scheme,
+    (FGETURI)   &pjsip_get_uri,
+    (FPRINT)    &pjsip_url_print,
+    (FCOMPARE)  &pjsip_url_compare,
+    (FCLONE)    &pjsip_url_clone
 };
 
 static pjsip_uri_vptr name_addr_vptr = 
 {
-    HAPPY_FLAG &pjsip_name_addr_get_scheme,
-    HAPPY_FLAG &pjsip_name_addr_get_uri,
-    HAPPY_FLAG &pjsip_name_addr_print,
-    HAPPY_FLAG &pjsip_name_addr_compare,
-    HAPPY_FLAG &pjsip_name_addr_clone
+    (FGETSCHEME)&pjsip_name_addr_get_scheme,
+    (FGETURI)   &pjsip_name_addr_get_uri,
+    (FPRINT)    &pjsip_name_addr_print,
+    (FCOMPARE)  &pjsip_name_addr_compare,
+    (FCLONE)    &pjsip_name_addr_clone
 };
 
@@ -216 +228 @@
 PJ_DEF(pjsip_sip_uri*) pjsip_sip_uri_create( pj_pool_t *pool, int secure )
 {
-    pjsip_sip_uri *url = pj_pool_alloc(pool, sizeof(pjsip_sip_uri));
+    pjsip_sip_uri *url = (pjsip_sip_uri *)pj_pool_alloc(pool, sizeof(pjsip_sip_uri));
     pjsip_sip_uri_init(url, secure);
     return url;
@@ -485 +497 @@
 static pjsip_sip_uri* pjsip_url_clone(pj_pool_t *pool, const pjsip_sip_uri *rhs)
 {
-    pjsip_sip_uri *url = pj_pool_alloc(pool, sizeof(pjsip_sip_uri));
+    pjsip_sip_uri *url = (pjsip_sip_uri *)pj_pool_alloc(pool, sizeof(pjsip_sip_uri));
     if (!url)
         return NULL;
@@ -509 +521 @@
 PJ_DEF(pjsip_name_addr*) pjsip_name_addr_create(pj_pool_t *pool)
 {
-    pjsip_name_addr *name_addr = pj_pool_alloc(pool, sizeof(pjsip_name_addr));
+    pjsip_name_addr *name_addr = (pjsip_name_addr *)pj_pool_alloc(pool, sizeof(pjsip_name_addr));
     pjsip_name_addr_init(name_addr);
     return name_addr;
@@ -552 +564 @@
 {
     pj_strdup( pool, &dst->display, &src->display);
-    dst->uri = pjsip_uri_clone(pool, src->uri);
+    dst->uri = (pjsip_uri*)pjsip_uri_clone(pool, src->uri);
 }
 
@@ -558 +570 @@
                                                const pjsip_name_addr *rhs)
 {
-    pjsip_name_addr *addr = pj_pool_alloc(pool, sizeof(pjsip_name_addr));
+    pjsip_name_addr *addr = (pjsip_name_addr *)pj_pool_alloc(pool, sizeof(pjsip_name_addr));
     if (!addr)
         return NULL;