Changeset 1266 for pjproject/trunk/pjsip/src/pjsip-ua/sip_reg.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/pjsip-ua/sip_reg.c (modified) (12 diffs)

pjproject/trunk/pjsip/src/pjsip-ua/sip_reg.c

@@ -104 +104 @@
     PJ_ASSERT_RETURN(pool != NULL, PJ_ENOMEM);
 
-    regc = pj_pool_zalloc(pool, sizeof(struct pjsip_regc));
+    regc = PJ_POOL_ZALLOC_T(pool, pjsip_regc);
 
     regc->pool = pool;
@@ -110 +110 @@
     regc->token = token;
     regc->cb = cb;
-    regc->contact_buf = pj_pool_alloc(pool, PJSIP_REGC_CONTACT_BUF_SIZE);
+    regc->contact_buf = (char*)pj_pool_alloc(pool, PJSIP_REGC_CONTACT_BUF_SIZE);
     regc->expires = PJSIP_REGC_EXPIRATION_NOT_SPECIFIED;
 
@@ -387 +387 @@
         const pjsip_route_hdr *route;
 
-        route_pos = pjsip_msg_find_hdr(tdata->msg, PJSIP_H_VIA, NULL);
+        route_pos = (pjsip_hdr*)
+                    pjsip_msg_find_hdr(tdata->msg, PJSIP_H_VIA, NULL);
         if (!route_pos)
             route_pos = &tdata->msg->hdr;
@@ -393 +394 @@
         route = regc->route_set.next;
         while (route != &regc->route_set) {
-            pjsip_hdr *new_hdr = pjsip_hdr_shallow_clone(tdata->pool, route);
+            pjsip_hdr *new_hdr = (pjsip_hdr*)
+                                 pjsip_hdr_shallow_clone(tdata->pool, route);
             pj_list_insert_after(route_pos, new_hdr);
             route_pos = new_hdr;
@@ -406 +408 @@
         hdr = regc->hdr_list.next;
         while (hdr != &regc->hdr_list) {
-            pjsip_hdr *new_hdr = pjsip_hdr_shallow_clone(tdata->pool, hdr);
+            pjsip_hdr *new_hdr = (pjsip_hdr*)
+                                 pjsip_hdr_shallow_clone(tdata->pool, hdr);
             pjsip_msg_add_hdr(tdata->msg, new_hdr);
             hdr = hdr->next;
@@ -433 +436 @@
     /* Add Contact header. */
     msg = tdata->msg;
-    pjsip_msg_add_hdr(msg, pjsip_hdr_shallow_clone(tdata->pool, 
+    pjsip_msg_add_hdr(msg, (pjsip_hdr*)
+                           pjsip_hdr_shallow_clone(tdata->pool, 
                                                    regc->contact_hdr));
     if (regc->expires_hdr)
-        pjsip_msg_add_hdr(msg, pjsip_hdr_shallow_clone(tdata->pool,
+        pjsip_msg_add_hdr(msg, (pjsip_hdr*)
+                               pjsip_hdr_shallow_clone(tdata->pool,
                                                        regc->expires_hdr));
 
@@ -471 +476 @@
 
     msg = tdata->msg;
-    pjsip_msg_add_hdr(msg, pjsip_hdr_shallow_clone(tdata->pool, 
+    pjsip_msg_add_hdr(msg, (pjsip_hdr*)
+                           pjsip_hdr_shallow_clone(tdata->pool, 
                                                    regc->contact_hdr));
     pjsip_msg_add_hdr( msg, (pjsip_hdr*)regc->unreg_expires_hdr);
@@ -554 +560 @@
                                    struct pj_timer_entry *entry)
 {
-    pjsip_regc *regc = entry->user_data;
+    pjsip_regc *regc = (pjsip_regc*) entry->user_data;
     pjsip_tx_data *tdata;
     pj_status_t status;
@@ -588 +594 @@
 {
     pj_status_t status;
-    pjsip_regc *regc = token;
+    pjsip_regc *regc = (pjsip_regc*) token;
     pjsip_transaction *tsx = event->body.tsx_state.tsx;
     
@@ -654 +660 @@
             rdata = event->body.tsx_state.src.rdata;
             msg = rdata->msg_info.msg;
-            hdr = pjsip_msg_find_hdr( msg, PJSIP_H_CONTACT, NULL);
+            hdr = (pjsip_contact_hdr*)
+                  pjsip_msg_find_hdr( msg, PJSIP_H_CONTACT, NULL);
             while (hdr) {
                 contact[contact_cnt++] = hdr;
@@ -660 +667 @@
                 if (hdr == (void*)&msg->hdr)
                     break;
-                hdr = pjsip_msg_find_hdr(msg, PJSIP_H_CONTACT, hdr);
+                hdr = (pjsip_contact_hdr*)
+                      pjsip_msg_find_hdr(msg, PJSIP_H_CONTACT, hdr);
             }
 
-            expires = pjsip_msg_find_hdr(msg, PJSIP_H_EXPIRES, NULL);
+            expires = (pjsip_expires_hdr*)
+                      pjsip_msg_find_hdr(msg, PJSIP_H_EXPIRES, NULL);
 
             if (expires)
@@ -741 +750 @@
     /* Increment CSeq */
     cseq = ++regc->cseq_hdr->cseq;
-    cseq_hdr = pjsip_msg_find_hdr(tdata->msg, PJSIP_H_CSEQ, NULL);
+    cseq_hdr = (pjsip_cseq_hdr*)
+               pjsip_msg_find_hdr(tdata->msg, PJSIP_H_CSEQ, NULL);
     cseq_hdr->cseq = cseq;