Fix parameter name in strnlen documentation.

diff --git a/ChangeLog b/ChangeLog
index aa0561e0bc8f621cfd9930758265874ceed47546..906b3eee02bc8a1c89671b48d5985604f7e9b25f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-19  Joseph Myers  <joseph@codesourcery.com>
+
+       [BZ #9739]
+       * manual/string.texi (strnlen): Use correct parameter name in
+       equivalent expression.
+
 2012-02-19  Joseph Myers  <joseph@codesourcery.com>
 
        [BZ #11174]

diff --git a/NEWS b/NEWS
index 4cf68ba6894de523119ea4915fe0d25fa6f597ee..5e2bc91caaed3039d8efef6344bbe7b6efd963ed 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,10 +9,10 @@ Version 2.16
 
 * The following bugs are resolved with this release:
 
-  174, 350, 411, 3335, 4026, 4596, 4822, 5077, 5805, 5993, 6884, 6907, 9902,
-  10140, 10210, 11174, 11322, 11494, 12047, 13058, 13525, 13526, 13527,
-  13528, 13529, 13530, 13531, 13532, 13533, 13547, 13551, 13552, 13553,
-  13555, 13559, 13583, 13618, 13704
+  174, 350, 411, 3335, 4026, 4596, 4822, 5077, 5805, 5993, 6884, 6907, 9739,
+  9902, 10140, 10210, 11174, 11322, 11494, 12047, 13058, 13525, 13526,
+  13527, 13528, 13529, 13530, 13531, 13532, 13533, 13547, 13551, 13552,
+  13553, 13555, 13559, 13583, 13618, 13704
 
 * ISO C11 support:
 

diff --git a/manual/string.texi b/manual/string.texi
index abfb0798b97508d7210a79716415dd8c40c821ec..e02c17f11106c36b19ac95f7079bc4b19797f44c 100644 (file)
--- a/manual/string.texi
+++ b/manual/string.texi
@@ -303,7 +303,8 @@ This function was introduced in @w{Amendment 1} to @w{ISO C90}.
 The @code{strnlen} function returns the length of the string @var{s} in
 bytes if this length is smaller than @var{maxlen} bytes.  Otherwise it
 returns @var{maxlen}.  Therefore this function is equivalent to
-@code{(strlen (@var{s}) < n ? strlen (@var{s}) : @var{maxlen})} but it
+@code{(strlen (@var{s}) < @var{maxlen} ? strlen (@var{s}) : @var{maxlen})}
+but it
 is more efficient and works even if the string @var{s} is not
 null-terminated.