summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authored <ed@FreeBSD.org>2012-02-12 18:29:56 +0000
committered <ed@FreeBSD.org>2012-02-12 18:29:56 +0000
commit23524b572c9490078007a68a1760546e22a8184d (patch)
treeac73d0fee5bb41748009d87a44b179ab6b7d87bc /lib
parentf5c5ba680655abbc307ee2fa88397fc168cbdcad (diff)
downloadFreeBSD-src-23524b572c9490078007a68a1760546e22a8184d.zip
FreeBSD-src-23524b572c9490078007a68a1760546e22a8184d.tar.gz
Globally replace u_int*_t from (non-contributed) man pages.
The reasoning behind this, is that if we are consistent in our documentation about the uint*_t stuff, people will be less tempted to write new code that uses the non-standard types. I am not going to bump the man page dates, as these changes can be considered style nits. The meaning of the man pages is unaffected. MFC after: 1 month
Diffstat (limited to 'lib')
-rw-r--r--lib/libc/db/man/hash.32
-rw-r--r--lib/libc/gen/arc4random.36
-rw-r--r--lib/libc/net/nsdispatch.32
-rw-r--r--lib/libc/rpc/rpc.312
-rw-r--r--lib/libc/rpc/rpc_clnt_create.38
-rw-r--r--lib/libc/sys/getdirentries.28
-rw-r--r--lib/libc/sys/jail.22
-rw-r--r--lib/libc/sys/nfssvc.24
-rw-r--r--lib/libcam/cam.320
-rw-r--r--lib/libcam/cam_cdbparse.318
-rw-r--r--lib/libdevstat/devstat.318
-rw-r--r--lib/libradius/libradius.38
12 files changed, 54 insertions, 54 deletions
diff --git a/lib/libc/db/man/hash.3 b/lib/libc/db/man/hash.3
index 133885d..a2a8bca 100644
--- a/lib/libc/db/man/hash.3
+++ b/lib/libc/db/man/hash.3
@@ -65,7 +65,7 @@ typedef struct {
u_int ffactor;
u_int nelem;
u_int cachesize;
- u_int32_t (*hash)(const void *, size_t);
+ uint32_t (*hash)(const void *, size_t);
int lorder;
} HASHINFO;
.Ed
diff --git a/lib/libc/gen/arc4random.3 b/lib/libc/gen/arc4random.3
index be1f690..e1124c6 100644
--- a/lib/libc/gen/arc4random.3
+++ b/lib/libc/gen/arc4random.3
@@ -44,12 +44,12 @@
.Lb libc
.Sh SYNOPSIS
.In stdlib.h
-.Ft u_int32_t
+.Ft uint32_t
.Fn arc4random "void"
.Ft void
.Fn arc4random_buf "void *buf" "size_t nbytes"
-.Ft u_int32_t
-.Fn arc4random_uniform "u_int32_t upper_bound"
+.Ft uint32_t
+.Fn arc4random_uniform "uint32_t upper_bound"
.Ft void
.Fn arc4random_stir "void"
.Ft void
diff --git a/lib/libc/net/nsdispatch.3 b/lib/libc/net/nsdispatch.3
index d1d8d5a..2fd9ec9 100644
--- a/lib/libc/net/nsdispatch.3
+++ b/lib/libc/net/nsdispatch.3
@@ -129,7 +129,7 @@ structures, which have the following format:
.Bd -literal -offset indent
typedef struct _ns_src {
const char *src;
- u_int32_t flags;
+ uint32_t flags;
} ns_src;
.Ed
.Bd -ragged -offset indent
diff --git a/lib/libc/rpc/rpc.3 b/lib/libc/rpc/rpc.3
index 81a24ca..4fa3e2c 100644
--- a/lib/libc/rpc/rpc.3
+++ b/lib/libc/rpc/rpc.3
@@ -119,12 +119,12 @@ file.
.Sh Derived Types
The derived types used in the RPC interfaces are defined as follows:
.Bd -literal
- typedef u_int32_t rpcprog_t;
- typedef u_int32_t rpcvers_t;
- typedef u_int32_t rpcproc_t;
- typedef u_int32_t rpcprot_t;
- typedef u_int32_t rpcport_t;
- typedef int32_t rpc_inline_t;
+ typedef uint32_t rpcprog_t;
+ typedef uint32_t rpcvers_t;
+ typedef uint32_t rpcproc_t;
+ typedef uint32_t rpcprot_t;
+ typedef uint32_t rpcport_t;
+ typedef int32_t rpc_inline_t;
.Ed
.Sh "Data Structures"
Some of the data structures used by the
diff --git a/lib/libc/rpc/rpc_clnt_create.3 b/lib/libc/rpc/rpc_clnt_create.3
index 34c90ed..079c9eb 100644
--- a/lib/libc/rpc/rpc_clnt_create.3
+++ b/lib/libc/rpc/rpc_clnt_create.3
@@ -106,10 +106,10 @@ Set the timeout argument to 0 for batching calls.
.It Dv CLGET_FD Ta "int *" Ta "get fd from handle"
.It Dv CLSET_FD_CLOSE Ta "void" Ta "close fd on destroy"
.It Dv CLSET_FD_NCLOSE Ta void Ta "do not close fd on destroy"
-.It Dv CLGET_VERS Ta "u_int32_t *" Ta "get RPC program version"
-.It Dv CLSET_VERS Ta "u_int32_t *" Ta "set RPC program version"
-.It Dv CLGET_XID Ta "u_int32_t *" Ta "get XID of previous call"
-.It Dv CLSET_XID Ta "u_int32_t *" Ta "set XID of next call"
+.It Dv CLGET_VERS Ta "uint32_t *" Ta "get RPC program version"
+.It Dv CLSET_VERS Ta "uint32_t *" Ta "set RPC program version"
+.It Dv CLGET_XID Ta "uint32_t *" Ta "get XID of previous call"
+.It Dv CLSET_XID Ta "uint32_t *" Ta "set XID of next call"
.El
.Pp
The following operations are valid for connectionless transports only:
diff --git a/lib/libc/sys/getdirentries.2 b/lib/libc/sys/getdirentries.2
index e16e7f2..3fe1632 100644
--- a/lib/libc/sys/getdirentries.2
+++ b/lib/libc/sys/getdirentries.2
@@ -71,10 +71,10 @@ The data in the buffer is a series of
.Vt dirent
structures each containing the following entries:
.Bd -literal -offset indent
-u_int32_t d_fileno;
-u_int16_t d_reclen;
-u_int8_t d_type;
-u_int8_t d_namlen;
+uint32_t d_fileno;
+uint16_t d_reclen;
+uint8_t d_type;
+uint8_t d_namlen;
char d_name[MAXNAMELEN + 1]; /* see below */
.Ed
.Pp
diff --git a/lib/libc/sys/jail.2 b/lib/libc/sys/jail.2
index 119cd61..7e7ec13 100644
--- a/lib/libc/sys/jail.2
+++ b/lib/libc/sys/jail.2
@@ -59,7 +59,7 @@ system call sets up a jail and locks the current process in it.
The argument is a pointer to a structure describing the prison:
.Bd -literal -offset indent
struct jail {
- u_int32_t version;
+ uint32_t version;
char *path;
char *hostname;
char *jailname;
diff --git a/lib/libc/sys/nfssvc.2 b/lib/libc/sys/nfssvc.2
index cf52187..f816231 100644
--- a/lib/libc/sys/nfssvc.2
+++ b/lib/libc/sys/nfssvc.2
@@ -143,14 +143,14 @@ and a pointer to a
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 */
+ uint32_t nsd_haddr; /* Ip address of client */
struct ucred 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) */
+ uint32_t nsd_ttl; /* credential ttl (sec) */
NFSKERBKEY_T nsd_key; /* Session key */
};
.Ed
diff --git a/lib/libcam/cam.3 b/lib/libcam/cam.3
index c11d8fd..4f918d2 100644
--- a/lib/libcam/cam.3
+++ b/lib/libcam/cam.3
@@ -145,7 +145,7 @@ struct cam_device {
* Device name given by
* the user.
*/
- u_int32_t given_unit_number; /*
+ uint32_t given_unit_number; /*
* Unit number given by
* the user.
*/
@@ -153,7 +153,7 @@ struct cam_device {
* Name of the device,
* e.g. 'pass'
*/
- u_int32_t dev_unit_num; /* Unit number of the passthrough
+ uint32_t dev_unit_num; /* Unit number of the passthrough
* device associated with this
* particular device.
*/
@@ -161,18 +161,18 @@ struct cam_device {
char sim_name[SIM_IDLEN+1];/*
* Controller name, e.g.'ahc'
*/
- u_int32_t sim_unit_number; /* Controller unit number */
- u_int32_t bus_id; /* Controller bus number */
+ uint32_t sim_unit_number; /* Controller unit number */
+ uint32_t bus_id; /* Controller bus number */
lun_id_t target_lun; /* Logical Unit Number */
target_id_t target_id; /* Target ID */
path_id_t path_id; /* System SCSI bus number */
- u_int16_t pd_type; /* type of peripheral device */
+ uint16_t pd_type; /* type of peripheral device */
struct scsi_inquiry_data inq_data; /* SCSI Inquiry data */
- u_int8_t serial_num[252]; /* device serial number */
- u_int8_t serial_num_len; /* length of the serial number */
- u_int8_t sync_period; /* Negotiated sync period */
- u_int8_t sync_offset; /* Negotiated sync offset */
- u_int8_t bus_width; /* Negotiated bus width */
+ uint8_t serial_num[252]; /* device serial number */
+ uint8_t serial_num_len; /* length of the serial number */
+ uint8_t sync_period; /* Negotiated sync period */
+ uint8_t sync_offset; /* Negotiated sync offset */
+ uint8_t bus_width; /* Negotiated bus width */
int fd; /* file descriptor for device */
};
.Ed
diff --git a/lib/libcam/cam_cdbparse.3 b/lib/libcam/cam_cdbparse.3
index 0dfa6c8..d0f267f 100644
--- a/lib/libcam/cam_cdbparse.3
+++ b/lib/libcam/cam_cdbparse.3
@@ -83,9 +83,9 @@
.Ft int
.Fo csio_build
.Fa "struct ccb_scsiio *csio"
-.Fa "u_int8_t *data_ptr"
-.Fa "u_int32_t dxfer_len"
-.Fa "u_int32_t flags"
+.Fa "uint8_t *data_ptr"
+.Fa "uint32_t dxfer_len"
+.Fa "uint32_t flags"
.Fa "int retry_count"
.Fa "int timeout"
.Fa "const char *cmd_spec"
@@ -94,9 +94,9 @@
.Ft int
.Fo csio_build_visit
.Fa "struct ccb_scsiio *csio"
-.Fa "u_int8_t *data_ptr"
-.Fa "u_int32_t dxfer_len"
-.Fa "u_int32_t flags"
+.Fa "uint8_t *data_ptr"
+.Fa "uint32_t dxfer_len"
+.Fa "uint32_t flags"
.Fa "int retry_count"
.Fa "int timeout"
.Fa "const char *cmd_spec"
@@ -122,14 +122,14 @@
.Fc
.Ft int
.Fo buff_decode
-.Fa "u_int8_t *buff"
+.Fa "uint8_t *buff"
.Fa "size_t len"
.Fa "const char *fmt"
.Fa "..."
.Fc
.Ft int
.Fo buff_decode_visit
-.Fa "u_int8_t *buff"
+.Fa "uint8_t *buff"
.Fa "size_t len"
.Fa "const char *fmt"
.Fa "void (*arg_put)(void *, int, void *, int, char *)"
@@ -150,7 +150,7 @@
.Fc
.Ft int
.Fo buff_encode_visit
-.Fa "u_int8_t *buff"
+.Fa "uint8_t *buff"
.Fa "size_t len"
.Fa "const char *fmt"
.Fa "int (*arg_get)(void *hook, char *field_name)"
diff --git a/lib/libdevstat/devstat.3 b/lib/libdevstat/devstat.3
index fb82146..8d0ce4d 100644
--- a/lib/libdevstat/devstat.3
+++ b/lib/libdevstat/devstat.3
@@ -193,7 +193,7 @@ subelement contains the following elements:
.Bd -literal -offset indent
struct devinfo {
struct devstat *devices;
- u_int8_t *mem_ptr;
+ uint8_t *mem_ptr;
long generation;
int numdevs;
};
@@ -472,7 +472,7 @@ structure to calculate statistics over
For each statistics to be calculated, the user should supply the proper
enumerated type (listed below), and a variable of the indicated type.
All statistics are either integer values, for which a
-.Vt u_int64_t
+.Vt uint64_t
is used,
or floating point, for which a
.Vt "long double"
@@ -489,7 +489,7 @@ be the last argument passed to
It is an argument list terminator.
.It Dv DSM_TOTAL_BYTES
type:
-.Vt "u_int64_t *"
+.Vt "uint64_t *"
.Pp
The total number of bytes transferred between the acquisition of
.Fa previous
@@ -499,7 +499,7 @@ and
.It Dv DSM_TOTAL_BYTES_WRITE
.It Dv DSM_TOTAL_BYTES_FREE
type:
-.Vt "u_int64_t *"
+.Vt "uint64_t *"
.Pp
The total number of bytes in transactions of the specified type
between the acquisition of
@@ -508,7 +508,7 @@ and
.Fa current .
.It Dv DSM_TOTAL_TRANSFERS
type:
-.Vt "u_int64_t *"
+.Vt "uint64_t *"
.Pp
The total number of transfers between the acquisition of
.Fa previous
@@ -519,7 +519,7 @@ and
.It Dv DSM_TOTAL_TRANSFERS_WRITE
.It Dv DSM_TOTAL_TRANSFERS_FREE
type:
-.Vt "u_int64_t *"
+.Vt "uint64_t *"
.Pp
The total number of transactions of the specified type between
the acquisition of
@@ -528,7 +528,7 @@ and
.Fa current .
.It Dv DSM_TOTAL_BLOCKS
type:
-.Vt "u_int64_t *"
+.Vt "uint64_t *"
.Pp
The total number of blocks transferred between the acquisition of
.Fa previous
@@ -541,7 +541,7 @@ blocksize of 512 bytes will be used in the calculation.
.It Dv DSM_TOTAL_BLOCKS_WRITE
.It Dv DSM_TOTAL_BLOCKS_FREE
type:
-.Vt "u_int64_t *"
+.Vt "uint64_t *"
.Pp
The total number of blocks of the specified type between the acquisition of
.Fa previous
@@ -665,7 +665,7 @@ and
.Fa current .
.It Dv DSM_QUEUE_LENGTH
type:
-.Vt "u_int64_t *"
+.Vt "uint64_t *"
.Pp
The number of not yet completed transactions at the time when
.Fa current
diff --git a/lib/libradius/libradius.3 b/lib/libradius/libradius.3
index dca38ca..da60d52 100644
--- a/lib/libradius/libradius.3
+++ b/lib/libradius/libradius.3
@@ -51,14 +51,14 @@
.Fn rad_create_response "struct rad_handle *h" "int code"
.Ft "struct in_addr"
.Fn rad_cvt_addr "const void *data"
-.Ft u_int32_t
+.Ft uint32_t
.Fn rad_cvt_int "const void *data"
.Ft char *
.Fn rad_cvt_string "const void *data" "size_t len"
.Ft int
.Fn rad_get_attr "struct rad_handle *h" "const void **data" "size_t *len"
.Ft int
-.Fn rad_get_vendor_attr "u_int32_t *vendor" "const void **data" "size_t *len"
+.Fn rad_get_vendor_attr "uint32_t *vendor" "const void **data" "size_t *len"
.Ft int
.Fn rad_init_send_request "struct rad_handle *h" "int *fd" "struct timeval *tv"
.Ft int
@@ -66,7 +66,7 @@
.Ft int
.Fn rad_put_attr "struct rad_handle *h" "int type" "const void *data" "size_t len"
.Ft int
-.Fn rad_put_int "struct rad_handle *h" "int type" "u_int32_t value"
+.Fn rad_put_int "struct rad_handle *h" "int type" "uint32_t value"
.Ft int
.Fn rad_put_string "struct rad_handle *h" "int type" "const char *str"
.Ft int
@@ -76,7 +76,7 @@
.Ft int
.Fn rad_put_vendor_attr "struct rad_handle *h" "int vendor" "int type" "const void *data" "size_t len"
.Ft int
-.Fn rad_put_vendor_int "struct rad_handle *h" "int vendor" "int type" "u_int32_t value"
+.Fn rad_put_vendor_int "struct rad_handle *h" "int vendor" "int type" "uint32_t value"
.Ft int
.Fn rad_put_vendor_string "struct rad_handle *h" "int vendor" "int type" "const char *str"
.Ft ssize_t
OpenPOWER on IntegriCloud