From 43a36ec81379e65accd5a6e1772e37425dc779bd Mon Sep 17 00:00:00 2001
From: z3APA3A <3APA3A@3proxy.ru>
Date: Thu, 18 Feb 2016 16:43:37 +0300
Subject: [PATCH] Warnings cleanup

---
 src/common.c    | 8 ++++----
 src/datatypes.c | 2 +-
 src/proxymain.c | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/common.c b/src/common.c
index 29f81c4..dd5462c 100644
--- a/src/common.c
+++ b/src/common.c
@@ -820,11 +820,11 @@ unsigned long getip46(int family, unsigned char *name,  struct sockaddr *sa){
 	if(!name[i]){
 		if(ndots == 3 && ncols == 0 && nhex == 0){
 			*SAFAMILY(sa)=(family == 6)?AF_INET6 : AF_INET;
-			return inet_pton(*SAFAMILY(sa), name, SAADDR(sa))? *SAFAMILY(sa) : 0; 
+			return inet_pton(*SAFAMILY(sa), (char *)name, SAADDR(sa))? *SAFAMILY(sa) : 0; 
 		}
 		if(ncols >= 2) {
 			*SAFAMILY(sa)=AF_INET6;
-			return inet_pton(AF_INET6, name, SAADDR(sa))?(family==4? 0:AF_INET6) : 0;
+			return inet_pton(AF_INET6, (char *)name, SAADDR(sa))?(family==4? 0:AF_INET6) : 0;
 		}
 	}
 	if((tmpresolv = resolvfunc)){
@@ -839,10 +839,10 @@ unsigned long getip46(int family, unsigned char *name,  struct sockaddr *sa){
 	}
 	memset(&hint, 0, sizeof(hint));
 	hint.ai_family = (family == 6 || family == 64)?AF_INET6:AF_INET;
-	if (getaddrinfo(name, NULL, &hint, &ai)) {
+	if (getaddrinfo((char *)name, NULL, &hint, &ai)) {
 		if(family == 64 || family == 46){
 			hint.ai_family = (family == 64)?AF_INET:AF_INET6;
-			if (getaddrinfo(name, NULL, &hint, &ai)) return 0;
+			if (getaddrinfo((char *)name, NULL, &hint, &ai)) return 0;
 		}
 		else return 0;
 	}
diff --git a/src/datatypes.c b/src/datatypes.c
index 230fe27..d009671 100644
--- a/src/datatypes.c
+++ b/src/datatypes.c
@@ -74,7 +74,7 @@ static void pr_sa(struct node *node, CBFUNC cbf, void*cb){
 	buf[0] = '[';
 	buf[1] = 0;
 	inet_ntop(*SAFAMILY(node->value), node->value, buf+1, sizeof(buf)-10);
-	sprintf(buf + strlen(buf), "]:hu", (unsigned short)*SAPORT(node->value));
+	sprintf(buf + strlen(buf), "]:%hu", (unsigned short)*SAPORT(node->value));
 	if(node->value)(*cbf)(cb, buf, strlen(buf));
 #endif
 }
diff --git a/src/proxymain.c b/src/proxymain.c
index 4f429d4..d310958 100644
--- a/src/proxymain.c
+++ b/src/proxymain.c
@@ -244,7 +244,7 @@ int MODULEMAINFUNC (int argc, char** argv){
 #ifndef NOIPV6
 				struct sockaddr_in6 sa6;
 				memset(&sa6, 0, sizeof(sa6));
-				error = !getip46(46, argv[i]+2, (struct sockaddr *)&sa6);
+				error = !getip46(46, (unsigned char *)argv[i]+2, (struct sockaddr *)&sa6);
 				if(!error) {
 					if (*SAFAMILY(&sa6)==AF_INET) srv.extsa = sa6;
 					else srv.extsa6 = sa6;
@@ -272,7 +272,7 @@ int MODULEMAINFUNC (int argc, char** argv){
 		 case 'I':
 			size = sizeof(defparam.sincl);
 			if(so._getsockname(0, (struct sockaddr*)&defparam.sincl, &size) ||
-				SAFAMILY(&defparam.sincl) != AF_INET) error = 1;
+				*SAFAMILY(&defparam.sincl) != AF_INET) error = 1;
 
 			else inetd = 1;
 			break;