From 6648b8cede12bffb36e7260cfcf022cf2315acf1 Mon Sep 17 00:00:00 2001 From: mdf Date: Wed, 19 Jan 2011 17:04:07 +0000 Subject: sysctl(8) should use the CTLTYPE to determine the type of data when reading. (This was already done for writing to a sysctl). This requires all SYSCTL setups to specify a type. Most of them are now checked at compile-time. Remove SYSCTL_*X* sysctl additions as the print being in hex should be controlled by the -x flag to sysctl(8). Succested by: bde --- share/man/man9/Makefile | 4 ++-- share/man/man9/sysctl.9 | 7 ------- 2 files changed, 2 insertions(+), 9 deletions(-) (limited to 'share') diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 3985b87..6366b1f 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -1193,8 +1193,7 @@ MLINKS+=sysctl.9 SYSCTL_DECL.9 \ sysctl.9 SYSCTL_STRUCT.9 \ sysctl.9 SYSCTL_UINT.9 \ sysctl.9 SYSCTL_ULONG.9 \ - sysctl.9 SYSCTL_XINT.9 \ - sysctl.9 SYSCTL_XLONG.9 + sysctl.9 SYSCTL_QUAD.9 MLINKS+=sysctl_add_oid.9 SYSCTL_ADD_INT.9 \ sysctl_add_oid.9 SYSCTL_ADD_LONG.9 \ sysctl_add_oid.9 SYSCTL_ADD_NODE.9 \ @@ -1205,6 +1204,7 @@ MLINKS+=sysctl_add_oid.9 SYSCTL_ADD_INT.9 \ sysctl_add_oid.9 SYSCTL_ADD_STRUCT.9 \ sysctl_add_oid.9 SYSCTL_ADD_UINT.9 \ sysctl_add_oid.9 SYSCTL_ADD_ULONG.9 \ + sysctl_add_oid.9 SYSCTL_ADD_QUAD.9 \ sysctl_add_oid.9 SYSCTL_CHILDREN.9 \ sysctl_add_oid.9 sysctl_move_oid.9 \ sysctl_add_oid.9 sysctl_remove_oid.9 \ diff --git a/share/man/man9/sysctl.9 b/share/man/man9/sysctl.9 index ff2b938..172b6df 100644 --- a/share/man/man9/sysctl.9 +++ b/share/man/man9/sysctl.9 @@ -39,8 +39,6 @@ .Nm SYSCTL_STRUCT , .Nm SYSCTL_UINT , .Nm SYSCTL_ULONG , -.Nm SYSCTL_XINT , -.Nm SYSCTL_XLONG , .Nm SYSCTL_QUAD .Nd Static sysctl declaration functions .Sh SYNOPSIS @@ -56,8 +54,6 @@ .Fn SYSCTL_STRUCT parent nbr name access ptr type descr .Fn SYSCTL_UINT parent nbr name access ptr val descr .Fn SYSCTL_ULONG parent nbr name access ptr val descr -.Fn SYSCTL_XINT parent nbr name access ptr val descr -.Fn SYSCTL_XLONG parent nbr name access ptr val descr .Fn SYSCTL_QUAD parent nbr name access ptr val descr .Sh DESCRIPTION The @@ -84,8 +80,6 @@ New nodes are declared using one of .Fn SYSCTL_STRUCT , .Fn SYSCTL_UINT , .Fn SYSCTL_ULONG , -.Fn SYSCTL_XINT , -.Fn SYSCTL_XLONG , and .Fn SYSCTL_QUAD . Each macro accepts a parent name, as declared using @@ -206,7 +200,6 @@ Examples of integer, opaque, string, and procedure sysctls follow: * Example of a constant integer value. Notice that the control * flags are CTLFLAG_RD, the variable pointer is NULL, and the * value is declared. - * If sysctl(8) should print this value in hex, use 'SYSCTL_XINT'. */ SYSCTL_INT(_debug_sizeof, OID_AUTO, bio, CTLFLAG_RD, NULL, sizeof(struct bio), "sizeof(struct bio)"); -- cgit v1.1