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

Timestamp:

May 11, 2007 3:14:34 PM (17 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_call.c (modified) (20 diffs)

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

@@ -204 +204 @@
     pjsua_acc *acc;
     pjsua_call *call;
-    unsigned call_id;
+    int call_id = -1;
     pj_str_t contact;
     pjsip_tx_data *tdata;
@@ -211 +211 @@
 
     /* Check that account is valid */
-    PJ_ASSERT_RETURN(acc_id>=0 || acc_id<PJ_ARRAY_SIZE(pjsua_var.acc), 
+    PJ_ASSERT_RETURN(acc_id>=0 || acc_id<(int)PJ_ARRAY_SIZE(pjsua_var.acc), 
                      PJ_EINVAL);
 
@@ -231 +231 @@
 
     /* Find free call slot. */
-    for (call_id=0; call_id<pjsua_var.ua_cfg.max_calls; ++call_id) {
+    for (call_id=0; call_id<(int)pjsua_var.ua_cfg.max_calls; ++call_id) {
         if (pjsua_var.calls[call_id].inv == NULL)
             break;
     }
 
-    if (call_id == pjsua_var.ua_cfg.max_calls) {
+    if (call_id == (int)pjsua_var.ua_cfg.max_calls) {
         pjsua_perror(THIS_FILE, "Error making file", PJ_ETOOMANY);
         PJSUA_UNLOCK();
@@ -508 +508 @@
 
         /* Get the replaced call instance */
-        replaced_call = replaced_dlg->mod_data[pjsua_var.mod.id];
+        replaced_call = (pjsua_call*) replaced_dlg->mod_data[pjsua_var.mod.id];
 
         /* Notify application */
@@ -691 +691 @@
 
         /* Get the replaced call instance */
-        replaced_call = replaced_dlg->mod_data[pjsua_var.mod.id];
+        replaced_call = (pjsua_call*) replaced_dlg->mod_data[pjsua_var.mod.id];
 
         /* Notify application */
@@ -1378 +1378 @@
                       dest_dlg->remote.info->tag.slen +
                       dest_dlg->local.info->tag.slen + 32 
-                      < sizeof(str_dest_buf), PJSIP_EURITOOLONG);
+                      < (long)sizeof(str_dest_buf), PJSIP_EURITOOLONG);
 
     /* Print URI */
@@ -1384 +1384 @@
     str_dest.slen = 1;
 
-    uri = pjsip_uri_get_uri(dest_dlg->remote.info->uri);
+    uri = (pjsip_uri*) pjsip_uri_get_uri(dest_dlg->remote.info->uri);
     len = pjsip_uri_print(PJSIP_URI_IN_REQ_URI, uri, 
                           str_dest_buf+1, sizeof(str_dest_buf)-1);
@@ -1510 +1510 @@
 
     /* Create IM data and attach to the request. */
-    im_data = pj_pool_zalloc(tdata->pool, sizeof(*im_data));
+    im_data = PJ_POOL_ZALLOC_T(tdata->pool, pjsua_im_data);
     im_data->acc_id = call->acc_id;
     im_data->call_id = call_id;
@@ -1935 +1935 @@
     PJSUA_LOCK();
 
-    call = inv->dlg->mod_data[pjsua_var.mod.id];
+    call = (pjsua_call*) inv->dlg->mod_data[pjsua_var.mod.id];
 
     if (!call) {
@@ -2105 +2105 @@
     PJSUA_LOCK();
 
-    call = inv->dlg->mod_data[pjsua_var.mod.id];
+    call = (pjsua_call*) inv->dlg->mod_data[pjsua_var.mod.id];
 
     if (status != PJ_SUCCESS) {
@@ -2232 +2232 @@
     PJSUA_LOCK();
 
-    call = inv->dlg->mod_data[pjsua_var.mod.id];
+    call = (pjsua_call*) inv->dlg->mod_data[pjsua_var.mod.id];
 
     /*
@@ -2315 +2315 @@
         pjsua_call *call;
 
-        call = pjsip_evsub_get_mod_data(sub, pjsua_var.mod.id);
+        call = (pjsua_call*) pjsip_evsub_get_mod_data(sub, pjsua_var.mod.id);
 
         /* Must be receipt of response message */
@@ -2378 +2378 @@
         pj_status_t status;
 
-        call = pjsip_evsub_get_mod_data(sub, pjsua_var.mod.id);
+        call = (pjsua_call*) pjsip_evsub_get_mod_data(sub, pjsua_var.mod.id);
 
         /* When subscription is terminated, clear the xfer_sub member of 
@@ -2422 +2422 @@
 
             /* Try to parse the content */
-            status = pjsip_parse_status_line(body->data, body->len, 
+            status = pjsip_parse_status_line((char*)body->data, body->len, 
                                              &status_line);
             if (status != PJ_SUCCESS) {
@@ -2467 +2467 @@
         pjsua_call *call;
 
-        call = pjsip_evsub_get_mod_data(sub, pjsua_var.mod.id);
+        call = (pjsua_call*) pjsip_evsub_get_mod_data(sub, pjsua_var.mod.id);
         if (!call)
             return;
@@ -2502 +2502 @@
     pjsip_evsub *sub;
 
-    existing_call = inv->dlg->mod_data[pjsua_var.mod.id];
+    existing_call = (pjsua_call*) inv->dlg->mod_data[pjsua_var.mod.id];
 
     /* Find the Refer-To header */
@@ -2529 +2529 @@
      * request.
      */
-    ref_by_hdr = pjsip_msg_find_hdr_by_name(rdata->msg_info.msg, &str_ref_by, 
+    ref_by_hdr = (pjsip_hdr*)
+                 pjsip_msg_find_hdr_by_name(rdata->msg_info.msg, &str_ref_by, 
                                             NULL);
 
@@ -2656 +2657 @@
      */
     if (ref_by_hdr != NULL) {
-        pjsip_hdr *dup = pjsip_hdr_clone(rdata->tp_info.pool, ref_by_hdr);
+        pjsip_hdr *dup = (pjsip_hdr*)
+                         pjsip_hdr_clone(rdata->tp_info.pool, ref_by_hdr);
         pj_list_push_back(&msg_data.hdr_list, dup);
     }
@@ -2711 +2713 @@
                                             pjsip_event *e)
 {
-    pjsua_call *call = inv->dlg->mod_data[pjsua_var.mod.id];
+    pjsua_call *call = (pjsua_call*) inv->dlg->mod_data[pjsua_var.mod.id];
 
     PJSUA_LOCK();
@@ -2773 +2775 @@
             pjsua_im_data *im_data;
 
-            im_data = tsx->mod_data[pjsua_var.mod.id];
+            im_data = (pjsua_im_data*) tsx->mod_data[pjsua_var.mod.id];
             /* im_data can be NULL if this is typing indication */