Changeset 1981 for pjproject/trunk

Timestamp:

Jun 4, 2008 2:44:29 PM (16 years ago)

Author:

bennylp

Message:

Fixed gcc warnings about type pruned pointers

Location:

pjproject/trunk/pjsip/src

Files:

• pjsip-ua/sip_reg.c (modified) (1 diff)
• test-pjsip/regc_test.c (modified) (4 diffs)

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

@@ -569 +569 @@
     /* Add Contact headers. */
     hdr = (pjsip_hdr*)regc->contact_hdr_list.next;
-    while (hdr != (pjsip_hdr*)&regc->contact_hdr_list) {
+    while ((void*)hdr != (void*)&regc->contact_hdr_list) {
         pjsip_msg_add_hdr(msg, (pjsip_hdr*)
                                pjsip_hdr_shallow_clone(tdata->pool, hdr));

pjproject/trunk/pjsip/src/test-pjsip/regc_test.c

@@ -581 +581 @@
         goto on_return;
     }
-    if (h1->next == (pjsip_contact_hdr*)&tdata->msg->hdr)
+    if ((void*)h1->next == (void*)&tdata->msg->hdr)
         h2 = NULL;
     else
@@ -591 +591 @@
     }
     /* must not have other Contact header */
-    if (h2->next != (pjsip_contact_hdr*)&tdata->msg->hdr &&
+    if ((void*)h2->next != (void*)&tdata->msg->hdr &&
         pjsip_msg_find_hdr(tdata->msg, PJSIP_H_CONTACT, h2->next) != NULL)
     {
@@ -661 +661 @@
             goto on_return;
         }
-        if (h1->next == (pjsip_contact_hdr*)&tdata->msg->hdr)
+        if ((void*)h1->next == (void*)&tdata->msg->hdr)
             h2 = NULL;
         else
@@ -671 +671 @@
         }
         /* must not have other Contact header */
-        if (h2->next != (pjsip_contact_hdr*)&tdata->msg->hdr &&
+        if ((void*)h2->next != (void*)&tdata->msg->hdr &&
             pjsip_msg_find_hdr(tdata->msg, PJSIP_H_CONTACT, h2->next) != NULL)
         {