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

Timestamp:

May 11, 2007 3:14:34 PM (18 years ago)

Author:

bennylp

Message:

HUGE changeset to make the rest of the libraries compile with C++ mode

File:

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

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

@@ -38 +38 @@
 PJ_DEF(pj_bool_t) pjsua_acc_is_valid(pjsua_acc_id acc_id)
 {
-    return acc_id>=0 && acc_id<PJ_ARRAY_SIZE(pjsua_var.acc) &&
+    return acc_id>=0 && acc_id<(int)PJ_ARRAY_SIZE(pjsua_var.acc) &&
            pjsua_var.acc[acc_id].valid;
 }
@@ -186 +186 @@
         pj_strdup_with_null(pjsua_var.pool, &tmp, 
                             &pjsua_var.ua_cfg.outbound_proxy[i]);
-        r = pjsip_parse_hdr(pjsua_var.pool, &hname, tmp.ptr, tmp.slen, NULL);
+        r = (pjsip_route_hdr*)
+            pjsip_parse_hdr(pjsua_var.pool, &hname, tmp.ptr, tmp.slen, NULL);
         if (r == NULL) {
             pjsua_perror(THIS_FILE, "Invalid outbound proxy URI",
@@ -201 +202 @@
 
         pj_strdup_with_null(pjsua_var.pool, &tmp, &acc_cfg->proxy[i]);
-        r = pjsip_parse_hdr(pjsua_var.pool, &hname, tmp.ptr, tmp.slen, NULL);
+        r = (pjsip_route_hdr*)
+            pjsip_parse_hdr(pjsua_var.pool, &hname, tmp.ptr, tmp.slen, NULL);
         if (r == NULL) {
             pjsua_perror(THIS_FILE, "Invalid URI in account route set",
@@ -323 +325 @@
 
     /* ID must be valid */
-    PJ_ASSERT_RETURN(tid>=0 && tid<PJ_ARRAY_SIZE(pjsua_var.tpdata), PJ_EINVAL);
+    PJ_ASSERT_RETURN(tid>=0 && tid<(int)PJ_ARRAY_SIZE(pjsua_var.tpdata), 
+                     PJ_EINVAL);
 
     /* Transport must be valid */
@@ -434 +437 @@
 {
 
-    pjsua_acc *acc = param->token;
+    pjsua_acc *acc = (pjsua_acc*) param->token;
 
     PJSUA_LOCK();
@@ -817 +820 @@
     }
 
-    sip_uri = pjsip_uri_get_uri(uri);
+    sip_uri = (pjsip_sip_uri*) pjsip_uri_get_uri(uri);
 
     /* Find matching domain AND port */
@@ -955 +958 @@
     r = acc->route_set.next;
     while (r != &acc->route_set) {
-        pjsip_msg_add_hdr(tdata->msg, pjsip_hdr_clone(tdata->pool, r));
+        pjsip_msg_add_hdr(tdata->msg, 
+                          (pjsip_hdr*)pjsip_hdr_clone(tdata->pool, r));
         r = r->next;
     }
@@ -1037 +1041 @@
 
     /* Create the contact header */
-    contact->ptr = pj_pool_alloc(pool, PJSIP_MAX_URL_SIZE);
+    contact->ptr = (char*)pj_pool_alloc(pool, PJSIP_MAX_URL_SIZE);
     contact->slen = pj_ansi_snprintf(contact->ptr, PJSIP_MAX_URL_SIZE,
                                      "%.*s%s<%s:%.*s%s%.*s:%d;transport=%s>",
@@ -1098 +1102 @@
 
         /* Otherwise URI is Contact URI */
-        h_contact = pjsip_msg_find_hdr(rdata->msg_info.msg, PJSIP_H_CONTACT,
+        h_contact = (pjsip_contact_hdr*)
+                    pjsip_msg_find_hdr(rdata->msg_info.msg, PJSIP_H_CONTACT,
                                        NULL);
         if (h_contact)
-            uri = pjsip_uri_get_uri(h_contact->uri);
+            uri = (pjsip_uri*) pjsip_uri_get_uri(h_contact->uri);
         
 
@@ -1108 +1113 @@
          */
         if (uri == NULL)
-            uri = pjsip_uri_get_uri(rdata->msg_info.from->uri);
+            uri = (pjsip_uri*) pjsip_uri_get_uri(rdata->msg_info.from->uri);
 
 
@@ -1143 +1148 @@
 
     /* Create the contact header */
-    contact->ptr = pj_pool_alloc(pool, PJSIP_MAX_URL_SIZE);
+    contact->ptr = (char*) pj_pool_alloc(pool, PJSIP_MAX_URL_SIZE);
     contact->slen = pj_ansi_snprintf(contact->ptr, PJSIP_MAX_URL_SIZE,
                                      "%.*s%s<%s:%.*s%s%.*s:%d;transport=%s>",
@@ -1170 +1175 @@
     acc = &pjsua_var.acc[acc_id];
 
-    PJ_ASSERT_RETURN(tp_id >= 0 && tp_id < PJ_ARRAY_SIZE(pjsua_var.tpdata),
+    PJ_ASSERT_RETURN(tp_id >= 0 && tp_id < (int)PJ_ARRAY_SIZE(pjsua_var.tpdata),
                      PJ_EINVAL);