about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFabrice Bauzac <fbauzac@amadeus.com>2013-10-25 13:51:58 +0530
committerSiddhesh Poyarekar <siddhesh@redhat.com>2013-10-25 13:51:58 +0530
commit52e6d80122eee44b64db0e947fe7e4001e92ce83 (patch)
tree310a238a9ec9577fe8dc9aa977811caa5d4de34c
parent7cbcdb3699584db8913ca90f705d6337633ee10f (diff)
downloadglibc-52e6d80122eee44b64db0e947fe7e4001e92ce83.tar.gz
glibc-52e6d80122eee44b64db0e947fe7e4001e92ce83.tar.xz
glibc-52e6d80122eee44b64db0e947fe7e4001e92ce83.zip
Document that mmap() returns MAP_FAILED on error, as per the POSIX standard.
-rw-r--r--ChangeLog6
-rw-r--r--NEWS3
-rw-r--r--manual/llio.texi4
3 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 05a8f05db0..f37d84ea88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-10-25  Fabrice Bauzac  <fbauzac@debian71.nce.amadeus.net>
+
+	[BZ #16074]
+	* manual/llio.texi (Memory-mapped I/O): Indicate that mmap returns
+	MAP_FAILED on error.
+
 2013-10-25  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
 	[BZ #16072]
diff --git a/NEWS b/NEWS
index 9199b90d13..f228878903 100644
--- a/NEWS
+++ b/NEWS
@@ -15,7 +15,8 @@ Version 2.19
   15734, 15735, 15736, 15748, 15749, 15754, 15760, 15764, 15797, 15825,
   15844, 15847, 15849, 15855, 15856, 15857, 15859, 15867, 15886, 15887,
   15890, 15892, 15893, 15895, 15897, 15905, 15909, 15919, 15921, 15923,
-  15939, 15948, 15963, 15966, 15988, 16032, 16034, 16036, 16041, 16072.
+  15939, 15948, 15963, 15966, 15988, 16032, 16034, 16036, 16041, 16072,
+  16074.
 
 * CVE-2012-4412 The strcoll implementation caches indices and rules for
   large collation sequences to optimize multiple passes.  This cache
diff --git a/manual/llio.texi b/manual/llio.texi
index b129cf40bd..dd0eaa3cb9 100644
--- a/manual/llio.texi
+++ b/manual/llio.texi
@@ -1226,8 +1226,8 @@ as the included @code{malloc} automatically uses @code{mmap} where appropriate.
 
 @end vtable
 
-@code{mmap} returns the address of the new mapping, or @math{-1} for an
-error.
+@code{mmap} returns the address of the new mapping, or
+@code{MAP_FAILED} for an error.
 
 Possible errors include: