Changeset 893

Timestamp:

Jan 21, 2007 5:53:39 PM (17 years ago)

Author:

bennylp

Message:

Fixed gcc warnings, especially about dereferencing type-punned pointer

Location:

pjproject/trunk

Files:

• pjlib/src/pj/lock.c (modified) (4 diffs)
• pjmedia/src/pjmedia/BladeMP3EncDLL.h (modified) (2 diffs)
• pjmedia/src/pjmedia/echo_speex.c (modified) (1 diff)
• pjsip-apps/src/pjsua/pjsua_app.c (modified) (1 diff)
• pjsip-apps/src/samples/siprtp.c (modified) (2 diffs)
• pjsip/src/pjsip/sip_dialog.c (modified) (1 diff)
• pjsip/src/test-pjsip/msg_test.c (modified) (1 diff)

pjproject/trunk/pjlib/src/pj/lock.c

@@ -60 +60 @@
 {
     pj_lock_t *p_lock;
+    pj_mutex_t *mutex;
     pj_status_t rc;
 
@@ -69 +70 @@
 
     pj_memcpy(p_lock, &mutex_lock_template, sizeof(pj_lock_t));
-    rc = pj_mutex_create(pool, name, type, (pj_mutex_t**)&p_lock->lock_object);
+    rc = pj_mutex_create(pool, name, type, &mutex);
     if (rc != PJ_SUCCESS)
         return rc;
 
+    p_lock->lock_object = mutex;
     *lock = p_lock;
     return PJ_SUCCESS;
@@ -146 +148 @@
 {
     pj_lock_t *p_lock;
+    pj_sem_t *sem;
     pj_status_t rc;
 
@@ -155 +158 @@
 
     pj_memcpy(p_lock, &sem_lock_template, sizeof(pj_lock_t));
-    rc = pj_sem_create( pool, name, initial, max, 
-                        (pj_sem_t**)&p_lock->lock_object);
+    rc = pj_sem_create( pool, name, initial, max, &sem);
     if (rc != PJ_SUCCESS)
         return rc;
 
+    p_lock->lock_object = sem;
     *lock = p_lock;
 

pjproject/trunk/pjmedia/src/pjmedia/BladeMP3EncDLL.h

@@ -27 +27 @@
 
 #ifdef __GNUC__
-#define ATTRIBUTE_PACKED        __attribute__((packed))
+//#define ATTRIBUTE_PACKED      __attribute__((packed))
+#define ATTRIBUTE_PACKED
 #else
 #define ATTRIBUTE_PACKED
@@ -242 +243 @@
 typedef unsigned long   (*BECLOSESTREAM)                        (HBE_STREAM);
 typedef void    (*BEVERSION)                            (PBE_VERSION);
-typedef unsigned long   (*BEWRITEVBRHEADER)                     (LPCSTR);
+typedef unsigned long   (*BEWRITEVBRHEADER)                     (const char*);
 typedef unsigned long   (*BEWRITEINFOTAG)                       (HBE_STREAM, const char * );
 

pjproject/trunk/pjmedia/src/pjmedia/echo_speex.c

@@ -574 +574 @@
 }
 
- 

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -1115 +1115 @@
     if (config->udp_cfg.tls_setting.timeout.sec) {
         pj_ansi_sprintf(line, "--tls-neg-timeout %d\n",
-                        config->udp_cfg.tls_setting.timeout.sec);
+                        (int)config->udp_cfg.tls_setting.timeout.sec);
         pj_strcat2(&cfg, line);
     }

pjproject/trunk/pjsip-apps/src/samples/siprtp.c

@@ -1279 +1279 @@
              */
             pj_status_t status;
+            const void *p_hdr;
             const pjmedia_rtp_hdr *hdr;
             pj_ssize_t size;
@@ -1288 +1289 @@
                                              strm->bytes_per_frame, 
                                              strm->samples_per_frame,
-                                             (const void**)&hdr, &hdrlen);
+                                             &p_hdr, &hdrlen);
             if (status == PJ_SUCCESS) {
 
                 //PJ_LOG(4,(THIS_FILE, "\t\tTx seq=%d", pj_ntohs(hdr->seq)));
+                
+                hdr = (const pjmedia_rtp_hdr*) p_hdr;
 
                 /* Copy RTP header to packet */

pjproject/trunk/pjsip/src/pjsip/sip_dialog.c

@@ -455 +455 @@
         /* Find next Record-Route header. */
         rr = rr->next;
-        if (rr == (pjsip_rr_hdr*)&rdata->msg_info.msg->hdr)
+        if (rr == (void*)&rdata->msg_info.msg->hdr)
             break;
         rr = pjsip_msg_find_hdr(rdata->msg_info.msg, PJSIP_H_RECORD_ROUTE, rr);

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

@@ -113 +113 @@
 static pj_status_t test_entry( pj_pool_t *pool, struct test_msg *entry )
 {
-    pjsip_msg *parsed_msg, *ref_msg;
+    pjsip_msg *parsed_msg, *ref_msg = NULL;
     static pjsip_msg *print_msg;
     pj_status_t status = PJ_SUCCESS;