This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.14-293-ga7c8e6a
- From: schwab at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 12 Sep 2011 13:49:00 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.14-293-ga7c8e6a
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via a7c8e6a1478de9f990b11e5e853318ccbe4330f2 (commit)
from de82006d43e198fd162807c9adc720c7ebd728a3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=a7c8e6a1478de9f990b11e5e853318ccbe4330f2
commit a7c8e6a1478de9f990b11e5e853318ccbe4330f2
Author: Andreas Schwab <schwab@redhat.com>
Date: Mon Sep 12 14:44:02 2011 +0200
Fix invalid conversion in __cmsg_nxthdr
diff --git a/ChangeLog b/ChangeLog
index 77b7be7..8ec914f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2011-09-12 Andreas Schwab <schwab@redhat.com>
+ * sysdeps/unix/sysv/linux/bits/socket.h (__cmsg_nxthdr): Cast to
+ `struct cmsghdr *' instead of `void *'.
+ * sysdeps/unix/sysv/linux/sparc/bits/socket.h (__cmsg_nxthdr):
+ Likewise.
+
* elf/rtld.c: Remove use of USE___THREAD.
2011-09-11 Andreas Schwab <schwab@linux-m68k.org>
diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h
index 911b431..69e090b 100644
--- a/sysdeps/unix/sysv/linux/bits/socket.h
+++ b/sysdeps/unix/sysv/linux/bits/socket.h
@@ -318,7 +318,7 @@ __NTH (__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg))
{
if ((size_t) __cmsg->cmsg_len < sizeof (struct cmsghdr))
/* The kernel header does this so there may be a reason. */
- return (void *) 0;
+ return (struct cmsghdr *) 0;
__cmsg = (struct cmsghdr *) ((unsigned char *) __cmsg
+ CMSG_ALIGN (__cmsg->cmsg_len));
@@ -327,7 +327,7 @@ __NTH (__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg))
|| ((unsigned char *) __cmsg + CMSG_ALIGN (__cmsg->cmsg_len)
> ((unsigned char *) __mhdr->msg_control + __mhdr->msg_controllen)))
/* No more entries. */
- return (void *) 0;
+ return (struct cmsghdr *) 0;
return __cmsg;
}
#endif /* Use `extern inline'. */
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/socket.h b/sysdeps/unix/sysv/linux/sparc/bits/socket.h
index c7ef5d8..6cfbbd7 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/socket.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/socket.h
@@ -318,7 +318,7 @@ __NTH (__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg))
{
if ((size_t) __cmsg->cmsg_len < sizeof (struct cmsghdr))
/* The kernel header does this so there may be a reason. */
- return (void *) 0;
+ return (struct cmsghdr *) 0;
__cmsg = (struct cmsghdr *) ((unsigned char *) __cmsg
+ CMSG_ALIGN (__cmsg->cmsg_len));
@@ -327,7 +327,7 @@ __NTH (__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg))
|| ((unsigned char *) __cmsg + CMSG_ALIGN (__cmsg->cmsg_len)
> ((unsigned char *) __mhdr->msg_control + __mhdr->msg_controllen)))
/* No more entries. */
- return (void *) 0;
+ return (struct cmsghdr *) 0;
return __cmsg;
}
#endif /* Use `extern inline'. */
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
sysdeps/unix/sysv/linux/bits/socket.h | 4 ++--
sysdeps/unix/sysv/linux/sparc/bits/socket.h | 4 ++--
3 files changed, 9 insertions(+), 4 deletions(-)
hooks/post-receive
--
GNU C Library master sources