Fix 'make info'.

* libc/stdio/stdio.tex: Add missing include.
* libc/stdio/vfprintf.c: Use expected node name.
* libc/stdio/vfscanf.c: Likewise.
* libc/stdio/sscanf.c: Likewise.
* libc/stdio/sprintf.c: Likewise.
* libc/stdio/siscanf.c: Likewise.
* libc/stdio/siprintf.c: Likewise.
* libc/stdio/fopencookie.c: Quote raw {}.
Reported by DJ Delorie.

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 94f1438f1f7df1f1e77a638de0921ee98e50a788..042c17d648cdaec190d3ec4ff688c7956ba6fec8 100644 (file)
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,16 @@
+2007-07-18  Eric Blake  <ebb9@byu.net>
+
+       Fix 'make info'.
+       * libc/stdio/stdio.tex: Add missing include.
+       * libc/stdio/vfprintf.c: Use expected node name.
+       * libc/stdio/vfscanf.c: Likewise.
+       * libc/stdio/sscanf.c: Likewise.
+       * libc/stdio/sprintf.c: Likewise.
+       * libc/stdio/siscanf.c: Likewise.
+       * libc/stdio/siprintf.c: Likewise.
+       * libc/stdio/fopencookie.c: Quote raw {}.
+       Reported by DJ Delorie.
+
 2007-07-13  Eric Blake  <ebb9@byu.net>
 
        Fix fflush issues.

diff --git a/newlib/libc/stdio/fopencookie.c b/newlib/libc/stdio/fopencookie.c
index 581441be0c6da121cad11bb66260ea8af37d0919..35afa3257e37b48f603d10d55c73ab06230216fa 100644 (file)
--- a/newlib/libc/stdio/fopencookie.c
+++ b/newlib/libc/stdio/fopencookie.c
@@ -19,21 +19,24 @@ ANSI_SYNOPSIS
        typedef int (*cookie_seek_function_t)(void *_cookie, off_t *_off,
                                              int _whence);
        typedef int (*cookie_close_function_t)(void *_cookie);
-       typedef struct
-       {
-               cookie_read_function_t  *read;
-               cookie_write_function_t *write;
-               cookie_seek_function_t  *seek;
-               cookie_close_function_t *close;
-       } cookie_io_functions_t;
        FILE *fopencookie(const void *<[cookie]>, const char *<[mode]>,
                          cookie_io_functions_t <[functions]>);
 
 DESCRIPTION
 <<fopencookie>> creates a <<FILE>> stream where I/O is performed using
-custom callbacks.  The stream is opened with <[mode]> treated as in
-<<fopen>>.  The callbacks <[functions.read]> and <[functions.write]>
-may only be NULL when <[mode]> does not require them.
+custom callbacks.  The callbacks are registered via the structure:
+
+.      typedef struct
+.      {
+.              cookie_read_function_t  *read;
+.              cookie_write_function_t *write;
+.              cookie_seek_function_t  *seek;
+.              cookie_close_function_t *close;
+.      } cookie_io_functions_t;
+
+The stream is opened with <[mode]> treated as in <<fopen>>.  The
+callbacks <[functions.read]> and <[functions.write]> may only be NULL
+when <[mode]> does not require them.
 
 <[functions.read]> should return -1 on failure, or else the number of
 bytes read (0 on EOF).  It is similar to <<read>>, except that

diff --git a/newlib/libc/stdio/siprintf.c b/newlib/libc/stdio/siprintf.c
index d2b4e76c97efc845241e26f3a0d9ca8b8dee642a..296a16ee0d4e31b29fb773de8d4fe662d2128383 100644 (file)
--- a/newlib/libc/stdio/siprintf.c
+++ b/newlib/libc/stdio/siprintf.c
@@ -17,7 +17,7 @@
 
 /*
 FUNCTION
-<<iprintf>>, <<fiprintf>>, <<siprintf>>, <<sniprintf>>, <<asiprintf>>, <<asniprintf>>---format output (integer only)
+<<siprintf>>, <<fiprintf>>, <<iprintf>>, <<sniprintf>>, <<asiprintf>>, <<asniprintf>>---format output (integer only)
 
 INDEX
        fiprintf

diff --git a/newlib/libc/stdio/siscanf.c b/newlib/libc/stdio/siscanf.c
index 2c69921ffac63f0cd57184925c0bc0f3e8a61d29..15b25c196527b4f4ce75a4daa1cd2cd26a5acef7 100644 (file)
--- a/newlib/libc/stdio/siscanf.c
+++ b/newlib/libc/stdio/siscanf.c
@@ -17,7 +17,7 @@
 
 /*
 FUNCTION
-<<iscanf>>, <<fiscanf>>, <<siscanf>>---scan and format non-floating input
+<<siscanf>>, <<fiscanf>>, <<iscanf>>---scan and format non-floating input
 
 INDEX
        iscanf

diff --git a/newlib/libc/stdio/sprintf.c b/newlib/libc/stdio/sprintf.c
index d2203fb3cf386d2596a5e7392ffbfb34aeb22c6d..bdff0797dc2254ee736e51c13cb6248e8bdaa1d2 100644 (file)
--- a/newlib/libc/stdio/sprintf.c
+++ b/newlib/libc/stdio/sprintf.c
@@ -17,7 +17,7 @@
 
 /*
 FUNCTION
-<<printf>>, <<fprintf>>, <<sprintf>>, <<snprintf>>, <<asprintf>>, <<asnprintf>>---format output
+<<sprintf>>, <<fprintf>>, <<printf>>, <<snprintf>>, <<asprintf>>, <<asnprintf>>---format output
 
 INDEX
        fprintf

diff --git a/newlib/libc/stdio/sscanf.c b/newlib/libc/stdio/sscanf.c
index a1987c58da6f28099447626d5280d64040fbe34d..c0921e1e160d46e310540ad7e33aa77bad6f0cd9 100644 (file)
--- a/newlib/libc/stdio/sscanf.c
+++ b/newlib/libc/stdio/sscanf.c
@@ -17,7 +17,7 @@
 
 /*
 FUNCTION
-<<scanf>>, <<fscanf>>, <<sscanf>>---scan and format input
+<<sscanf>>, <<fscanf>>, <<scanf>>---scan and format input
 
 INDEX
        scanf

diff --git a/newlib/libc/stdio/stdio.tex b/newlib/libc/stdio/stdio.tex
index a3846eaed366fccae9ab05f8b05872286b6990c2..f312715236c24a0cccba3c7bc4da6ccdd28f45a8 100644 (file)
--- a/newlib/libc/stdio/stdio.tex
+++ b/newlib/libc/stdio/stdio.tex
@@ -150,6 +150,9 @@ structure.
 @page
 @include stdio/ftell.def
 
+@page
+@include stdio/funopen.def
+
 @page
 @include stdio/fwrite.def
 

diff --git a/newlib/libc/stdio/vfprintf.c b/newlib/libc/stdio/vfprintf.c
index 5bbd7594f7233b50c4e71dfec820b85bcc74c5aa..491369012b223322b752ab95f8ded4743bb52835 100644 (file)
--- a/newlib/libc/stdio/vfprintf.c
+++ b/newlib/libc/stdio/vfprintf.c
@@ -36,12 +36,12 @@
 
 /*
 FUNCTION
-<<vprintf>>, <<vfprintf>>, <<vsprintf>>, <<vsnprintf>>, <<vasprintf>>, <<vasnprintf>>---format argument list
+<<vfprintf>>, <<vprintf>>, <<vsprintf>>, <<vsnprintf>>, <<vasprintf>>, <<vasnprintf>>---format argument list
 
-INDEX
-       vprintf
 INDEX
        vfprintf
+INDEX
+       vprintf
 INDEX
        vsprintf
 INDEX

diff --git a/newlib/libc/stdio/vfscanf.c b/newlib/libc/stdio/vfscanf.c
index 79a12433095c30f264ee4849e92fe3e4f1fd86e6..68b55f42680c9767326bc45fb9fc02b3cd74803e 100644 (file)
--- a/newlib/libc/stdio/vfscanf.c
+++ b/newlib/libc/stdio/vfscanf.c
@@ -17,12 +17,12 @@
 
 /*
 FUNCTION
-<<vscanf>>, <<vfscanf>>, <<vsscanf>>---format argument list
+<<vfscanf>>, <<vscanf>>, <<vsscanf>>---format argument list
 
-INDEX
-       vscanf
 INDEX
        vfscanf
+INDEX
+       vscanf
 INDEX
        vsscanf