From 6738b3c073c6b8f0ad145d77ba61fc1238256f8d Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 5 Apr 2006 21:33:15 +0000
Subject: [PATCH] 2006-04-05  Alan Modra  <amodra@bigpond.net.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

	    Jakub Jelinek  <jakub@redhat.com>

	* posix/bits/unistd.h (readlink, __readlink_chk, __readlink_alias):
	Change return value to ssize_t.

	Reported by S.Çağlar Onur <caglar@uludag.org.tr>.
	Patch by René Rebe <rene@exactcode.de>.
	Reported by René Rebe <rene@exactcode.de>.
---
 ChangeLog           | 12 +++++++++---
 nptl/ChangeLog      |  4 ++++
 posix/bits/unistd.h | 16 ++++++++--------
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 650cd7a..eb66426 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-05  Alan Modra  <amodra@bigpond.net.au>
+	    Jakub Jelinek  <jakub@redhat.com>
+
+	* posix/bits/unistd.h (readlink, __readlink_chk, __readlink_alias):
+	Change return value to ssize_t.
+
 2006-04-04  Roland McGrath  <roland@redhat.com>
 
 	* string/Makefile (CFLAGS-inl-tester.c): New variable.
@@ -11,7 +17,7 @@
 	* iconvdata/Makefile (generate-8bit-table): Use LC_ALL=C.
 	(generate-8bit-gap-table): Likewise.
 	($(objpfx)iso8859-7jp.stmp): Likewise.
-	Reported by S.Çağlar Onur <caglar@uludag.org.tr>.
+	Reported by S.Çağlar Onur <caglar@uludag.org.tr>.
 
 2006-03-21  Joseph S. Myers  <joseph@codesourcery.com>
 
@@ -6274,7 +6280,7 @@
 2005-11-28  Andreas Jaeger  <aj@suse.de>
 
 	* sysdeps/unix/sysv/linux/mips/bits/mman.h (MREMAP_FIXED): Added,
-	Patch by René Rebe <rene@exactcode.de>.
+	Patch by René Rebe <rene@exactcode.de>.
 
 2005-11-27  Ulrich Drepper  <drepper@redhat.com>
 
@@ -6286,7 +6292,7 @@
 2005-11-27  Roland McGrath  <roland@redhat.com>
 
 	* sysdeps/unix/sysv/linux/fchownat.c: Include alloca.h, sysdep.h.
-	Reported by René Rebe <rene@exactcode.de>.
+	Reported by René Rebe <rene@exactcode.de>.
 
 2005-11-27  Ulrich Drepper  <drepper@redhat.com>
 
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index bb580c1..3ad04ed 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-05  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/pthread/pthread.h: Add nonnull attributes.
+
 2006-04-03  Steven Munroe  <sjmunroe@us.ibm.com>
 
 	[BZ #2505]
diff --git a/posix/bits/unistd.h b/posix/bits/unistd.h
index b72b7c7..d461108 100644
--- a/posix/bits/unistd.h
+++ b/posix/bits/unistd.h
@@ -1,5 +1,5 @@
 /* Checking macros for unistd functions.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -80,16 +80,16 @@ pread64 (int __fd, void *__buf, size_t __nbytes, __off64_t __offset)
 #endif
 
 #if defined __USE_BSD || defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K
-extern int __readlink_chk (__const char *__restrict __path,
-			   char *__restrict __buf, size_t __len,
-			   size_t __buflen)
+extern ssize_t __readlink_chk (__const char *__restrict __path,
+			       char *__restrict __buf, size_t __len,
+			       size_t __buflen)
      __THROW __nonnull ((1, 2)) __wur;
-extern int __REDIRECT_NTH (__readlink_alias,
-			   (__const char *__restrict __path,
-			    char *__restrict __buf, size_t __len), readlink)
+extern ssize_t __REDIRECT_NTH (__readlink_alias,
+			       (__const char *__restrict __path,
+				char *__restrict __buf, size_t __len), readlink)
      __nonnull ((1, 2)) __wur;
 
-extern __always_inline __nonnull ((1, 2)) __wur int
+extern __always_inline __nonnull ((1, 2)) __wur ssize_t
 __NTH (readlink (__const char *__restrict __path, char *__restrict __buf,
 		 size_t __len))
 {
-- 
2.7.4