This is the mail archive of the
newlib@sourceware.org
mailing list for the newlib project.
Re: "make info" fails
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
According to Eric Blake on 7/18/2007 5:22 PM:
> DJ Delorie <dj <at> redhat.com> writes:
>
>>
>> Anyone else see this?
>>
>> ./stdio/fopencookie.def:15: Misplaced {.
>> ./stdio/fopencookie.def:20: Misplaced }.
>
> I obviously didn't test that when I implemented fopencookie. The culprit is
> this in fopencookie.c:
>
> ANSI_SYNOPSIS
> ...
> typedef struct
> {
And after scouring doc/makedoc.c, the solution is below (see also
stdlib/ldiv.c for docs that use a struct).
The other problem was that the .def files were being created with node
names that did not match the file name. The solution was to list the
function described by the current filename first.
I'm checking this patch in as obvious, since it was preventing a
documentation build.
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.
- --
Don't work too hard, make some time for fun as well!
Eric Blake ebb9@byu.net
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFGnt3B84KuGfSFAYARAn87AKChYDZbCHKvxp5VWNjPeR7Kl3uNOgCfeOON
5tASPxn1m38jeVYwF6SCQOo=
=691R
-----END PGP SIGNATURE-----
Index: libc/stdio/stdio.tex
===================================================================
RCS file: /cvs/src/src/newlib/libc/stdio/stdio.tex,v
retrieving revision 1.8
diff -u -p -r1.8 stdio.tex
--- libc/stdio/stdio.tex 13 Jul 2007 17:07:28 -0000 1.8
+++ libc/stdio/stdio.tex 19 Jul 2007 03:38:03 -0000
@@ -151,6 +151,9 @@ structure.
@include stdio/ftell.def
@page
+@include stdio/funopen.def
+
+@page
@include stdio/fwrite.def
@page
Index: libc/stdio/vfscanf.c
===================================================================
RCS file: /cvs/src/src/newlib/libc/stdio/vfscanf.c,v
retrieving revision 1.38
diff -u -p -r1.38 vfscanf.c
--- libc/stdio/vfscanf.c 24 May 2007 04:25:18 -0000 1.38
+++ libc/stdio/vfscanf.c 19 Jul 2007 03:38:03 -0000
@@ -17,13 +17,13 @@
/*
FUNCTION
-<<vscanf>>, <<vfscanf>>, <<vsscanf>>---format argument list
+<<vfscanf>>, <<vscanf>>, <<vsscanf>>---format argument list
INDEX
- vscanf
-INDEX
vfscanf
INDEX
+ vscanf
+INDEX
vsscanf
ANSI_SYNOPSIS
Index: libc/stdio/vfprintf.c
===================================================================
RCS file: /cvs/src/src/newlib/libc/stdio/vfprintf.c,v
retrieving revision 1.64
diff -u -p -r1.64 vfprintf.c
--- libc/stdio/vfprintf.c 13 Jul 2007 20:37:53 -0000 1.64
+++ libc/stdio/vfprintf.c 19 Jul 2007 03:38:03 -0000
@@ -36,13 +36,13 @@
/*
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
vsnprintf
Index: libc/stdio/sscanf.c
===================================================================
RCS file: /cvs/src/src/newlib/libc/stdio/sscanf.c,v
retrieving revision 1.11
diff -u -p -r1.11 sscanf.c
--- libc/stdio/sscanf.c 4 Jun 2007 18:10:17 -0000 1.11
+++ libc/stdio/sscanf.c 19 Jul 2007 03:38:04 -0000
@@ -17,7 +17,7 @@
/*
FUNCTION
-<<scanf>>, <<fscanf>>, <<sscanf>>---scan and format input
+<<sscanf>>, <<fscanf>>, <<scanf>>---scan and format input
INDEX
scanf
Index: libc/stdio/sprintf.c
===================================================================
RCS file: /cvs/src/src/newlib/libc/stdio/sprintf.c,v
retrieving revision 1.10
diff -u -p -r1.10 sprintf.c
--- libc/stdio/sprintf.c 4 May 2007 02:55:16 -0000 1.10
+++ libc/stdio/sprintf.c 19 Jul 2007 03:38:04 -0000
@@ -17,7 +17,7 @@
/*
FUNCTION
-<<printf>>, <<fprintf>>, <<sprintf>>, <<snprintf>>, <<asprintf>>, <<asnprintf>>---format output
+<<sprintf>>, <<fprintf>>, <<printf>>, <<snprintf>>, <<asprintf>>, <<asnprintf>>---format output
INDEX
fprintf
Index: libc/stdio/siscanf.c
===================================================================
RCS file: /cvs/src/src/newlib/libc/stdio/siscanf.c,v
retrieving revision 1.3
diff -u -p -r1.3 siscanf.c
--- libc/stdio/siscanf.c 4 Jun 2007 18:10:17 -0000 1.3
+++ libc/stdio/siscanf.c 19 Jul 2007 03:38:04 -0000
@@ -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
Index: libc/stdio/siprintf.c
===================================================================
RCS file: /cvs/src/src/newlib/libc/stdio/siprintf.c,v
retrieving revision 1.8
diff -u -p -r1.8 siprintf.c
--- libc/stdio/siprintf.c 4 May 2007 02:55:16 -0000 1.8
+++ libc/stdio/siprintf.c 19 Jul 2007 03:38:04 -0000
@@ -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
Index: libc/stdio/fopencookie.c
===================================================================
RCS file: /cvs/src/src/newlib/libc/stdio/fopencookie.c,v
retrieving revision 1.1
diff -u -p -r1.1 fopencookie.c
--- libc/stdio/fopencookie.c 4 Jun 2007 18:10:17 -0000 1.1
+++ libc/stdio/fopencookie.c 19 Jul 2007 03:38:04 -0000
@@ -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