From 0215088dcfeeb0cfd8b5db1e4ee70f0905e18034 Mon Sep 17 00:00:00 2001 From: jan Date: Sun, 21 Nov 2021 23:44:55 +0000 Subject: [PATCH] improve legibility of structs in several manpages General uses tabs for general indentation and 4 spaces on tight spots. Also uses extra space to align pointers and non-pointers as we do this on certain places in our source. with improvements from schwarze@ OK schwarze@ --- lib/libc/sys/kbind.2 | 8 +++--- lib/libc/sys/kqueue.2 | 14 +++++------ lib/libc/sys/ktrace.2 | 16 ++++++------ lib/libc/sys/nfssvc.2 | 30 +++++++++++------------ lib/libc/sys/poll.2 | 6 ++--- lib/libc/sys/ptrace.2 | 12 ++++----- lib/libc/sys/read.2 | 8 +++--- lib/libc/sys/recv.2 | 18 +++++++------- lib/libc/sys/semctl.2 | 35 +++++++++++++------------- lib/libc/sys/shmctl.2 | 25 ++++++++++--------- lib/libc/sys/sigaltstack.2 | 8 +++--- lib/libc/sys/stat.2 | 34 +++++++++++++------------- lib/libc/sys/statfs.2 | 50 +++++++++++++++++++------------------- lib/libc/sys/swapctl.2 | 12 ++++----- lib/libc/sys/write.2 | 8 +++--- 15 files changed, 143 insertions(+), 141 deletions(-) diff --git a/lib/libc/sys/kbind.2 b/lib/libc/sys/kbind.2 index 63b0e2c10d6..bbb2f49cbe8 100644 --- a/lib/libc/sys/kbind.2 +++ b/lib/libc/sys/kbind.2 @@ -1,4 +1,4 @@ -.\" $OpenBSD: kbind.2,v 1.3 2016/09/01 10:08:03 tedu Exp $ +.\" $OpenBSD: kbind.2,v 1.4 2021/11/21 23:44:55 jan Exp $ .\" .\" Copyright (c) 2015 Philip Guenther .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: September 1 2016 $ +.Dd $Mdocdate: November 21 2021 $ .Dt KBIND 2 .Os .Sh NAME @@ -24,8 +24,8 @@ .In sys/unistd.h .Bd -literal struct __kbind { - void *kb_addr; - size_t kb_size; + void *kb_addr; + size_t kb_size; }; #define KBIND_BLOCK_MAX 2 /* powerpc and sparc64 need 2 blocks */ #define KBIND_DATA_MAX 24 /* sparc64 needs 6, four-byte words */ diff --git a/lib/libc/sys/kqueue.2 b/lib/libc/sys/kqueue.2 index 08cef8fdc1f..7d69a2d420f 100644 --- a/lib/libc/sys/kqueue.2 +++ b/lib/libc/sys/kqueue.2 @@ -1,4 +1,4 @@ -.\" $OpenBSD: kqueue.2,v 1.44 2021/04/22 15:30:12 visa Exp $ +.\" $OpenBSD: kqueue.2,v 1.45 2021/11/21 23:44:55 jan Exp $ .\" .\" Copyright (c) 2000 Jonathan Lemon .\" All rights reserved. @@ -26,7 +26,7 @@ .\" .\" $FreeBSD: src/lib/libc/sys/kqueue.2,v 1.18 2001/02/14 08:48:35 guido Exp $ .\" -.Dd $Mdocdate: April 22 2021 $ +.Dd $Mdocdate: November 21 2021 $ .Dt KQUEUE 2 .Os .Sh NAME @@ -141,11 +141,11 @@ The structure is defined as: .Bd -literal struct kevent { - uintptr_t ident; /* identifier for this event */ - short filter; /* filter for event */ - u_short flags; /* action flags for kqueue */ - u_int fflags; /* filter flag value */ - int64_t data; /* filter data value */ + uintptr_t ident; /* identifier for this event */ + short filter; /* filter for event */ + u_short flags; /* action flags for kqueue */ + u_int fflags; /* filter flag value */ + int64_t data; /* filter data value */ void *udata; /* opaque user data identifier */ }; .Ed diff --git a/lib/libc/sys/ktrace.2 b/lib/libc/sys/ktrace.2 index 65344ac56cf..63d4173668a 100644 --- a/lib/libc/sys/ktrace.2 +++ b/lib/libc/sys/ktrace.2 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ktrace.2,v 1.38 2021/09/01 15:51:45 deraadt Exp $ +.\" $OpenBSD: ktrace.2,v 1.39 2021/11/21 23:44:55 jan Exp $ .\" $NetBSD: ktrace.2,v 1.2 1995/02/27 12:33:58 cgd Exp $ .\" .\" Copyright (c) 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)ktrace.2 8.1 (Berkeley) 6/4/93 .\" -.Dd $Mdocdate: September 1 2021 $ +.Dd $Mdocdate: November 21 2021 $ .Dt KTRACE 2 .Os .Sh NAME @@ -136,12 +136,12 @@ followed by a trace point specific structure. The generic header is: .Bd -literal struct ktr_header { - uint ktr_type; /* trace record type */ - pid_t ktr_pid; /* process id */ - pid_t ktr_tid; /* thread id */ - struct timespec ktr_time; /* timestamp */ - char ktr_comm[MAXCOMLEN+1]; /* command name */ - size_t ktr_len; /* length of buf */ + uint ktr_type; /* trace record type */ + pid_t ktr_pid; /* process id */ + pid_t ktr_tid; /* thread id */ + struct timespec ktr_time; /* timestamp */ + char ktr_comm[MAXCOMLEN+1]; /* command name */ + size_t ktr_len; /* length of buf */ }; .Ed .Pp diff --git a/lib/libc/sys/nfssvc.2 b/lib/libc/sys/nfssvc.2 index 68fe1c1ab79..c4a6b82f337 100644 --- a/lib/libc/sys/nfssvc.2 +++ b/lib/libc/sys/nfssvc.2 @@ -1,4 +1,4 @@ -.\" $OpenBSD: nfssvc.2,v 1.23 2015/05/31 23:54:25 schwarze Exp $ +.\" $OpenBSD: nfssvc.2,v 1.24 2021/11/21 23:44:55 jan Exp $ .\" $NetBSD: nfssvc.2,v 1.6 1995/02/27 12:35:08 cgd Exp $ .\" .\" Copyright (c) 1989, 1991, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)nfssvc.2 8.1 (Berkeley) 6/9/93 .\" -.Dd $Mdocdate: May 31 2015 $ +.Dd $Mdocdate: November 21 2021 $ .Dt NFSSVC 2 .Os .Sh NAME @@ -63,16 +63,16 @@ is called with the flag and a pointer to a structure: .Bd -literal struct nfsd_srvargs { - struct nfsd *nsd_nfsd; /* Pointer to in kernel nfsd struct */ - uid_t nsd_uid; /* Effective uid mapped to cred */ - u_int32_t nsd_haddr; /* IP address of client */ - struct xucred nsd_cr; /* Cred. uid maps to */ - int nsd_authlen; /* Length of auth string (ret) */ - u_char *nsd_authstr; /* Auth string (ret) */ - int nsd_verflen; /* and the verifier */ - u_char *nsd_verfstr; - struct timeval nsd_timestamp; /* timestamp from verifier */ - u_int32_t nsd_ttl; /* credential ttl (sec) */ + struct nfsd *nsd_nfsd; /* Pointer to in kernel nfsd struct */ + uid_t nsd_uid; /* Effective uid mapped to cred */ + u_int32_t nsd_haddr; /* IP address of client */ + struct xucred nsd_cr; /* Cred. uid maps to */ + int nsd_authlen; /* Length of auth string (ret) */ + u_char *nsd_authstr; /* Auth string (ret) */ + int nsd_verflen; /* and the verifier */ + u_char *nsd_verfstr; + struct timeval nsd_timestamp; /* timestamp from verifier */ + u_int32_t nsd_ttl; /* credential ttl (sec) */ }; .Ed .Pp @@ -87,9 +87,9 @@ with the flag and a pointer to a structure: .Bd -literal struct nfsd_args { - int sock; /* Socket to serve */ - caddr_t name; /* Client address for connection based sockets */ - int namelen; /* Length of name */ + int sock; /* Socket to serve */ + caddr_t name; /* Client address for connection based sockets */ + int namelen; /* Length of name */ }; .Ed .Sh RETURN VALUES diff --git a/lib/libc/sys/poll.2 b/lib/libc/sys/poll.2 index aff63f6aef1..edaa375c071 100644 --- a/lib/libc/sys/poll.2 +++ b/lib/libc/sys/poll.2 @@ -1,4 +1,4 @@ -.\" $OpenBSD: poll.2,v 1.37 2021/11/16 13:46:16 visa Exp $ +.\" $OpenBSD: poll.2,v 1.38 2021/11/21 23:44:55 jan Exp $ .\" .\" Copyright (c) 1994 Jason R. Thorpe .\" All rights reserved. @@ -28,7 +28,7 @@ .\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" -.Dd $Mdocdate: November 16 2021 $ +.Dd $Mdocdate: November 21 2021 $ .Dt POLL 2 .Os .Sh NAME @@ -65,7 +65,7 @@ Points to an array of structures, which are defined as: .Bd -literal -offset indent struct pollfd { - int fd; + int fd; short events; short revents; }; diff --git a/lib/libc/sys/ptrace.2 b/lib/libc/sys/ptrace.2 index bafb90aee10..55c4448382e 100644 --- a/lib/libc/sys/ptrace.2 +++ b/lib/libc/sys/ptrace.2 @@ -1,8 +1,8 @@ -.\" $OpenBSD: ptrace.2,v 1.40 2021/05/01 16:11:09 visa Exp $ +.\" $OpenBSD: ptrace.2,v 1.41 2021/11/21 23:44:55 jan Exp $ .\" $NetBSD: ptrace.2,v 1.3 1996/02/23 01:39:41 jtc Exp $ .\" .\" This file is in the public domain. -.Dd $Mdocdate: May 1 2021 $ +.Dd $Mdocdate: November 21 2021 $ .Dt PTRACE 2 .Os .Sh NAME @@ -191,10 +191,10 @@ The I/O request is encoded in a defined as: .Bd -literal -offset indent struct ptrace_io_desc { - int piod_op; - void *piod_offs; - void *piod_addr; - size_t piod_len; + int piod_op; + void *piod_offs; + void *piod_addr; + size_t piod_len; }; .Ed .Pp diff --git a/lib/libc/sys/read.2 b/lib/libc/sys/read.2 index eac151ff92a..c60f84abce3 100644 --- a/lib/libc/sys/read.2 +++ b/lib/libc/sys/read.2 @@ -1,4 +1,4 @@ -.\" $OpenBSD: read.2,v 1.37 2020/02/11 13:19:17 schwarze Exp $ +.\" $OpenBSD: read.2,v 1.38 2021/11/21 23:44:55 jan Exp $ .\" $NetBSD: read.2,v 1.6 1995/02/27 12:35:47 cgd Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)read.2 8.4 (Berkeley) 2/26/94 .\" -.Dd $Mdocdate: February 11 2020 $ +.Dd $Mdocdate: November 21 2021 $ .Dt READ 2 .Os .Sh NAME @@ -83,8 +83,8 @@ the structure is defined as: .Bd -literal -offset indent struct iovec { - void *iov_base; - size_t iov_len; + void *iov_base; + size_t iov_len; }; .Ed .Pp diff --git a/lib/libc/sys/recv.2 b/lib/libc/sys/recv.2 index b332bbc8169..9d327e9723e 100644 --- a/lib/libc/sys/recv.2 +++ b/lib/libc/sys/recv.2 @@ -1,4 +1,4 @@ -.\" $OpenBSD: recv.2,v 1.47 2019/01/11 06:10:13 jsg Exp $ +.\" $OpenBSD: recv.2,v 1.48 2021/11/21 23:44:55 jan Exp $ .\" $NetBSD: recv.2,v 1.6 1995/02/27 12:36:08 cgd Exp $ .\" .\" Copyright (c) 1983, 1990, 1991, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)recv.2 8.3 (Berkeley) 2/21/94 .\" -.Dd $Mdocdate: January 11 2019 $ +.Dd $Mdocdate: November 21 2021 $ .Dt RECV 2 .Os .Sh NAME @@ -170,13 +170,13 @@ This structure has the following form, as defined in .In sys/socket.h : .Bd -literal struct msghdr { - void *msg_name; /* optional address */ - socklen_t msg_namelen; /* size of address */ - struct iovec *msg_iov; /* scatter/gather array */ - unsigned int msg_iovlen; /* # elements in msg_iov */ - void *msg_control; /* ancillary data, see below */ - socklen_t msg_controllen; /* ancillary data buffer len */ - int msg_flags; /* flags on received message */ + void *msg_name; /* optional address */ + socklen_t msg_namelen; /* size of address */ + struct iovec *msg_iov; /* scatter/gather array */ + unsigned int msg_iovlen; /* # elements in msg_iov */ + void *msg_control; /* ancillary data, see below */ + socklen_t msg_controllen; /* ancillary data buffer len */ + int msg_flags; /* flags on received message */ }; .Ed .Pp diff --git a/lib/libc/sys/semctl.2 b/lib/libc/sys/semctl.2 index 0f7a62f465c..63121717e0c 100644 --- a/lib/libc/sys/semctl.2 +++ b/lib/libc/sys/semctl.2 @@ -1,4 +1,4 @@ -.\" $OpenBSD: semctl.2,v 1.17 2021/10/23 21:17:45 jmc Exp $ +.\" $OpenBSD: semctl.2,v 1.18 2021/11/21 23:44:55 jan Exp $ .\" $NetBSD: semctl.2,v 1.2 1997/03/27 08:20:40 mikel Exp $ .\" .\" Copyright (c) 1995 Frank van der Linden @@ -30,7 +30,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\"/ -.Dd $Mdocdate: October 23 2021 $ +.Dd $Mdocdate: November 21 2021 $ .Dt SEMCTL 2 .Os .Sh NAME @@ -54,9 +54,9 @@ The operation to be performed is specified in .Fa arg is a union of the following fields: .Bd -literal - int val; /* value for SETVAL */ - struct semid_ds *buf; /* buffer for IPC_{STAT,SET} */ - u_short *array; /* array for GETALL & SETALL */ + int val; /* value for SETVAL */ + struct semid_ds *buf; /* buffer for IPC_{STAT,SET} */ + u_short *array; /* array for GETALL & SETALL */ .Ed .Pp The @@ -71,11 +71,11 @@ commands is defined as follows in .In sys/sem.h : .Bd -literal struct semid_ds { - struct ipc_perm sem_perm; /* operation permissions */ - struct sem *sem_base; /* semaphore set */ - u_short sem_nsems; /* number of sems in set */ - time_t sem_otime; /* last operation time */ - time_t sem_ctime; /* last change time */ + struct ipc_perm sem_perm; /* operation permissions */ + struct sem *sem_base; /* semaphore set */ + u_short sem_nsems; /* number of sems in set */ + time_t sem_otime; /* last operation time */ + time_t sem_ctime; /* last change time */ }; .Ed .Pp @@ -92,13 +92,14 @@ structure is defined in and looks like this: .Bd -literal struct ipc_perm { - uid_t cuid; /* creator user id */ - gid_t cgid; /* creator group id */ - uid_t uid; /* user id */ - gid_t gid; /* group id */ - mode_t mode; /* r/w permission (see chmod(2)) */ - u_short seq; /* sequence # (to generate unique msg/sem/shm id) */ - key_t key; /* user specified msg/sem/shm key */ + uid_t cuid; /* creator user id */ + gid_t cgid; /* creator group id */ + uid_t uid; /* user id */ + gid_t gid; /* group id */ + mode_t mode; /* r/w permission (see chmod(2)) */ + u_short seq; /* sequence # */ + /* (to generate unique msg/sem/shm id) */ + key_t key; /* user specified msg/sem/shm key */ }; .Ed .Pp diff --git a/lib/libc/sys/shmctl.2 b/lib/libc/sys/shmctl.2 index 7469610f2fb..8cd89414137 100644 --- a/lib/libc/sys/shmctl.2 +++ b/lib/libc/sys/shmctl.2 @@ -1,4 +1,4 @@ -.\" $OpenBSD: shmctl.2,v 1.18 2021/10/23 21:17:45 jmc Exp $ +.\" $OpenBSD: shmctl.2,v 1.19 2021/11/21 23:44:55 jan Exp $ .\" $NetBSD: shmctl.2,v 1.3 1997/03/27 08:20:39 mikel Exp $ .\" .\" Copyright (c) 1995 Frank van der Linden @@ -30,7 +30,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\"/ -.Dd $Mdocdate: October 23 2021 $ +.Dd $Mdocdate: November 21 2021 $ .Dt SHMCTL 2 .Os .Sh NAME @@ -57,15 +57,15 @@ This structure is defined as follows in .In sys/shm.h : .Bd -literal struct shmid_ds { - struct ipc_perm shm_perm; /* operation permissions */ - int shm_segsz; /* size of segment in bytes */ - pid_t shm_lpid; /* pid of last shm op */ - pid_t shm_cpid; /* pid of creator */ - short shm_nattch; /* # of current attaches */ - time_t shm_atime; /* last shmat() time*/ - time_t shm_dtime; /* last shmdt() time */ - time_t shm_ctime; /* last change by shmctl() */ - void *shm_internal; /* sysv stupidity */ + struct ipc_perm shm_perm; /* operation permissions */ + int shm_segsz; /* size of segment in bytes */ + pid_t shm_lpid; /* pid of last shm op */ + pid_t shm_cpid; /* pid of creator */ + short shm_nattch; /* # of current attaches */ + time_t shm_atime; /* last shmat() time*/ + time_t shm_dtime; /* last shmdt() time */ + time_t shm_ctime; /* last change by shmctl() */ + void *shm_internal; /* sysv stupidity */ }; .Ed .Pp @@ -87,7 +87,8 @@ struct ipc_perm { uid_t uid; /* user id */ gid_t gid; /* group id */ mode_t mode; /* r/w permission (see chmod(2)) */ - u_short seq; /* sequence # (to generate unique msg/sem/shm id) */ + u_short seq; /* sequence # */ + /* (to generate unique msg/sem/shm id) */ key_t key; /* user specified msg/sem/shm key */ }; .Ed diff --git a/lib/libc/sys/sigaltstack.2 b/lib/libc/sys/sigaltstack.2 index 55854991fe4..2b6ce203287 100644 --- a/lib/libc/sys/sigaltstack.2 +++ b/lib/libc/sys/sigaltstack.2 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sigaltstack.2,v 1.23 2018/04/22 13:23:46 deraadt Exp $ +.\" $OpenBSD: sigaltstack.2,v 1.24 2021/11/21 23:44:55 jan Exp $ .\" $NetBSD: sigaltstack.2,v 1.3 1995/02/27 10:41:52 cgd Exp $ .\" .\" Copyright (c) 1983, 1991, 1992, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)sigaltstack.2 8.1 (Berkeley) 6/4/93 .\" -.Dd $Mdocdate: April 22 2018 $ +.Dd $Mdocdate: November 21 2021 $ .Dt SIGALTSTACK 2 .Os .Sh NAME @@ -41,8 +41,8 @@ .Bd -literal typedef struct sigaltstack { void *ss_sp; - size_t ss_size; - int ss_flags; + size_t ss_size; + int ss_flags; } stack_t; .Ed .Ft int diff --git a/lib/libc/sys/stat.2 b/lib/libc/sys/stat.2 index d9adb368652..0d7d62a8368 100644 --- a/lib/libc/sys/stat.2 +++ b/lib/libc/sys/stat.2 @@ -1,4 +1,4 @@ -.\" $OpenBSD: stat.2,v 1.48 2021/01/03 18:10:27 rob Exp $ +.\" $OpenBSD: stat.2,v 1.49 2021/11/21 23:44:55 jan Exp $ .\" .\" Copyright (c) 1980, 1991, 1993, 1994 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)stat.2 8.3 (Berkeley) 4/19/94 .\" -.Dd $Mdocdate: January 3 2021 $ +.Dd $Mdocdate: November 21 2021 $ .Dt STAT 2 .Os .Sh NAME @@ -137,21 +137,21 @@ as defined by and into which information is placed concerning the file. .Bd -literal struct stat { - dev_t st_dev; /* inode's device */ - ino_t st_ino; /* inode's number */ - mode_t st_mode; /* inode protection mode */ - nlink_t st_nlink; /* number of hard links */ - uid_t st_uid; /* user ID of the file's owner */ - gid_t st_gid; /* group ID of the file's group */ - dev_t st_rdev; /* device type */ - struct timespec st_atim; /* time of last access */ - struct timespec st_mtim; /* time of last data modification */ - struct timespec st_ctim; /* time of last file status change */ - off_t st_size; /* file size, in bytes */ - blkcnt_t st_blocks; /* blocks allocated for file */ - blksize_t st_blksize;/* optimal blocksize for I/O */ - u_int32_t st_flags; /* user defined flags for file */ - u_int32_t st_gen; /* file generation number */ + dev_t st_dev; /* inode's device */ + ino_t st_ino; /* inode's number */ + mode_t st_mode; /* inode protection mode */ + nlink_t st_nlink; /* number of hard links */ + uid_t st_uid; /* user ID of the file's owner */ + gid_t st_gid; /* group ID of the file's group */ + dev_t st_rdev; /* device type */ + struct timespec st_atim; /* time of last access */ + struct timespec st_mtim; /* time of last data modification */ + struct timespec st_ctim; /* time of last file status change */ + off_t st_size; /* file size, in bytes */ + blkcnt_t st_blocks; /* blocks allocated for file */ + blksize_t st_blksize; /* optimal blocksize for I/O */ + u_int32_t st_flags; /* user defined flags for file */ + u_int32_t st_gen; /* file generation number */ }; .Ed .Pp diff --git a/lib/libc/sys/statfs.2 b/lib/libc/sys/statfs.2 index f3f2b95db9b..1530b5c4404 100644 --- a/lib/libc/sys/statfs.2 +++ b/lib/libc/sys/statfs.2 @@ -1,4 +1,4 @@ -.\" $OpenBSD: statfs.2,v 1.27 2021/01/03 18:10:27 rob Exp $ +.\" $OpenBSD: statfs.2,v 1.28 2021/11/21 23:44:55 jan Exp $ .\" $NetBSD: statfs.2,v 1.10 1995/06/29 11:40:48 cgd Exp $ .\" .\" Copyright (c) 1989, 1991, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)statfs.2 8.3 (Berkeley) 2/11/94 .\" -.Dd $Mdocdate: January 3 2021 $ +.Dd $Mdocdate: November 21 2021 $ .Dt STATFS 2 .Os .Sh NAME @@ -60,34 +60,34 @@ typedef struct { int32_t val[2]; } fsid_t; #define MNAMELEN 90 /* length of buffer for returned name */ struct statfs { - u_int32_t f_flags; /* copy of mount flags */ - u_int32_t f_bsize; /* file system block size */ - u_int32_t f_iosize; /* optimal transfer block size */ + u_int32_t f_flags; /* copy of mount flags */ + u_int32_t f_bsize; /* file system block size */ + u_int32_t f_iosize; /* optimal transfer block size */ - /* unit is f_bsize */ - u_int64_t f_blocks; /* total data blocks in file system */ - u_int64_t f_bfree; /* free blocks in fs */ - int64_t f_bavail; /* free blocks avail to non-superuser */ + /* unit is f_bsize */ + u_int64_t f_blocks; /* total data blocks in file system */ + u_int64_t f_bfree; /* free blocks in fs */ + int64_t f_bavail; /* free blocks avail to non-superuser */ - u_int64_t f_files; /* total file nodes in file system */ - u_int64_t f_ffree; /* free file nodes in fs */ - int64_t f_favail; /* free file nodes avail to non-root */ + u_int64_t f_files; /* total file nodes in file system */ + u_int64_t f_ffree; /* free file nodes in fs */ + int64_t f_favail; /* free file nodes avail to non-root */ - u_int64_t f_syncwrites; /* count of sync writes since mount */ - u_int64_t f_syncreads; /* count of sync reads since mount */ - u_int64_t f_asyncwrites; /* count of async writes since mount */ - u_int64_t f_asyncreads; /* count of async reads since mount */ + u_int64_t f_syncwrites; /* count of sync writes since mount */ + u_int64_t f_syncreads; /* count of sync reads since mount */ + u_int64_t f_asyncwrites; /* count of async writes since mount */ + u_int64_t f_asyncreads; /* count of async reads since mount */ - fsid_t f_fsid; /* file system id */ - u_int32_t f_namemax; /* maximum filename length */ - uid_t f_owner; /* user that mounted the file system */ - u_int64_t f_ctime; /* last mount [-u] time */ + fsid_t f_fsid; /* file system id */ + u_int32_t f_namemax; /* maximum filename length */ + uid_t f_owner; /* user that mounted the file system */ + u_int64_t f_ctime; /* last mount [-u] time */ - char f_fstypename[MFSNAMELEN]; /* fs type name */ - char f_mntonname[MNAMELEN]; /* directory on which mounted */ - char f_mntfromname[MNAMELEN]; /* mounted file system */ - char f_mntfromspec[MNAMELEN]; /* special for mount request */ - union mount_info mount_info; /* per-filesystem mount options */ + char f_fstypename[MFSNAMELEN]; /* fs type name */ + char f_mntonname[MNAMELEN]; /* directory on which mounted */ + char f_mntfromname[MNAMELEN]; /* mounted file system */ + char f_mntfromspec[MNAMELEN]; /* special for mount request */ + union mount_info mount_info; /* per-filesystem mount options */ }; .Ed .Pp diff --git a/lib/libc/sys/swapctl.2 b/lib/libc/sys/swapctl.2 index 35f4098dc40..2da86fa9887 100644 --- a/lib/libc/sys/swapctl.2 +++ b/lib/libc/sys/swapctl.2 @@ -1,4 +1,4 @@ -.\" $OpenBSD: swapctl.2,v 1.24 2019/04/02 13:07:28 visa Exp $ +.\" $OpenBSD: swapctl.2,v 1.25 2021/11/21 23:44:55 jan Exp $ .\" $NetBSD: swapctl.2,v 1.10 1998/08/29 17:11:09 mrg Exp $ .\" .\" Copyright (c) 1997 Matthew R. Green @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: April 2 2019 $ +.Dd $Mdocdate: November 21 2021 $ .Dt SWAPCTL 2 .Os .Sh NAME @@ -98,10 +98,10 @@ struct swapent { .Pp The flags are defined as .Bd -literal - SWF_INUSE in use: we have swapped here - SWF_ENABLE enabled: we can swap here - SWF_BUSY busy: I/O happening here - SWF_FAKE fake: still being built + SWF_INUSE in use: we have swapped here + SWF_ENABLE enabled: we can swap here + SWF_BUSY busy: I/O happening here + SWF_FAKE fake: still being built .Ed .Pp All but diff --git a/lib/libc/sys/write.2 b/lib/libc/sys/write.2 index 0114ced2dbd..35376a13518 100644 --- a/lib/libc/sys/write.2 +++ b/lib/libc/sys/write.2 @@ -1,4 +1,4 @@ -.\" $OpenBSD: write.2,v 1.42 2019/09/06 19:25:08 schwarze Exp $ +.\" $OpenBSD: write.2,v 1.43 2021/11/21 23:44:55 jan Exp $ .\" $NetBSD: write.2,v 1.6 1995/02/27 12:39:43 cgd Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)write.2 8.5 (Berkeley) 4/2/94 .\" -.Dd $Mdocdate: September 6 2019 $ +.Dd $Mdocdate: November 21 2021 $ .Dt WRITE 2 .Os .Sh NAME @@ -83,8 +83,8 @@ the structure is defined as: .Bd -literal -offset indent struct iovec { - void *iov_base; - size_t iov_len; + void *iov_base; + size_t iov_len; }; .Ed .Pp -- 2.20.1