From be9c60e52e24c28e5d76eb7790e3ce76d6400e1d Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Tue, 7 Jan 2003 20:02:33 +0000 Subject: [PATCH] 2003-01-07 Charles Wilson * libc/stdio/sprintf.c: fix typo * libc/stdio/vfprintf.c: fix typo --- newlib/ChangeLog | 5 +++++ newlib/libc/stdio/sprintf.c | 18 +++++++++--------- newlib/libc/stdio/vfprintf.c | 2 +- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 72b77cb6d..e5d99b019 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,8 @@ +2003-01-07 Charles Wilson + + * libc/stdio/sprintf.c: fix typo + * libc/stdio/vfprintf.c: fix typo + 2003-01-07 Jeff Johnston * configure.host: Support long double I/O for x86-linux. diff --git a/newlib/libc/stdio/sprintf.c b/newlib/libc/stdio/sprintf.c index 6e6750145..879b480c9 100644 --- a/newlib/libc/stdio/sprintf.c +++ b/newlib/libc/stdio/sprintf.c @@ -18,13 +18,13 @@ /* FUNCTION - <>, <>, <>, <>, <>---format output + <>, <>, <>, <>, <>---format output INDEX fprintf INDEX printf INDEX - saprintf + asprintf INDEX sprintf INDEX @@ -36,7 +36,7 @@ ANSI_SYNOPSIS int printf(const char *<[format]> [, <[arg]>, ...]); int fprintf(FILE *<[fd]>, const char *<[format]> [, <[arg]>, ...]); int sprintf(char *<[str]>, const char *<[format]> [, <[arg]>, ...]); - int saprintf(char **<[strp]>, const char *<[format]> [, <[arg]>, ...]); + int asprintf(char **<[strp]>, const char *<[format]> [, <[arg]>, ...]); int snprintf(char *<[str]>, size_t <[size]>, const char *<[format]> [, <[arg]>, ...]); TRAD_SYNOPSIS @@ -49,7 +49,7 @@ TRAD_SYNOPSIS FILE *<[fd]>; char *<[format]>; - int saprintf(<[strp]>, <[format]> [, <[arg]>, ...]); + int asprintf(<[strp]>, <[format]> [, <[arg]>, ...]); char **<[strp]>; char *<[format]>; @@ -72,16 +72,16 @@ DESCRIPTION If there are more arguments than the format requires, excess arguments are ignored. - <>, <>, <> and <> are identical + <>, <>, <> and <> are identical to <>, other than the destination of the formatted output: <> sends the output to a specified file <[fd]>, while - <> stores the output in a dynamically allocated buffer, + <> stores the output in a dynamically allocated buffer, while <> stores the output in the specified char array <[str]> and <> limits number of characters written to <[str]> to at most <[size]> (including terminating <<0>>). For <> and <>, the behavior is undefined if the output <<*<[str]>>> overlaps with one of the arguments. For - <>, <[strp]> points to a pointer to char which is filled + <>, <[strp]> points to a pointer to char which is filled in with the dynamically allocated buffer. <[format]> is a pointer to a charater string containing two types of objects: ordinary characters (other than <<%>>), which are copied unchanged to the @@ -282,11 +282,11 @@ O- RETURNS -<> and <> return the number of bytes in the output string, +<> and <> return the number of bytes in the output string, save that the concluding <> is not counted. <> and <> return the number of characters transmitted. If an error occurs, <> and <> return <> and -<> returns -1. No error returns occur for <>. +<> returns -1. No error returns occur for <>. PORTABILITY The ANSI C standard specifies that implementations must diff --git a/newlib/libc/stdio/vfprintf.c b/newlib/libc/stdio/vfprintf.c index 3fa23491b..82255735e 100644 --- a/newlib/libc/stdio/vfprintf.c +++ b/newlib/libc/stdio/vfprintf.c @@ -91,7 +91,7 @@ TRAD_SYNOPSIS DESCRIPTION <>, <>, <>, <> and <> are -(respectively) variants of <>, <>, <>, <>, +(respectively) variants of <>, <>, <>, <>, and <>. They differ only in allowing their caller to pass the variable argument list as a <> object (initialized by <>) rather than directly accepting a variable number of arguments.