[PATCH] fix a few warnings
Volker Lendecke
Volker.Lendecke at SerNet.DE
Sat Jun 21 03:04:32 MDT 2014
Hi!
Review would be appreciated.
Thanks,
Volker
--
SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen
phone: +49-551-370000-0, fax: +49-551-370000-9
AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen
http://www.sernet.de, mailto:kontakt at sernet.de
-------------- next part --------------
From 4f629e487ed8bc695f31996f13201631da75865e Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Sat, 21 Jun 2014 10:47:28 +0200
Subject: [PATCH 1/2] nss_wrapper: Align indentation with the rest of Samba
Signed-off-by: Volker Lendecke <vl at samba.org>
---
lib/nss_wrapper/nss_wrapper.c | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/lib/nss_wrapper/nss_wrapper.c b/lib/nss_wrapper/nss_wrapper.c
index 7c5a413..d7949c3 100644
--- a/lib/nss_wrapper/nss_wrapper.c
+++ b/lib/nss_wrapper/nss_wrapper.c
@@ -4046,24 +4046,24 @@ static int nwrap_getnameinfo(const struct sockaddr *sa, socklen_t salen,
type = sa->sa_family;
switch (type) {
- case AF_INET:
- if (salen < sizeof(struct sockaddr_in))
- return EAI_FAMILY;
- addr = &((struct sockaddr_in *)sa)->sin_addr;
- addrlen = sizeof(((struct sockaddr_in *)sa)->sin_addr);
- port = ntohs(((struct sockaddr_in *)sa)->sin_port);
- break;
+ case AF_INET:
+ if (salen < sizeof(struct sockaddr_in))
+ return EAI_FAMILY;
+ addr = &((struct sockaddr_in *)sa)->sin_addr;
+ addrlen = sizeof(((struct sockaddr_in *)sa)->sin_addr);
+ port = ntohs(((struct sockaddr_in *)sa)->sin_port);
+ break;
#ifdef HAVE_IPV6
- case AF_INET6:
- if (salen < sizeof(struct sockaddr_in6))
- return EAI_FAMILY;
- addr = &((struct sockaddr_in6 *)sa)->sin6_addr;
- addrlen = sizeof(((struct sockaddr_in6 *)sa)->sin6_addr);
- port = ntohs(((struct sockaddr_in6 *)sa)->sin6_port);
- break;
-#endif
- default:
+ case AF_INET6:
+ if (salen < sizeof(struct sockaddr_in6))
return EAI_FAMILY;
+ addr = &((struct sockaddr_in6 *)sa)->sin6_addr;
+ addrlen = sizeof(((struct sockaddr_in6 *)sa)->sin6_addr);
+ port = ntohs(((struct sockaddr_in6 *)sa)->sin6_port);
+ break;
+#endif
+ default:
+ return EAI_FAMILY;
}
if (host != NULL) {
--
1.7.9.5
From 78bfe3746db0188cadfb0ecaf65a060659f35e3b Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Sat, 21 Jun 2014 10:48:56 +0200
Subject: [PATCH 2/2] nss_wrapper: Fix some "discarding const" warnings
Signed-off-by: Volker Lendecke <vl at samba.org>
---
lib/nss_wrapper/nss_wrapper.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/nss_wrapper/nss_wrapper.c b/lib/nss_wrapper/nss_wrapper.c
index d7949c3..a012cbd 100644
--- a/lib/nss_wrapper/nss_wrapper.c
+++ b/lib/nss_wrapper/nss_wrapper.c
@@ -4049,17 +4049,17 @@ static int nwrap_getnameinfo(const struct sockaddr *sa, socklen_t salen,
case AF_INET:
if (salen < sizeof(struct sockaddr_in))
return EAI_FAMILY;
- addr = &((struct sockaddr_in *)sa)->sin_addr;
- addrlen = sizeof(((struct sockaddr_in *)sa)->sin_addr);
- port = ntohs(((struct sockaddr_in *)sa)->sin_port);
+ addr = &((const struct sockaddr_in *)sa)->sin_addr;
+ addrlen = sizeof(((const struct sockaddr_in *)sa)->sin_addr);
+ port = ntohs(((const struct sockaddr_in *)sa)->sin_port);
break;
#ifdef HAVE_IPV6
case AF_INET6:
if (salen < sizeof(struct sockaddr_in6))
return EAI_FAMILY;
- addr = &((struct sockaddr_in6 *)sa)->sin6_addr;
- addrlen = sizeof(((struct sockaddr_in6 *)sa)->sin6_addr);
- port = ntohs(((struct sockaddr_in6 *)sa)->sin6_port);
+ addr = &((const struct sockaddr_in6 *)sa)->sin6_addr;
+ addrlen = sizeof(((const struct sockaddr_in6 *)sa)->sin6_addr);
+ port = ntohs(((const struct sockaddr_in6 *)sa)->sin6_port);
break;
#endif
default:
--
1.7.9.5
More information about the samba-technical
mailing list