From ebaf36ebd838cec73c00433e7b3d41c9d126fe47 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Sun, 19 Feb 2012 02:02:10 +0000 Subject: [PATCH] Fix parameter name in strnlen documentation. --- ChangeLog | 6 ++++++ NEWS | 8 ++++---- manual/string.texi | 3 ++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index aa0561e0bc..906b3eee02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-02-19 Joseph Myers + + [BZ #9739] + * manual/string.texi (strnlen): Use correct parameter name in + equivalent expression. + 2012-02-19 Joseph Myers [BZ #11174] diff --git a/NEWS b/NEWS index 4cf68ba689..5e2bc91caa 100644 --- 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 abfb0798b9..e02c17f111 100644 --- 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. -- 2.43.5