Changeset 1266 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_im.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_im.c (modified) (10 diffs)

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

@@ -113 +113 @@
      * "text/plain".
      */
-    ctype = pjsip_msg_find_hdr(msg, PJSIP_H_CONTENT_TYPE, NULL);
+    ctype = (pjsip_ctype_hdr*)
+            pjsip_msg_find_hdr(msg, PJSIP_H_CONTENT_TYPE, NULL);
     if (msg->body == NULL || ctype == NULL || 
         !acceptable_message(&ctype->media)) 
@@ -143 +144 @@
 
     /* Build remote contact */
-    contact_hdr = pjsip_msg_find_hdr(rdata->msg_info.msg, PJSIP_H_CONTACT,
+    contact_hdr = (pjsip_contact_hdr*)
+                  pjsip_msg_find_hdr(rdata->msg_info.msg, PJSIP_H_CONTACT,
                                      NULL);
     if (contact_hdr) {
-        contact.ptr = pj_pool_alloc(rdata->tp_info.pool, 
-                                    PJSIP_MAX_URL_SIZE);
+        contact.ptr = (char*) pj_pool_alloc(rdata->tp_info.pool, 
+                                            PJSIP_MAX_URL_SIZE);
         contact.slen = pjsip_uri_print(PJSIP_URI_IN_CONTACT_HDR,
                                        contact_hdr->uri, contact.ptr,
@@ -163 +165 @@
         
         /* Save text body */
-        text_body.ptr = rdata->msg_info.msg->body->data;
+        text_body.ptr = (char*) rdata->msg_info.msg->body->data;
         text_body.slen = rdata->msg_info.msg->body->len;
 
@@ -176 +178 @@
         pj_bool_t is_typing;
 
-        status = pjsip_iscomposing_parse( rdata->tp_info.pool, body->data,
-                                          body->len, &is_typing, NULL, NULL,
-                                          NULL );
+        status = pjsip_iscomposing_parse(rdata->tp_info.pool, (char*)body->data,
+                                         body->len, &is_typing, NULL, NULL,
+                                         NULL );
         if (status != PJ_SUCCESS) {
             pjsua_perror(THIS_FILE, "Invalid MESSAGE body", status);
@@ -241 +243 @@
      * not available, then use From header.
      */
-    from.ptr = pj_pool_alloc(rdata->tp_info.pool, PJSIP_MAX_URL_SIZE);
-    contact_hdr = pjsip_msg_find_hdr(rdata->msg_info.msg,
+    from.ptr = (char*) pj_pool_alloc(rdata->tp_info.pool, PJSIP_MAX_URL_SIZE);
+    contact_hdr = (pjsip_contact_hdr*)
+                  pjsip_msg_find_hdr(rdata->msg_info.msg,
                                      PJSIP_H_CONTACT, NULL);
     if (contact_hdr) {
@@ -258 +261 @@
 
     /* Build the To text. */
-    to.ptr = pj_pool_alloc(rdata->tp_info.pool, PJSIP_MAX_URL_SIZE);
+    to.ptr = (char*) pj_pool_alloc(rdata->tp_info.pool, PJSIP_MAX_URL_SIZE);
     to.slen = pjsip_uri_print( PJSIP_URI_IN_FROMTO_HDR, 
                                rdata->msg_info.to->uri,
@@ -276 +279 @@
 static void im_callback(void *token, pjsip_event *e)
 {
-    pjsua_im_data *im_data = token;
+    pjsua_im_data *im_data = (pjsua_im_data*) token;
 
     if (e->type == PJSIP_EVENT_TSX_STATE) {
@@ -353 +356 @@
 static void typing_callback(void *token, pjsip_event *e)
 {
-    pjsua_im_data *im_data = token;
+    pjsua_im_data *im_data = (pjsua_im_data*) token;
 
     if (e->type == PJSIP_EVENT_TSX_STATE) {
@@ -464 +467 @@
      * application on the callback
      */
-    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 = acc_id;
     im_data->call_id = PJSUA_INVALID_ID;
@@ -571 +574 @@
 
     /* Create data to reauthenticate */
-    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 = acc_id;