From 2fda57bd09e52d892a2d703c34a0400a0b1031d6 Mon Sep 17 00:00:00 2001 From: Michael Kerrisk Date: Sat, 16 Jan 2010 17:44:48 +0100 Subject: [PATCH] _syscall.2, accept.2, epoll_create.2, inotify_add_watch.2, ioctl.2, msgget.2, msgop.2, open.2, prctl.2, sched_setscheduler.2, semctl.2, semget.2, swapon.2, addseverity.3, cacosh.3, csqrt.3, dirfd.3, drand48.3, fputws.3, mq_send.3, posix_openpt.3, puts.3, sched_getcpu.3, shm_open.3, sqrt.3, sysconf.3, tgamma.3, ulimit.3, credentials.7, svipc.7: Global fix: s/non-negative/nonnegative/ The tendency in English, as prescribed in style guides like Chicago MoS, is towards removing hyphens after prefixes like "non-" etc. Signed-off-by: Michael Kerrisk --- man2/_syscall.2 | 2 +- man2/accept.2 | 2 +- man2/epoll_create.2 | 2 +- man2/inotify_add_watch.2 | 2 +- man2/ioctl.2 | 2 +- man2/msgget.2 | 2 +- man2/msgop.2 | 2 +- man2/open.2 | 2 +- man2/prctl.2 | 2 +- man2/sched_setscheduler.2 | 2 +- man2/semctl.2 | 2 +- man2/semget.2 | 2 +- man2/swapon.2 | 2 +- man3/addseverity.3 | 2 +- man3/cacosh.3 | 2 +- man3/csqrt.3 | 2 +- man3/dirfd.3 | 2 +- man3/drand48.3 | 4 ++-- man3/fputws.3 | 2 +- man3/mq_send.3 | 2 +- man3/posix_openpt.3 | 2 +- man3/puts.3 | 2 +- man3/sched_getcpu.3 | 2 +- man3/shm_open.3 | 2 +- man3/sqrt.3 | 2 +- man3/sysconf.3 | 2 +- man3/tgamma.3 | 2 +- man3/ulimit.3 | 2 +- man7/credentials.7 | 2 +- man7/svipc.7 | 4 ++-- 30 files changed, 32 insertions(+), 32 deletions(-) diff --git a/man2/_syscall.2 b/man2/_syscall.2 index 185f8a914..1eba33767 100644 --- a/man2/_syscall.2 +++ b/man2/_syscall.2 @@ -97,7 +97,7 @@ You need to read the source to be sure how it will return errors. Usually, it is the negative of a standard error code, for example, \-\fBEPERM\fP. The _syscall() macros will return the result \fIr\fP of the system call -when \fIr\fP is non-negative, but will return \-1 and set the variable +when \fIr\fP is nonnegative, but will return \-1 and set the variable .I errno to \-\fIr\fP when \fIr\fP is negative. For the error codes, see diff --git a/man2/accept.2 b/man2/accept.2 index f1cf0baf3..f0b6ea435 100644 --- a/man2/accept.2 +++ b/man2/accept.2 @@ -177,7 +177,7 @@ flag in for reasons why this may be useful. .SH "RETURN VALUE" On success, -these system calls return a non-negative integer that is a descriptor +these system calls return a nonnegative integer that is a descriptor for the accepted socket. On error, \-1 is returned, and .I errno diff --git a/man2/epoll_create.2 b/man2/epoll_create.2 index 6051eddb8..f01612301 100644 --- a/man2/epoll_create.2 +++ b/man2/epoll_create.2 @@ -83,7 +83,7 @@ for reasons why this may be useful. .SH "RETURN VALUE" On success, these system calls -return a non-negative file descriptor. +return a nonnegative file descriptor. On error, \-1 is returned, and .I errno is set to indicate the error. diff --git a/man2/inotify_add_watch.2 b/man2/inotify_add_watch.2 index 21e85353d..3b75a7443 100644 --- a/man2/inotify_add_watch.2 +++ b/man2/inotify_add_watch.2 @@ -80,7 +80,7 @@ the object for which the event occurred. .SH "RETURN VALUE" On success, .BR inotify_add_watch () -returns a non-negative watch descriptor. +returns a nonnegative watch descriptor. On error \-1 is returned and .I errno is set appropriately. diff --git a/man2/ioctl.2 b/man2/ioctl.2 index cc8e531a1..02dd4c2c6 100644 --- a/man2/ioctl.2 +++ b/man2/ioctl.2 @@ -83,7 +83,7 @@ Usually, on success zero is returned. A few .BR ioctl () requests use the return value as an output parameter -and return a non-negative value on success. +and return a nonnegative value on success. On error, \-1 is returned, and .I errno is set appropriately. diff --git a/man2/msgget.2 b/man2/msgget.2 index f56f6dd42..1b304ba5d 100644 --- a/man2/msgget.2 +++ b/man2/msgget.2 @@ -134,7 +134,7 @@ verified, and a check is made to see if it is marked for destruction. .SH "RETURN VALUE" If successful, the return value will be the message queue identifier (a -non-negative integer), otherwise \-1 +nonnegative integer), otherwise \-1 with .I errno indicating the error. diff --git a/man2/msgop.2 b/man2/msgop.2 index 6ef8cff3f..2c3abe897 100644 --- a/man2/msgop.2 +++ b/man2/msgop.2 @@ -79,7 +79,7 @@ The .I mtext field is an array (or other structure) whose size is specified by .IR msgsz , -a non-negative integer value. +a nonnegative integer value. Messages of zero length (i.e., no .I mtext field) are permitted. diff --git a/man2/open.2 b/man2/open.2 index 4f186eb8c..11bd65e4b 100644 --- a/man2/open.2 +++ b/man2/open.2 @@ -67,7 +67,7 @@ Given a .I pathname for a file, .BR open () -returns a file descriptor, a small, non-negative integer +returns a file descriptor, a small, nonnegative integer for use in subsequent system calls .RB ( read "(2), " write "(2), " lseek "(2), " fcntl "(2), etc.)." The file descriptor returned by a successful call will be diff --git a/man2/prctl.2 b/man2/prctl.2 index 48d0137e8..754ba15dd 100644 --- a/man2/prctl.2 +++ b/man2/prctl.2 @@ -327,7 +327,7 @@ On success, .BR PR_GET_SECUREBITS , and (if it returns) .BR PR_GET_SECCOMP -return the non-negative values described above. +return the nonnegative values described above. All other .I option values return 0 on success. diff --git a/man2/sched_setscheduler.2 b/man2/sched_setscheduler.2 index 69d2c8bce..60090d664 100644 --- a/man2/sched_setscheduler.2 +++ b/man2/sched_setscheduler.2 @@ -367,7 +367,7 @@ On success, returns zero. On success, .BR sched_getscheduler () -returns the policy for the process (a non-negative integer). +returns the policy for the process (a nonnegative integer). On error, \-1 is returned, and .I errno is set appropriately. diff --git a/man2/semctl.2 b/man2/semctl.2 index 93ec7592b..fba8d7de5 100644 --- a/man2/semctl.2 +++ b/man2/semctl.2 @@ -343,7 +343,7 @@ with .I errno indicating the error. -Otherwise the system call returns a non-negative value depending on +Otherwise the system call returns a nonnegative value depending on .I cmd as follows: .TP 12 diff --git a/man2/semget.2 b/man2/semget.2 index 01db84a7e..7b1ddf099 100644 --- a/man2/semget.2 +++ b/man2/semget.2 @@ -154,7 +154,7 @@ verified. .\" and a check is made to see if it is marked for destruction. .SH "RETURN VALUE" If successful, the return value will be the semaphore set identifier -(a non-negative integer), otherwise \-1 +(a nonnegative integer), otherwise \-1 is returned, with .I errno indicating the error. diff --git a/man2/swapon.2 b/man2/swapon.2 index 4c7008a60..63d1c9bb0 100644 --- a/man2/swapon.2 +++ b/man2/swapon.2 @@ -84,7 +84,7 @@ newer areas are even lower priority than older areas. All priorities set with .I swapflags are high-priority, higher than default. -They may have any non-negative value chosen by the caller. +They may have any nonnegative value chosen by the caller. Higher numbers mean higher priority. .PP Swap pages are allocated from areas in priority order, diff --git a/man3/addseverity.3 b/man3/addseverity.3 index 803eff432..d51b16010 100644 --- a/man3/addseverity.3 +++ b/man3/addseverity.3 @@ -42,7 +42,7 @@ is NULL, the severity class with the numeric value is removed. It is not possible to overwrite or remove one of the default severity classes. -The severity value must be non-negative. +The severity value must be nonnegative. .SH "RETURN VALUE" Upon success, the value .B MM_OK diff --git a/man3/cacosh.3 b/man3/cacosh.3 index be5f65714..7bf60c995 100644 --- a/man3/cacosh.3 +++ b/man3/cacosh.3 @@ -25,7 +25,7 @@ The imaginary part of is chosen in the interval [\-pi,pi]. The real part of .I y -is chosen non-negative. +is chosen nonnegative. .LP One has: .nf diff --git a/man3/csqrt.3 b/man3/csqrt.3 index f83158058..22655f3e7 100644 --- a/man3/csqrt.3 +++ b/man3/csqrt.3 @@ -16,7 +16,7 @@ csqrt, csqrtf, csqrtl \- complex square root Link with \fI\-lm\fP. .SH DESCRIPTION Calculate the square root of a given complex number, -with non-negative real part, and +with nonnegative real part, and with a branch cut along the negative real axis. (That means that \fIcsqrt(\-1+eps*I)\fP will be close to I while \fIcsqrt(\-1\-eps*I)\fP will be close to \-I, \fIif eps\fP is a small positive diff --git a/man3/dirfd.3 b/man3/dirfd.3 index ffbbaa954..8b4971e95 100644 --- a/man3/dirfd.3 +++ b/man3/dirfd.3 @@ -53,7 +53,7 @@ It will be automatically closed when .BR closedir (3) is called. .SH RETURN VALUE -On success, a non-negative file descriptor is returned. +On success, a nonnegative file descriptor is returned. On error, \-1 is returned. .SH ERRORS POSIX.1-2008 specifies two errors, diff --git a/man3/drand48.3 b/man3/drand48.3 index 82a634820..5242fb340 100644 --- a/man3/drand48.3 +++ b/man3/drand48.3 @@ -78,7 +78,7 @@ The .BR drand48 () and .BR erand48 () -functions return non-negative +functions return nonnegative double-precision floating-point values uniformly distributed between [0.0, 1.0). .PP @@ -86,7 +86,7 @@ The .BR lrand48 () and .BR nrand48 () -functions return non-negative +functions return nonnegative long integers uniformly distributed between 0 and 2^31. .PP The diff --git a/man3/fputws.3 b/man3/fputws.3 index 952567ae0..7a3c9fd5e 100644 --- a/man3/fputws.3 +++ b/man3/fputws.3 @@ -36,7 +36,7 @@ For a non-locking counterpart, see The .BR fputws () function returns a -non-negative integer if the operation was +nonnegative integer if the operation was successful, or \-1 to indicate an error. .SH "CONFORMING TO" C99, POSIX.1-2001. diff --git a/man3/mq_send.3 b/man3/mq_send.3 index 3271d8823..97e8bec43 100644 --- a/man3/mq_send.3 +++ b/man3/mq_send.3 @@ -60,7 +60,7 @@ Zero-length messages are allowed. The .I msg_prio -argument is a non-negative integer that specifies the priority +argument is a nonnegative integer that specifies the priority of this message. Messages are placed on the queue in decreasing order of priority, with newer messages of the same priority being placed after diff --git a/man3/posix_openpt.3 b/man3/posix_openpt.3 index 48a1ad0f1..862d688d8 100644 --- a/man3/posix_openpt.3 +++ b/man3/posix_openpt.3 @@ -62,7 +62,7 @@ Do not make this device the controlling terminal for the process. .SH "RETURN VALUE" On success, .BR posix_openpt () -returns a non-negative file descriptor which is the lowest +returns a nonnegative file descriptor which is the lowest numbered unused descriptor. On failure, \-1 is returned, and .I errno diff --git a/man3/puts.3 b/man3/puts.3 index a2f934235..fd555e479 100644 --- a/man3/puts.3 +++ b/man3/puts.3 @@ -96,7 +96,7 @@ on error. .BR puts () and .BR fputs () -return a non-negative number on success, or +return a nonnegative number on success, or .B EOF on error. .SH "CONFORMING TO" diff --git a/man3/sched_getcpu.3 b/man3/sched_getcpu.3 index 270d48d37..12a42a13d 100644 --- a/man3/sched_getcpu.3 +++ b/man3/sched_getcpu.3 @@ -45,7 +45,7 @@ returns the number of the CPU on which the calling thread is currently executing .SH RETURN VALUE On success, .BR sched_getcpu () -returns a non-negative CPU number. +returns a nonnegative CPU number. On error, \-1 is returned and .I errno is set to indicate the error. diff --git a/man3/shm_open.3 b/man3/shm_open.3 index c64c2a102..0c87c3dd0 100644 --- a/man3/shm_open.3 +++ b/man3/shm_open.3 @@ -169,7 +169,7 @@ was specified, in which case a new, distinct object is created). .SH "RETURN VALUE" On success, .BR shm_open () -returns a non-negative file descriptor. +returns a nonnegative file descriptor. On failure, .BR shm_open () returns \-1. diff --git a/man3/sqrt.3 b/man3/sqrt.3 index bb4a0a08d..95723c8c2 100644 --- a/man3/sqrt.3 +++ b/man3/sqrt.3 @@ -59,7 +59,7 @@ _BSD_SOURCE || _SVID_SOURCE || _XOPEN_SOURCE\ >=\ 600 || _ISOC99_SOURCE; or .SH DESCRIPTION The .BR sqrt () -function returns the non-negative square root of \fIx\fP. +function returns the nonnegative square root of \fIx\fP. .SH "RETURN VALUE" On success, these functions return the square root of .IR x . diff --git a/man3/sysconf.3 b/man3/sysconf.3 index 690f90476..f2ba8df0a 100644 --- a/man3/sysconf.3 +++ b/man3/sysconf.3 @@ -122,7 +122,7 @@ First, the POSIX.1 compatible values. .\" (if _POSIX_ASYNCHRONOUS_IO) .\" The maximum amount by which a process can decrease its .\" asynchronous I/O priority level from its own scheduling priority. -.\" Must be non-negative. +.\" Must be nonnegative. .TP .BR ARG_MAX " - " _SC_ARG_MAX The maximum length of the arguments to the diff --git a/man3/tgamma.3 b/man3/tgamma.3 index 09c96d7ba..34040dbf2 100644 --- a/man3/tgamma.3 +++ b/man3/tgamma.3 @@ -37,7 +37,7 @@ The Gamma function is defined by Gamma(x) = integral from 0 to infinity of t^(x\-1) e^\-t dt .sp It is defined for every real number except for non-positive integers. -For non-negative integral \fIm\fP one has +For nonnegative integral \fIm\fP one has .sp Gamma(m+1) = m! .sp diff --git a/man3/ulimit.3 b/man3/ulimit.3 index d39633aa4..d979b7ccf 100644 --- a/man3/ulimit.3 +++ b/man3/ulimit.3 @@ -67,7 +67,7 @@ Return the maximum number of files that the calling process can open. .SH "RETURN VALUE" On success, .BR ulimit () -returns a non-negative value. +returns a nonnegative value. On error, \-1 is returned, and .I errno is set appropriately. diff --git a/man7/credentials.7 b/man7/credentials.7 index f121682b3..25bd94f0c 100644 --- a/man7/credentials.7 +++ b/man7/credentials.7 @@ -27,7 +27,7 @@ credentials \- process identifiers .SH DESCRIPTION .SS Process ID (PID) -Each process has a unique non-negative integer identifier +Each process has a unique nonnegative integer identifier that is assigned when the process is created using .BR fork (2). A process can obtain its PID using diff --git a/man7/svipc.7 b/man7/svipc.7 index 98a9ea995..a29a0185c 100644 --- a/man7/svipc.7 +++ b/man7/svipc.7 @@ -220,7 +220,7 @@ semaphore belonging to the set. .TP .I sem_nsems Number of semaphores in the set. -Each semaphore of the set is referenced by a non-negative integer +Each semaphore of the set is referenced by a nonnegative integer ranging from .B 0 to @@ -242,7 +242,7 @@ struct sem { .in .TP 11 .I semval -Semaphore value: a non-negative integer. +Semaphore value: a nonnegative integer. .TP .I sempid ID of the last process that performed a semaphore operation