From 53ce3bb98bbcae96805952da2ad33af0e6917a25 Mon Sep 17 00:00:00 2001 From: schwarze Date: Tue, 13 Jan 2015 14:02:30 +0000 Subject: [PATCH] remove .Tn from stdio manuals; Kaspars Bankovskis found one of these --- lib/libc/stdio/fgetln.3 | 12 ++++-------- lib/libc/stdio/fgetwln.3 | 8 +++----- lib/libc/stdio/fopen.3 | 7 +++---- lib/libc/stdio/fputs.3 | 7 ++----- lib/libc/stdio/funopen.3 | 20 +++++++------------- lib/libc/stdio/printf.3 | 16 ++++++---------- lib/libc/stdio/tmpnam.3 | 8 +++----- 7 files changed, 28 insertions(+), 50 deletions(-) diff --git a/lib/libc/stdio/fgetln.3 b/lib/libc/stdio/fgetln.3 index b2806616cb5..a6f4af0392a 100644 --- a/lib/libc/stdio/fgetln.3 +++ b/lib/libc/stdio/fgetln.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: fgetln.3,v 1.16 2013/06/05 03:39:23 tedu Exp $ +.\" $OpenBSD: fgetln.3,v 1.17 2015/01/13 14:02:30 schwarze Exp $ .\" .\" Copyright (c) 1990, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: June 5 2013 $ +.Dd $Mdocdate: January 13 2015 $ .Dt FGETLN 3 .Os .Sh NAME @@ -44,9 +44,7 @@ function returns a pointer to the next line from the stream referenced by .Fa stream . This line is .Em not -a C string as it does not end with a terminating -.Tn NUL -character. +a C string as it does not end with a terminating NUL character. The length of the line, including the final newline, is stored in the memory location to which .Fa len @@ -55,9 +53,7 @@ points and is guaranteed to be greater than 0 upon successful completion. the returned text will not contain a newline.) .Sh RETURN VALUES Upon successful completion a pointer is returned; -this pointer becomes invalid after the next -.Tn I/O -operation on +this pointer becomes invalid after the next I/O operation on .Fa stream (whether successful or not) or as soon as the stream is closed. diff --git a/lib/libc/stdio/fgetwln.3 b/lib/libc/stdio/fgetwln.3 index 0d6e3ac34b3..a8a1d362f72 100644 --- a/lib/libc/stdio/fgetwln.3 +++ b/lib/libc/stdio/fgetwln.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: fgetwln.3,v 1.1 2015/01/12 20:58:07 millert Exp $ +.\" $OpenBSD: fgetwln.3,v 1.2 2015/01/13 14:02:30 schwarze Exp $ .\" .\" Copyright (c) 1990, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: January 12 2015 $ +.Dd $Mdocdate: January 13 2015 $ .Dt FGETWLN 3 .Os .Sh NAME @@ -55,9 +55,7 @@ points and is guaranteed to be greater than 0 upon successful completion. the returned text will not contain a newline.) .Sh RETURN VALUES Upon successful completion a pointer is returned; -this pointer becomes invalid after the next -.Tn I/O -operation on +this pointer becomes invalid after the next I/O operation on .Fa stream (whether successful or not) or as soon as the stream is closed. diff --git a/lib/libc/stdio/fopen.3 b/lib/libc/stdio/fopen.3 index 0c0f5b53ca0..78d79cf25e8 100644 --- a/lib/libc/stdio/fopen.3 +++ b/lib/libc/stdio/fopen.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: fopen.3,v 1.30 2014/11/15 14:41:02 bentley Exp $ +.\" $OpenBSD: fopen.3,v 1.31 2015/01/13 14:02:30 schwarze Exp $ .\" .\" Copyright (c) 1990, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: November 15 2014 $ +.Dd $Mdocdate: January 13 2015 $ .Dt FOPEN 3 .Os .Sh NAME @@ -141,8 +141,7 @@ umask value (see .Xr umask 2 ) . .Pp Reads and writes cannot be arbitrarily intermixed on read/write streams. -.Tn ANSI C -requires that +ANSI C requires that a file positioning function intervene between output and input, unless an input operation encounters end-of-file. .Pp diff --git a/lib/libc/stdio/fputs.3 b/lib/libc/stdio/fputs.3 index 486b9eec099..661aea55a69 100644 --- a/lib/libc/stdio/fputs.3 +++ b/lib/libc/stdio/fputs.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: fputs.3,v 1.10 2013/07/18 10:14:49 schwarze Exp $ +.\" $OpenBSD: fputs.3,v 1.11 2015/01/13 14:02:30 schwarze Exp $ .\" .\" Copyright (c) 1990, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: July 18 2013 $ +.Dd $Mdocdate: January 13 2015 $ .Dt FPUTS 3 .Os .Sh NAME @@ -51,9 +51,6 @@ writes the string pointed to by .Fa str to the stream pointed to by .Fa stream . -.\" The terminating -.\" .Tn NUL -.\" character is not written. .Pp The function .Fn puts diff --git a/lib/libc/stdio/funopen.3 b/lib/libc/stdio/funopen.3 index bf64c3be0d8..9d5e0bb89c0 100644 --- a/lib/libc/stdio/funopen.3 +++ b/lib/libc/stdio/funopen.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: funopen.3,v 1.16 2014/01/21 03:15:45 schwarze Exp $ +.\" $OpenBSD: funopen.3,v 1.17 2015/01/13 14:02:30 schwarze Exp $ .\" .\" Copyright (c) 1990, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: January 21 2014 $ +.Dd $Mdocdate: January 13 2015 $ .Dt FUNOPEN 3 .Os .Sh NAME @@ -51,8 +51,7 @@ .Sh DESCRIPTION The .Fn funopen -function associates a stream with up to four -.Dq Tn I/O No functions . +function associates a stream with up to four I/O functions. Either .Fa readfn or @@ -61,9 +60,8 @@ must be specified; the others may be given as .Dv NULL pointers. -These -.Tn I/O -functions will be used to read, write, seek, and close the new stream. +These I/O functions will be used to read, write, seek, and close +the new stream. .Pp In general, omitting a function means that any attempt to perform the associated operation on the resulting stream will fail. @@ -93,9 +91,7 @@ argument and not an .Li off_t argument. .Pp -Read and write -.Tn I/O -functions are allowed to change the underlying buffer +Read and write I/O functions are allowed to change the underlying buffer on fully buffered or line buffered streams by calling .Xr setvbuf 3 . They are also not required to completely fill or empty the buffer. @@ -104,9 +100,7 @@ or to change the state of the line buffering flag. They must also be prepared to have read or write calls occur on buffers other than the one most recently specified. .Pp -All user -.Tn I/O -functions can report an error by returning \-1. +All user I/O functions can report an error by returning \-1. Additionally, all of the functions should set the external variable .Va errno appropriately if an error occurs. diff --git a/lib/libc/stdio/printf.3 b/lib/libc/stdio/printf.3 index 66830ed4446..10e4a2cd9db 100644 --- a/lib/libc/stdio/printf.3 +++ b/lib/libc/stdio/printf.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: printf.3,v 1.70 2014/11/15 14:41:02 bentley Exp $ +.\" $OpenBSD: printf.3,v 1.71 2015/01/13 14:02:30 schwarze Exp $ .\" .\" Copyright (c) 1990, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -33,7 +33,7 @@ .\" .\" @(#)printf.3 8.1 (Berkeley) 6/4/93 .\" -.Dd $Mdocdate: November 15 2014 $ +.Dd $Mdocdate: January 13 2015 $ .Dt PRINTF 3 .Os .Sh NAME @@ -609,16 +609,12 @@ The argument is expected to be a pointer to an array of character type (pointer to a string). Characters from the array are written up to (but not including) -a terminating -.Tn NUL -character; +a terminating NUL character; if a precision is specified, no more than the number specified are written. -If a precision is given, no NUL character -need be present; if the precision is not specified, or is greater than -the size of the array, the array must contain a terminating -.Tn NUL -character. +If a precision is given, no NUL character need be present; +if the precision is not specified, or is greater than the size +of the array, the array must contain a terminating NUL character. .It Cm p The .Li void * diff --git a/lib/libc/stdio/tmpnam.3 b/lib/libc/stdio/tmpnam.3 index f152ce731c4..29d151a683a 100644 --- a/lib/libc/stdio/tmpnam.3 +++ b/lib/libc/stdio/tmpnam.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: tmpnam.3,v 1.19 2014/01/21 03:15:45 schwarze Exp $ +.\" $OpenBSD: tmpnam.3,v 1.20 2015/01/13 14:02:30 schwarze Exp $ .\" .\" Copyright (c) 1988, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: January 21 2014 $ +.Dd $Mdocdate: January 13 2015 $ .Dt TMPFILE 3 .Os .Sh NAME @@ -187,9 +187,7 @@ functions conform to .Fn tmpnam and .Fn tempnam -are provided for System V and -.Tn ANSI -compatibility only. +are provided for System V and ANSI compatibility only. These interfaces are typically not used in safe ways. The .Xr mkstemp 3 -- 2.20.1