Changeset 2015

Timestamp:

Jun 13, 2008 12:52:56 PM (16 years ago)

Author:

bennylp

Message:

Fixed various compilation warnings with gcc strict compilation

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia-codec/gsm.c (modified) (3 diffs)
• pjmedia/src/pjmedia/resample_port.c (modified) (1 diff)
• pjmedia/src/pjmedia/transport_srtp.c (modified) (1 diff)
• pjnath/src/pjnath-test/server.c (modified) (1 diff)
• pjnath/src/pjnath-test/stun_sock_test.c (modified) (3 diffs)
• pjsip/src/pjsip-ua/sip_reg.c (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia-codec/gsm.c

@@ -598 +598 @@
 #if !PLC_DISABLED
     if (gsm_data->plc_enabled)
-        pjmedia_plc_save( gsm_data->plc, output->buf);
+        pjmedia_plc_save( gsm_data->plc, (pj_int16_t*)output->buf);
 #endif
 
@@ -613 +613 @@
                                       struct pjmedia_frame *output)
 {
-    struct gsm_data *gsm_data = codec->codec_data;
+    struct gsm_data *gsm_data = (struct gsm_data*) codec->codec_data;
 
     PJ_ASSERT_RETURN(gsm_data->plc_enabled, PJ_EINVALIDOP);
@@ -619 +619 @@
     PJ_ASSERT_RETURN(output_buf_len >= 320, PJMEDIA_CODEC_EPCMTOOSHORT);
 
-    pjmedia_plc_generate(gsm_data->plc, output->buf);
+    pjmedia_plc_generate(gsm_data->plc, (pj_int16_t*)output->buf);
     output->size = 320;
 

pjproject/trunk/pjmedia/src/pjmedia/resample_port.c

@@ -189 +189 @@
         frame->size = tmp_frame.size < rport->base.info.bytes_per_frame ?
                       tmp_frame.size : rport->base.info.bytes_per_frame;
-        if (tmp_frame.size)
-            pjmedia_copy_samples(frame->buf, tmp_frame.buf, frame->size >> 1);
+        if (tmp_frame.size) {
+            pjmedia_copy_samples((pj_int16_t*)frame->buf, 
+                                 (const pj_int16_t*)tmp_frame.buf, 
+                                 frame->size >> 1);
+        }
         return PJ_SUCCESS;
     }

pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c

@@ -1187 +1187 @@
     pjmedia_sdp_media *m_rem, *m_loc;
     pj_status_t status;
-    int i;
+    unsigned i;
 
     PJ_ASSERT_RETURN(tp && pool && sdp_local && sdp_remote, PJ_EINVAL);

pjproject/trunk/pjnath/src/pjnath-test/server.c

@@ -630 +630 @@
 
     pj_sockaddr_cp(&pa->sockaddr, src_addr);
-    da->data = data;
+    da->data = (pj_uint8_t*)data;
     da->length = size;
 

pjproject/trunk/pjnath/src/pjnath-test/stun_sock_test.c

@@ -53 +53 @@
     pj_ssize_t sent;
 
-    srv = pj_activesock_get_user_data(asock);
+    srv = (struct stun_srv*) pj_activesock_get_user_data(asock);
 
     /* Ignore error */
@@ -195 +195 @@
     struct stun_client *client;
 
-    client = pj_stun_sock_get_user_data(stun_sock);
+    client = (struct stun_client*) pj_stun_sock_get_user_data(stun_sock);
     client->on_status_cnt++;
     client->last_op = op;
@@ -222 +222 @@
     PJ_UNUSED_ARG(addr_len);
 
-    client = pj_stun_sock_get_user_data(stun_sock);
+    client = (struct stun_client*) pj_stun_sock_get_user_data(stun_sock);
     client->on_rx_data_cnt++;
 

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

@@ -309 +309 @@
             pj_create_unique_string(regc->pool, &xuid_param->value);
 
-            sip_uri = pjsip_uri_get_uri(hdr->uri);
+            sip_uri = (pjsip_sip_uri*) pjsip_uri_get_uri(hdr->uri);
             pj_list_push_back(&sip_uri->other_param, xuid_param);
         }