More ticket #485: updated Makefiles and fixed compilation warnings with gcc

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

3 files changed, 6 insertions, 5 deletions

diff --git a/pjnath/src/pjturn-srv/auth.c b/pjnath/src/pjturn-srv/auth.c
index 8e6c9c59..e02079e4 100644
--- a/pjnath/src/pjturn-srv/auth.c
+++ b/pjnath/src/pjturn-srv/auth.c
@@ -85,7 +85,7 @@ PJ_DEF(pj_status_t) pj_turn_get_password(const pj_stun_msg *msg,
 					 const pj_str_t *realm,
 					 const pj_str_t *username,
 					 pj_pool_t *pool,
-					 int *data_type,
+					 pj_stun_passwd_type *data_type,
 					 pj_str_t *data)
 {
     unsigned i;
@@ -95,7 +95,7 @@ PJ_DEF(pj_status_t) pj_turn_get_password(const pj_stun_msg *msg,
     PJ_UNUSED_ARG(pool);
 
     if (pj_stricmp2(realm, g_realm))
-	PJ_EINVAL;
+	return PJ_EINVAL;
 
     for (i=0; i<PJ_ARRAY_SIZE(g_cred); ++i) {
 	if (pj_stricmp2(username, g_cred[i].username) == 0) {
diff --git a/pjnath/src/pjturn-srv/auth.h b/pjnath/src/pjturn-srv/auth.h
index 2e342a73..a684490f 100644
--- a/pjnath/src/pjturn-srv/auth.h
+++ b/pjnath/src/pjturn-srv/auth.h
@@ -88,7 +88,7 @@ PJ_DECL(pj_status_t) pj_turn_get_password(const pj_stun_msg *msg,
 					  const pj_str_t *realm,
 					  const pj_str_t *username,
 					  pj_pool_t *pool,
-					  int *data_type,
+					  pj_stun_passwd_type *data_type,
 					  pj_str_t *data);
 
 /**
diff --git a/pjnath/src/pjturn-srv/main.c b/pjnath/src/pjturn-srv/main.c
index 164b3c25..348ad3db 100644
--- a/pjnath/src/pjturn-srv/main.c
+++ b/pjnath/src/pjturn-srv/main.c
@@ -69,16 +69,17 @@ static void dump_status(pj_turn_srv *srv)
     while (it) {
 	pj_turn_allocation *alloc = (pj_turn_allocation*) 
 				    pj_hash_this(srv->tables.alloc, it);
-	printf("%-3d %-22s %-22s %-8.*s %-4d %-4d %-4d %-4d\n",
+	printf("%-3d %-22s %-22s %-8.*s %-4d %-4ld %-4d %-4d\n",
 	       i,
 	       alloc->info,
 	       pj_sockaddr_print(&alloc->relay.hkey.addr, addr, sizeof(addr), 3),
 	       (int)alloc->cred.data.static_cred.username.slen,
-	       (int)alloc->cred.data.static_cred.username.ptr,
+	       alloc->cred.data.static_cred.username.ptr,
 	       alloc->relay.lifetime,
 	       alloc->relay.expiry.sec - now.sec,
 	       pj_hash_count(alloc->peer_table), 
 	       pj_hash_count(alloc->ch_table));
+
 	it = pj_hash_next(srv->tables.alloc, it);
 	++i;
     }