Changeset 789 for pjproject/branches/symbian/pjsip/src/pjsip/sip_tel_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_tel_uri.c (modified) (3 diffs)

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

@@ -74 +74 @@
                                      pj_bool_t parse_params);
 
-#ifdef __GNUC__
-#  define HAPPY_FLAG    (void*)
-#else
-#  define HAPPY_FLAG
-#endif
+
+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 tel_uri_vptr = 
 {
-    HAPPY_FLAG &tel_uri_get_scheme,
-    HAPPY_FLAG &tel_uri_get_uri,
-    HAPPY_FLAG &tel_uri_print,
-    HAPPY_FLAG &tel_uri_cmp,
-    HAPPY_FLAG &tel_uri_clone
+    (FGETSCHEME) &tel_uri_get_scheme,
+    (FGETURI)    &tel_uri_get_uri,
+    (FPRINT)     &tel_uri_print,
+    (FCOMPARE)   &tel_uri_cmp,
+    (FCLONE)     &tel_uri_clone
 };
 
@@ -92 +97 @@
 PJ_DEF(pjsip_tel_uri*) pjsip_tel_uri_create(pj_pool_t *pool)
 {
-    pjsip_tel_uri *uri = pj_pool_zalloc(pool, sizeof(pjsip_tel_uri));
+    pjsip_tel_uri *uri = (pjsip_tel_uri *) 
+                         pj_pool_zalloc(pool, sizeof(pjsip_tel_uri));
     uri->vptr = &tel_uri_vptr;
     pj_list_init(&uri->other_param);
@@ -404 +410 @@
                 uri->context = pvalue;
             } else {
-                pjsip_param *param = pj_pool_alloc(pool, sizeof(pjsip_param));
+                pjsip_param *param = (pjsip_param *)
+                                     pj_pool_alloc(pool, sizeof(pjsip_param));
                 param->name = pname;
                 param->value = pvalue;