git.samba.org
/
obnox
/
samba
/
samba-obnox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
abe5afc
)
Fix const warnings.
author
Jeremy Allison
<jra@samba.org>
Fri, 14 Oct 2011 20:48:53 +0000
(13:48 -0700)
committer
Jeremy Allison
<jra@samba.org>
Fri, 14 Oct 2011 20:48:53 +0000
(13:48 -0700)
lib/socket/interfaces.c
patch
|
blob
|
history
diff --git
a/lib/socket/interfaces.c
b/lib/socket/interfaces.c
index 9bdecb243d8ed434ed813031f825eab9280b5f36..775956ba990c4f36c4db744b99f64a599fd2df01 100644
(file)
--- a/
lib/socket/interfaces.c
+++ b/
lib/socket/interfaces.c
@@
-77,7
+77,7
@@
static void make_bcast_or_net(struct sockaddr_storage *pss_out,
bool make_bcast_p)
{
unsigned int i = 0, len = 0;
bool make_bcast_p)
{
unsigned int i = 0, len = 0;
- char *pmask = NULL;
+ c
onst c
har *pmask = NULL;
char *p = NULL;
*pss_out = *pss_in;
char *p = NULL;
*pss_out = *pss_in;
@@
-85,13
+85,13
@@
static void make_bcast_or_net(struct sockaddr_storage *pss_out,
#if defined(HAVE_IPV6)
if (pss_in->ss_family == AF_INET6) {
p = (char *)&((struct sockaddr_in6 *)pss_out)->sin6_addr;
#if defined(HAVE_IPV6)
if (pss_in->ss_family == AF_INET6) {
p = (char *)&((struct sockaddr_in6 *)pss_out)->sin6_addr;
- pmask =
discard_const_p(char, &((struct sockaddr_in6 *)nmask)->sin6_addr)
;
+ pmask =
(const char *)&((const struct sockaddr_in6 *)nmask)->sin6_addr
;
len = 16;
}
#endif
if (pss_in->ss_family == AF_INET) {
p = (char *)&((struct sockaddr_in *)pss_out)->sin_addr;
len = 16;
}
#endif
if (pss_in->ss_family == AF_INET) {
p = (char *)&((struct sockaddr_in *)pss_out)->sin_addr;
- pmask =
discard_const_p(char, &((struct sockaddr_in *)nmask)->sin_addr)
;
+ pmask =
(const char *)&((const struct sockaddr_in *)nmask)->sin_addr
;
len = 4;
}
len = 4;
}