Cleaned up compile warnings (on gcc 4.0.1).

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2386 74dad513-b988-da41-8d7b-12977e46ad98

9 files changed, 18 insertions, 17 deletions

diff --git a/pjnath/include/pjnath/stun_session.h b/pjnath/include/pjnath/stun_session.h
index 896a2b58..e459c774 100644
--- a/pjnath/include/pjnath/stun_session.h
+++ b/pjnath/include/pjnath/stun_session.h
@@ -231,7 +231,7 @@ struct pj_stun_tx_data
 
     void		*pkt;		/**< The STUN packet.		    */
     unsigned		 max_len;	/**< Length of packet buffer.	    */
-    unsigned		 pkt_size;	/**< The actual length of STUN pkt. */
+    pj_size_t		 pkt_size;	/**< The actual length of STUN pkt. */
 
     unsigned		 addr_len;	/**< Length of destination address. */
     const pj_sockaddr_t	*dst_addr;	/**< Destination address.	    */
@@ -598,7 +598,7 @@ PJ_DECL(pj_status_t) pj_stun_session_on_rx_pkt(pj_stun_session *sess,
 					       pj_size_t pkt_size,
 					       unsigned options,
 					       void *token,
-					       unsigned *parsed_len,
+					       pj_size_t *parsed_len,
 					       const pj_sockaddr_t *src_addr,
 					       unsigned src_addr_len);
 
diff --git a/pjnath/include/pjnath/turn_session.h b/pjnath/include/pjnath/turn_session.h
index b577e02a..89beabe3 100644
--- a/pjnath/include/pjnath/turn_session.h
+++ b/pjnath/include/pjnath/turn_session.h
@@ -592,8 +592,8 @@ PJ_DECL(pj_status_t) pj_turn_session_bind_channel(pj_turn_session *sess,
  */
 PJ_DECL(pj_status_t) pj_turn_session_on_rx_pkt(pj_turn_session *sess,
 					       void *pkt,
-					       unsigned pkt_len,
-					       unsigned *parsed_len);
+					       pj_size_t pkt_len,
+					       pj_size_t *parsed_len);
 
 
 /**
diff --git a/pjnath/src/pjnath-test/stun.c b/pjnath/src/pjnath-test/stun.c
index 5d157053..7369aeb6 100644
--- a/pjnath/src/pjnath-test/stun.c
+++ b/pjnath/src/pjnath-test/stun.c
@@ -242,7 +242,7 @@ static int decode_test(void)
 	pj_stun_msg *msg, *msg2;
 	pj_uint8_t buf[1500];
 	pj_str_t key;
-	unsigned len;
+	pj_size_t len;
 	pj_status_t status;
 
 	PJ_LOG(3,(THIS_FILE, "   %s", t->title));
@@ -543,8 +543,9 @@ static int fingerprint_test_vector()
     for (i=0; i<PJ_ARRAY_SIZE(test_vectors); ++i) {
 	struct test_vector *v;
 	pj_stun_msg *ref_msg, *msg;
-	unsigned parsed_len;
-	unsigned len, pos;
+	pj_size_t parsed_len;
+	pj_size_t len;
+	unsigned pos;
 	pj_uint8_t buf[1500];
 	char print[1500];
 	pj_str_t key;
@@ -746,7 +747,7 @@ static int handle_unknown_non_mandatory(void)
     pj_uint8_t data[] = { 1, 2, 3, 4, 5, 6};
     pj_uint8_t packet[500];
     pj_stun_auth_cred cred;
-    unsigned len;
+    pj_size_t len;
     pj_status_t rc;
 
     PJ_LOG(3,(THIS_FILE, "  handling unknown non-mandatory attr"));
diff --git a/pjnath/src/pjnath/stun_session.c b/pjnath/src/pjnath/stun_session.c
index 35c982f4..ab50ccb2 100644
--- a/pjnath/src/pjnath/stun_session.c
+++ b/pjnath/src/pjnath/stun_session.c
@@ -1054,7 +1054,7 @@ static pj_status_t send_response(pj_stun_session *sess, void *token,
 				 const pj_sockaddr_t *addr, unsigned addr_len)
 {
     pj_uint8_t *out_pkt;
-    unsigned out_max_len, out_len;
+    pj_size_t out_max_len, out_len;
     pj_status_t status;
 
     /* Apply options */
@@ -1319,7 +1319,7 @@ PJ_DEF(pj_status_t) pj_stun_session_on_rx_pkt(pj_stun_session *sess,
 					      pj_size_t pkt_size,
 					      unsigned options,
 					      void *token,
-					      unsigned *parsed_len,
+					      pj_size_t *parsed_len,
 					      const pj_sockaddr_t *src_addr,
 					      unsigned src_addr_len)
 {
diff --git a/pjnath/src/pjnath/turn_session.c b/pjnath/src/pjnath/turn_session.c
index 7d492551..de6d4b24 100644
--- a/pjnath/src/pjnath/turn_session.c
+++ b/pjnath/src/pjnath/turn_session.c
@@ -914,8 +914,8 @@ on_return:
  */
 PJ_DEF(pj_status_t) pj_turn_session_on_rx_pkt(pj_turn_session *sess,
 					      void *pkt,
-					      unsigned pkt_len,
-					      unsigned *parsed_len)
+					      pj_size_t pkt_len,
+					      pj_size_t *parsed_len)
 {
     pj_bool_t is_stun;
     pj_status_t status;
diff --git a/pjnath/src/pjnath/turn_sock.c b/pjnath/src/pjnath/turn_sock.c
index 509efe22..5eed7913 100644
--- a/pjnath/src/pjnath/turn_sock.c
+++ b/pjnath/src/pjnath/turn_sock.c
@@ -463,7 +463,7 @@ static pj_bool_t on_data_read(pj_activesock_t *asock,
 			      pj_size_t *remainder)
 {
     pj_turn_sock *turn_sock;
-    unsigned parsed_len;
+    pj_size_t parsed_len;
     pj_bool_t ret = PJ_TRUE;
 
     turn_sock = (pj_turn_sock*) pj_activesock_get_user_data(asock);
diff --git a/pjnath/src/pjturn-srv/allocation.c b/pjnath/src/pjturn-srv/allocation.c
index 3e4b77f6..16f3957f 100644
--- a/pjnath/src/pjturn-srv/allocation.c
+++ b/pjnath/src/pjturn-srv/allocation.c
@@ -934,7 +934,7 @@ PJ_DEF(void) pj_turn_allocation_on_rx_client_pkt(pj_turn_allocation *alloc,
 	 * with fingerprint checking.
 	 */
 	unsigned options = PJ_STUN_CHECK_PACKET | PJ_STUN_NO_FINGERPRINT_CHECK;
-	unsigned parsed_len = 0;
+	pj_size_t parsed_len = 0;
 
 	if (pkt->transport->listener->tp_type == PJ_TURN_TP_UDP)
 	    options |= PJ_STUN_IS_DATAGRAM;
diff --git a/pjnath/src/pjturn-srv/main.c b/pjnath/src/pjturn-srv/main.c
index 6b2e9d1e..52be6637 100644
--- a/pjnath/src/pjturn-srv/main.c
+++ b/pjnath/src/pjturn-srv/main.c
@@ -49,8 +49,8 @@ static void dump_status(pj_turn_srv *srv)
     }
 
     printf("Worker threads : %d\n", srv->core.thread_cnt);
-    printf("Total mem usage: %d.%03dMB\n", g_cp.used_size / 1000000, 
-	   (g_cp.used_size % 1000000)/1000);
+    printf("Total mem usage: %u.%03uMB\n", (unsigned)(g_cp.used_size / 1000000), 
+	   (unsigned)((g_cp.used_size % 1000000)/1000));
     printf("UDP port range : %u %u %u (next/min/max)\n", srv->ports.next_udp,
 	   srv->ports.min_udp, srv->ports.max_udp);
     printf("TCP port range : %u %u %u (next/min/max)\n", srv->ports.next_tcp,
diff --git a/pjnath/src/pjturn-srv/server.c b/pjnath/src/pjturn-srv/server.c
index c277e11e..9c9d3121 100644
--- a/pjnath/src/pjturn-srv/server.c
+++ b/pjnath/src/pjturn-srv/server.c
@@ -615,7 +615,7 @@ PJ_DEF(void) pj_turn_srv_on_rx_pkt(pj_turn_srv *srv,
     } else {
 	/* Otherwise this is a new client */
 	unsigned options;
-	unsigned parsed_len;
+	pj_size_t parsed_len;
 	pj_status_t status;
 
 	/* Check that this is a STUN message */