Date: Thu, 12 Sep 2013 00:53:38 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255486 - in head/lib/libc: gen sys Message-ID: <201309120053.r8C0rc7H082015@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery (ports committer) Date: Thu Sep 12 00:53:38 2013 New Revision: 255486 URL: http://svnweb.freebsd.org/changeset/base/255486 Log: Consistently reference file descriptors as "fd". 55 other manpages used "fd", while these used "d" and "filedes". MFC after: 1 week Approved by: gjb Approved by: re (delphij) Modified: head/lib/libc/gen/lockf.3 head/lib/libc/sys/close.2 head/lib/libc/sys/ioctl.2 head/lib/libc/sys/read.2 head/lib/libc/sys/socketpair.2 head/lib/libc/sys/write.2 Modified: head/lib/libc/gen/lockf.3 ============================================================================== --- head/lib/libc/gen/lockf.3 Thu Sep 12 00:46:32 2013 (r255485) +++ head/lib/libc/gen/lockf.3 Thu Sep 12 00:53:38 2013 (r255486) @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 19, 1997 +.Dd September 11, 2013 .Dt LOCKF 3 .Os .Sh NAME @@ -40,7 +40,7 @@ .Sh SYNOPSIS .In unistd.h .Ft int -.Fn lockf "int filedes" "int function" "off_t size" +.Fn lockf "int fd" "int function" "off_t size" .Sh DESCRIPTION The .Fn lockf @@ -52,7 +52,7 @@ either return an error value or block un All the locks for a process are removed when the process terminates. .Pp The argument -.Fa filedes +.Fa fd is an open file descriptor. The file descriptor must have been opened either for write-only .Dv ( O_WRONLY ) @@ -207,7 +207,7 @@ or and the section is already locked by another process. .It Bq Er EBADF The argument -.Fa filedes +.Fa fd is not a valid open file descriptor. .Pp The argument @@ -217,7 +217,7 @@ is or .Dv F_TLOCK , and -.Fa filedes +.Fa fd is not a valid file descriptor open for writing. .It Bq Er EDEADLK The argument @@ -243,7 +243,7 @@ or .Dv F_TEST . .Pp The argument -.Fa filedes +.Fa fd refers to a file that does not support locking. .It Bq Er ENOLCK The argument Modified: head/lib/libc/sys/close.2 ============================================================================== --- head/lib/libc/sys/close.2 Thu Sep 12 00:46:32 2013 (r255485) +++ head/lib/libc/sys/close.2 Thu Sep 12 00:53:38 2013 (r255486) @@ -28,7 +28,7 @@ .\" @(#)close.2 8.2 (Berkeley) 4/19/94 .\" $FreeBSD$ .\" -.Dd January 22, 2012 +.Dd September 11, 2013 .Dt CLOSE 2 .Os .Sh NAME @@ -39,7 +39,7 @@ .Sh SYNOPSIS .In unistd.h .Ft int -.Fn close "int d" +.Fn close "int fd" .Sh DESCRIPTION The .Fn close @@ -107,7 +107,7 @@ system call will fail if: .Bl -tag -width Er .It Bq Er EBADF The -.Fa d +.Fa fd argument is not an active descriptor. .It Bq Er EINTR Modified: head/lib/libc/sys/ioctl.2 ============================================================================== --- head/lib/libc/sys/ioctl.2 Thu Sep 12 00:46:32 2013 (r255485) +++ head/lib/libc/sys/ioctl.2 Thu Sep 12 00:53:38 2013 (r255486) @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 11, 2010 +.Dd September 11, 2013 .Dt IOCTL 2 .Os .Sh NAME @@ -40,7 +40,7 @@ .Sh SYNOPSIS .In sys/ioctl.h .Ft int -.Fn ioctl "int d" "unsigned long request" ... +.Fn ioctl "int fd" "unsigned long request" ... .Sh DESCRIPTION The .Fn ioctl @@ -51,7 +51,7 @@ may be controlled with .Fn ioctl requests. The argument -.Fa d +.Fa fd must be an open file descriptor. .Pp The third argument to @@ -116,19 +116,19 @@ will fail if: .Bl -tag -width Er .It Bq Er EBADF The -.Fa d +.Fa fd argument is not a valid descriptor. .It Bq Er ENOTTY The -.Fa d +.Fa fd argument is not associated with a character special device. .It Bq Er ENOTTY The specified request does not apply to the kind of object that the descriptor -.Fa d +.Fa fd references. .It Bq Er EINVAL The Modified: head/lib/libc/sys/read.2 ============================================================================== --- head/lib/libc/sys/read.2 Thu Sep 12 00:46:32 2013 (r255485) +++ head/lib/libc/sys/read.2 Thu Sep 12 00:53:38 2013 (r255486) @@ -28,7 +28,7 @@ .\" @(#)read.2 8.4 (Berkeley) 2/26/94 .\" $FreeBSD$ .\" -.Dd January 22, 2012 +.Dd September 11, 2013 .Dt READ 2 .Os .Sh NAME @@ -43,14 +43,14 @@ .In sys/types.h .In unistd.h .Ft ssize_t -.Fn read "int d" "void *buf" "size_t nbytes" +.Fn read "int fd" "void *buf" "size_t nbytes" .Ft ssize_t -.Fn pread "int d" "void *buf" "size_t nbytes" "off_t offset" +.Fn pread "int fd" "void *buf" "size_t nbytes" "off_t offset" .In sys/uio.h .Ft ssize_t -.Fn readv "int d" "const struct iovec *iov" "int iovcnt" +.Fn readv "int fd" "const struct iovec *iov" "int iovcnt" .Ft ssize_t -.Fn preadv "int d" "const struct iovec *iov" "int iovcnt" "off_t offset" +.Fn preadv "int fd" "const struct iovec *iov" "int iovcnt" "off_t offset" .Sh DESCRIPTION The .Fn read @@ -58,7 +58,7 @@ system call attempts to read .Fa nbytes of data from the object referenced by the descriptor -.Fa d +.Fa fd into the buffer pointed to by .Fa buf . The @@ -107,7 +107,7 @@ On objects capable of seeking, the .Fn read starts at a position given by the pointer associated with -.Fa d +.Fa fd (see .Xr lseek 2 ) . Upon return from @@ -149,12 +149,12 @@ will succeed unless: .Bl -tag -width Er .It Bq Er EBADF The -.Fa d +.Fa fd argument is not a valid file or socket descriptor open for reading. .It Bq Er ECONNRESET The -.Fa d +.Fa fd argument refers to a socket, and the remote socket end is forcibly closed. .It Bq Er EFAULT @@ -173,7 +173,7 @@ was interrupted by the delivery of a sig before any data arrived. .It Bq Er EINVAL The pointer associated with -.Fa d +.Fa fd was negative. .It Bq Er EAGAIN The file was marked for non-blocking I/O, Modified: head/lib/libc/sys/socketpair.2 ============================================================================== --- head/lib/libc/sys/socketpair.2 Thu Sep 12 00:46:32 2013 (r255485) +++ head/lib/libc/sys/socketpair.2 Thu Sep 12 00:53:38 2013 (r255486) @@ -28,7 +28,7 @@ .\" @(#)socketpair.2 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd March 19, 2013 +.Dd September 11, 2013 .Dt SOCKETPAIR 2 .Os .Sh NAME @@ -40,13 +40,13 @@ .In sys/types.h .In sys/socket.h .Ft int -.Fn socketpair "int d" "int type" "int protocol" "int *sv" +.Fn socketpair "int fd" "int type" "int protocol" "int *sv" .Sh DESCRIPTION The .Fn socketpair system call creates an unnamed pair of connected sockets in the specified domain -.Fa d , +.Fa fd , of the specified .Fa type , and using the optionally specified Modified: head/lib/libc/sys/write.2 ============================================================================== --- head/lib/libc/sys/write.2 Thu Sep 12 00:46:32 2013 (r255485) +++ head/lib/libc/sys/write.2 Thu Sep 12 00:53:38 2013 (r255486) @@ -28,7 +28,7 @@ .\" @(#)write.2 8.5 (Berkeley) 4/2/94 .\" $FreeBSD$ .\" -.Dd January 22, 2012 +.Dd September 11, 2013 .Dt WRITE 2 .Os .Sh NAME @@ -43,14 +43,14 @@ .In sys/types.h .In unistd.h .Ft ssize_t -.Fn write "int d" "const void *buf" "size_t nbytes" +.Fn write "int fd" "const void *buf" "size_t nbytes" .Ft ssize_t -.Fn pwrite "int d" "const void *buf" "size_t nbytes" "off_t offset" +.Fn pwrite "int fd" "const void *buf" "size_t nbytes" "off_t offset" .In sys/uio.h .Ft ssize_t -.Fn writev "int d" "const struct iovec *iov" "int iovcnt" +.Fn writev "int fd" "const struct iovec *iov" "int iovcnt" .Ft ssize_t -.Fn pwritev "int d" "const struct iovec *iov" "int iovcnt" "off_t offset" +.Fn pwritev "int fd" "const struct iovec *iov" "int iovcnt" "off_t offset" .Sh DESCRIPTION The .Fn write @@ -58,7 +58,7 @@ system call attempts to write .Fa nbytes of data to the object referenced by the descriptor -.Fa d +.Fa fd from the buffer pointed to by .Fa buf . The @@ -107,7 +107,7 @@ On objects capable of seeking, the .Fn write starts at a position given by the pointer associated with -.Fa d , +.Fa fd , see .Xr lseek 2 . Upon return from @@ -154,7 +154,7 @@ will fail and the file pointer will rema .Bl -tag -width Er .It Bq Er EBADF The -.Fa d +.Fa fd argument is not a valid descriptor open for writing. .It Bq Er EPIPE @@ -174,7 +174,7 @@ or data to be written to the file points outside the process's allocated address space. .It Bq Er EINVAL The pointer associated with -.Fa d +.Fa fd was negative. .It Bq Er ENOSPC There is no free space remaining on the file system
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309120053.r8C0rc7H082015>