summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2013-09-12 00:53:38 +0000
committerbdrewery <bdrewery@FreeBSD.org>2013-09-12 00:53:38 +0000
commitb3237a11f6bed062af5f93c71908030b767e256c (patch)
tree80119352dfee4aa2457193163f658d4e3f7d0a92 /lib
parentd9412a6c2df8ef63cd5411ed888c7458f2929719 (diff)
downloadFreeBSD-src-b3237a11f6bed062af5f93c71908030b767e256c.zip
FreeBSD-src-b3237a11f6bed062af5f93c71908030b767e256c.tar.gz
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)
Diffstat (limited to 'lib')
-rw-r--r--lib/libc/gen/lockf.312
-rw-r--r--lib/libc/sys/close.26
-rw-r--r--lib/libc/sys/ioctl.212
-rw-r--r--lib/libc/sys/read.220
-rw-r--r--lib/libc/sys/socketpair.26
-rw-r--r--lib/libc/sys/write.218
6 files changed, 37 insertions, 37 deletions
diff --git a/lib/libc/gen/lockf.3 b/lib/libc/gen/lockf.3
index d9350d1..a4adcfa 100644
--- a/lib/libc/gen/lockf.3
+++ b/lib/libc/gen/lockf.3
@@ -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 until the section becomes unlocked.
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
diff --git a/lib/libc/sys/close.2 b/lib/libc/sys/close.2
index c3a0972..6df4500 100644
--- a/lib/libc/sys/close.2
+++ b/lib/libc/sys/close.2
@@ -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
diff --git a/lib/libc/sys/ioctl.2 b/lib/libc/sys/ioctl.2
index bab7b47..81500a9 100644
--- a/lib/libc/sys/ioctl.2
+++ b/lib/libc/sys/ioctl.2
@@ -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
diff --git a/lib/libc/sys/read.2 b/lib/libc/sys/read.2
index 2127eda..e99665f 100644
--- a/lib/libc/sys/read.2
+++ b/lib/libc/sys/read.2
@@ -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 signal
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,
diff --git a/lib/libc/sys/socketpair.2 b/lib/libc/sys/socketpair.2
index 08d00d3..d3a47eb 100644
--- a/lib/libc/sys/socketpair.2
+++ b/lib/libc/sys/socketpair.2
@@ -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
diff --git a/lib/libc/sys/write.2 b/lib/libc/sys/write.2
index d22b985..a06e7c9 100644
--- a/lib/libc/sys/write.2
+++ b/lib/libc/sys/write.2
@@ -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 remain unchanged if:
.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
OpenPOWER on IntegriCloud