From f7ffe15e62e33cbfb12ab117f9b8c1420032e4f1 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Sat, 30 May 2009 05:18:46 +0000 Subject: [PATCH] merge from gcc --- libiberty/ChangeLog | 6 ++++++ libiberty/snprintf.c | 16 +++++++++------- libiberty/vsnprintf.c | 16 +++++++++------- 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 5d93cf123..69d3617d6 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,9 @@ +2009-05-30 Eli Zaretskii + + * snprintf.c: Doc fix. + + * vsnprintf.c: Doc fix. + 2009-05-29 Kai Tietz * pex-win32.c (pex_win32_fdopenr): Set INHERIT to false. diff --git a/libiberty/snprintf.c b/libiberty/snprintf.c index f1ba49f98..36c8e9b34 100644 --- a/libiberty/snprintf.c +++ b/libiberty/snprintf.c @@ -27,13 +27,15 @@ the executable file might be covered by the GNU General Public License. */ @deftypefn Supplemental int snprintf (char *@var{buf}, size_t @var{n}, const char *@var{format}, ...) -This function is similar to sprintf, but it will print at most @var{n} -characters. On error the return value is -1, otherwise it returns the -number of characters that would have been printed had @var{n} been -sufficiently large, regardless of the actual value of @var{n}. Note -some pre-C99 system libraries do not implement this correctly so users -cannot generally rely on the return value if the system version of -this function is used. +This function is similar to @code{sprintf}, but it will write to +@var{buf} at most @code{@var{n}-1} bytes of text, followed by a +terminating null byte, for a total of @var{n} bytes. +On error the return value is -1, otherwise it returns the number of +bytes, not including the terminating null byte, that would have been +written had @var{n} been sufficiently large, regardless of the actual +value of @var{n}. Note some pre-C99 system libraries do not implement +this correctly so users cannot generally rely on the return value if +the system version of this function is used. @end deftypefn diff --git a/libiberty/vsnprintf.c b/libiberty/vsnprintf.c index 7df5bd88e..5470df222 100644 --- a/libiberty/vsnprintf.c +++ b/libiberty/vsnprintf.c @@ -27,13 +27,15 @@ the executable file might be covered by the GNU General Public License. */ @deftypefn Supplemental int vsnprintf (char *@var{buf}, size_t @var{n}, const char *@var{format}, va_list @var{ap}) -This function is similar to vsprintf, but it will print at most -@var{n} characters. On error the return value is -1, otherwise it -returns the number of characters that would have been printed had -@var{n} been sufficiently large, regardless of the actual value of -@var{n}. Note some pre-C99 system libraries do not implement this -correctly so users cannot generally rely on the return value if the -system version of this function is used. +This function is similar to @code{vsprintf}, but it will write to +@var{buf} at most @code{@var{n}-1} bytes of text, followed by a +terminating null byte, for a total of @var{n} bytes. On error the +return value is -1, otherwise it returns the number of characters that +would have been printed had @var{n} been sufficiently large, +regardless of the actual value of @var{n}. Note some pre-C99 system +libraries do not implement this correctly so users cannot generally +rely on the return value if the system version of this function is +used. @end deftypefn -- 2.11.4.GIT