From 257d4eee6499df2cc563cdb2bafa1f7a79cc728a Mon Sep 17 00:00:00 2001
From: Lauri Kasanen <curaga@operamail.com>
Date: Wed, 25 Feb 2015 15:53:37 +0200
Subject: [PATCH] os/access: warning fixes

---
 include/os.h |  2 +-
 os/access.c  | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/include/os.h b/include/os.h
index 805f748..817699f 100644
--- a/include/os.h
+++ b/include/os.h
@@ -267,7 +267,7 @@ int ChangeAccessControl(ClientPtr /*client*/, int /*fEnabled*/);
 
 void AddLocalHosts(void);
 
-void ResetHosts(char *display);
+void ResetHosts(const char *display);
 
 void EnableLocalHost(void);
 
diff --git a/os/access.c b/os/access.c
index a2da88f..2ae6f05 100644
--- a/os/access.c
+++ b/os/access.c
@@ -660,7 +660,8 @@ DefineSelf (int fd)
         if (!ifr->ifa_addr)
             continue;
 	len = sizeof(*(ifr->ifa_addr));
-	family = ConvertAddr(ifr->ifa_addr, &len, (pointer *)&addr);
+	family = ConvertAddr((struct sockaddr *) ifr->ifa_addr, &len,
+				(pointer *)&addr);
 	if (family == -1 || family == FamilyLocal)
 	    continue;
 #if defined(IPv6) && defined(AF_INET6)
@@ -823,7 +824,7 @@ AddLocalHosts (void)
 
 /* Reset access control list to initial hosts */
 void
-ResetHosts (char *display)
+ResetHosts (const char *display)
 {
     HOST	*host;
     char                lhostname[120], ohostname[120];
@@ -843,7 +844,7 @@ ResetHosts (char *display)
     }			saddr;
 #endif
     int			family = 0;
-    pointer		addr;
+    pointer		addr = NULL;
     int 		len;
 
     siTypesInitialize();
@@ -1356,7 +1357,7 @@ InvalidHost (
     ClientPtr			client)
 {
     int 			family;
-    pointer			addr;
+    pointer			addr = NULL;
     HOST 		*selfhost, *host;
 
     if (!AccessEnabled)   /* just let them in */
@@ -1636,7 +1637,7 @@ siHostnameAddrMatch(int family, pointer addr, int len,
 	struct addrinfo *addresses;
 	struct addrinfo *a;
 	int f, hostaddrlen;
-	pointer hostaddr;
+	pointer hostaddr = NULL;
 
 	if (siAddrLen >= sizeof(hostname))
 	    return FALSE;