Changeset 1929 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c

Timestamp:

Apr 14, 2008 4:04:30 AM (16 years ago)

Author:

bennylp

Message:

Fixed miscellaneous compile warnings/errors when built with C++ mode

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c

@@ -520 +520 @@
         /* Remote doesn't support rport */
         rport = via->sent_by.port;
-        if (rport==0)
-            rport = pjsip_transport_get_default_port_for_type(tp->key.type);
+        if (rport==0) {
+            pjsip_transport_type_e tp_type;
+            tp_type = (pjsip_transport_type_e) tp->key.type;
+            rport = pjsip_transport_get_default_port_for_type(tp_type);
+        }
     } else
         rport = via->rport_param;
@@ -535 +538 @@
           pjsip_parse_uri(pool, acc->contact.ptr, acc->contact.slen, 0);
     pj_assert(uri != NULL);
-    uri = pjsip_uri_get_uri(uri);
-
-    if (uri->port == 0)
-        uri->port = pjsip_transport_get_default_port_for_type(tp->key.type);
+    uri = (pjsip_sip_uri*) pjsip_uri_get_uri(uri);
+
+    if (uri->port == 0) {
+        pjsip_transport_type_e tp_type;
+        tp_type = (pjsip_transport_type_e) tp->key.type;
+        uri->port = pjsip_transport_get_default_port_for_type(tp_type);
+    }
 
     if (uri->port == rport &&
@@ -573 +579 @@
         int len;
 
-        tmp = pj_pool_alloc(pool, PJSIP_MAX_URL_SIZE);
+        tmp = (char*) pj_pool_alloc(pool, PJSIP_MAX_URL_SIZE);
         len = pj_ansi_snprintf(tmp, PJSIP_MAX_URL_SIZE,
                                "<sip:%.*s@%.*s:%d;transport=%s>",