Specify a CTLTYPE_FOO so that a future sysctl(8) change does not need
to rely on the format string.
This commit is contained in:
parent
79c3d51b86
commit
2fee06f087
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=217555
@ -2145,5 +2145,5 @@ sysctl_kern_function_list(SYSCTL_HANDLER_ARGS)
|
||||
return (SYSCTL_OUT(req, "", 1));
|
||||
}
|
||||
|
||||
SYSCTL_PROC(_kern, OID_AUTO, function_list, CTLFLAG_RD,
|
||||
SYSCTL_PROC(_kern, OID_AUTO, function_list, CTLTYPE_OPAQUE | CTLFLAG_RD,
|
||||
NULL, 0, sysctl_kern_function_list, "", "kernel function list");
|
||||
|
@ -876,7 +876,8 @@ sysctl_sysctl_name2oid(SYSCTL_HANDLER_ARGS)
|
||||
return (error);
|
||||
}
|
||||
|
||||
SYSCTL_PROC(_sysctl, 3, name2oid, CTLFLAG_RW|CTLFLAG_ANYBODY|CTLFLAG_MPSAFE,
|
||||
SYSCTL_PROC(_sysctl, 3, name2oid,
|
||||
CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_ANYBODY | CTLFLAG_MPSAFE,
|
||||
0, 0, sysctl_sysctl_name2oid, "I", "");
|
||||
|
||||
static int
|
||||
|
@ -226,7 +226,7 @@ devclass_sysctl_init(devclass_t dc)
|
||||
SYSCTL_STATIC_CHILDREN(_dev), OID_AUTO, dc->name,
|
||||
CTLFLAG_RD, NULL, "");
|
||||
SYSCTL_ADD_PROC(&dc->sysctl_ctx, SYSCTL_CHILDREN(dc->sysctl_tree),
|
||||
OID_AUTO, "%parent", CTLFLAG_RD,
|
||||
OID_AUTO, "%parent", CTLTYPE_STRING | CTLFLAG_RD,
|
||||
dc, DEVCLASS_SYSCTL_PARENT, devclass_sysctl_handler, "A",
|
||||
"parent class");
|
||||
}
|
||||
@ -289,23 +289,23 @@ device_sysctl_init(device_t dev)
|
||||
dev->nameunit + strlen(dc->name),
|
||||
CTLFLAG_RD, NULL, "");
|
||||
SYSCTL_ADD_PROC(&dev->sysctl_ctx, SYSCTL_CHILDREN(dev->sysctl_tree),
|
||||
OID_AUTO, "%desc", CTLFLAG_RD,
|
||||
OID_AUTO, "%desc", CTLTYPE_STRING | CTLFLAG_RD,
|
||||
dev, DEVICE_SYSCTL_DESC, device_sysctl_handler, "A",
|
||||
"device description");
|
||||
SYSCTL_ADD_PROC(&dev->sysctl_ctx, SYSCTL_CHILDREN(dev->sysctl_tree),
|
||||
OID_AUTO, "%driver", CTLFLAG_RD,
|
||||
OID_AUTO, "%driver", CTLTYPE_STRING | CTLFLAG_RD,
|
||||
dev, DEVICE_SYSCTL_DRIVER, device_sysctl_handler, "A",
|
||||
"device driver name");
|
||||
SYSCTL_ADD_PROC(&dev->sysctl_ctx, SYSCTL_CHILDREN(dev->sysctl_tree),
|
||||
OID_AUTO, "%location", CTLFLAG_RD,
|
||||
OID_AUTO, "%location", CTLTYPE_STRING | CTLFLAG_RD,
|
||||
dev, DEVICE_SYSCTL_LOCATION, device_sysctl_handler, "A",
|
||||
"device location relative to parent");
|
||||
SYSCTL_ADD_PROC(&dev->sysctl_ctx, SYSCTL_CHILDREN(dev->sysctl_tree),
|
||||
OID_AUTO, "%pnpinfo", CTLFLAG_RD,
|
||||
OID_AUTO, "%pnpinfo", CTLTYPE_STRING | CTLFLAG_RD,
|
||||
dev, DEVICE_SYSCTL_PNPINFO, device_sysctl_handler, "A",
|
||||
"device identification");
|
||||
SYSCTL_ADD_PROC(&dev->sysctl_ctx, SYSCTL_CHILDREN(dev->sysctl_tree),
|
||||
OID_AUTO, "%parent", CTLFLAG_RD,
|
||||
OID_AUTO, "%parent", CTLTYPE_STRING | CTLFLAG_RD,
|
||||
dev, DEVICE_SYSCTL_PARENT, device_sysctl_handler, "A",
|
||||
"parent device");
|
||||
}
|
||||
|
@ -1284,7 +1284,7 @@ SYSCTL_INT(_kern_ipc, OID_AUTO, msgssz, CTLFLAG_RDTUN, &msginfo.msgssz, 0,
|
||||
"Size of a message segment");
|
||||
SYSCTL_INT(_kern_ipc, OID_AUTO, msgseg, CTLFLAG_RDTUN, &msginfo.msgseg, 0,
|
||||
"Number of message segments");
|
||||
SYSCTL_PROC(_kern_ipc, OID_AUTO, msqids, CTLFLAG_RD,
|
||||
SYSCTL_PROC(_kern_ipc, OID_AUTO, msqids, CTLTYPE_OPAQUE | CTLFLAG_RD,
|
||||
NULL, 0, sysctl_msqids, "", "Message queue IDs");
|
||||
|
||||
#ifdef COMPAT_FREEBSD32
|
||||
|
@ -211,7 +211,7 @@ SYSCTL_INT(_kern_ipc, OID_AUTO, semvmx, CTLFLAG_RW, &seminfo.semvmx, 0,
|
||||
"Semaphore maximum value");
|
||||
SYSCTL_INT(_kern_ipc, OID_AUTO, semaem, CTLFLAG_RW, &seminfo.semaem, 0,
|
||||
"Adjust on exit max value");
|
||||
SYSCTL_PROC(_kern_ipc, OID_AUTO, sema, CTLFLAG_RD,
|
||||
SYSCTL_PROC(_kern_ipc, OID_AUTO, sema, CTLTYPE_OPAQUE | CTLFLAG_RD,
|
||||
NULL, 0, sysctl_sema, "", "Semaphore id pool");
|
||||
|
||||
static struct syscall_helper_data sem_syscalls[] = {
|
||||
|
@ -177,7 +177,7 @@ SYSCTL_INT(_kern_ipc, OID_AUTO, shm_use_phys, CTLFLAG_RW,
|
||||
SYSCTL_INT(_kern_ipc, OID_AUTO, shm_allow_removed, CTLFLAG_RW,
|
||||
&shm_allow_removed, 0,
|
||||
"Enable/Disable attachment to attached segments marked for removal");
|
||||
SYSCTL_PROC(_kern_ipc, OID_AUTO, shmsegs, CTLFLAG_RD,
|
||||
SYSCTL_PROC(_kern_ipc, OID_AUTO, shmsegs, CTLTYPE_OPAQUE | CTLFLAG_RD,
|
||||
NULL, 0, sysctl_shmsegs, "",
|
||||
"Current number of shared memory segments allocated");
|
||||
|
||||
|
@ -1601,15 +1601,16 @@ unp_pcblist(SYSCTL_HANDLER_ARGS)
|
||||
return (error);
|
||||
}
|
||||
|
||||
SYSCTL_PROC(_net_local_dgram, OID_AUTO, pcblist, CTLFLAG_RD,
|
||||
(caddr_t)(long)SOCK_DGRAM, 0, unp_pcblist, "S,xunpcb",
|
||||
"List of active local datagram sockets");
|
||||
SYSCTL_PROC(_net_local_stream, OID_AUTO, pcblist, CTLFLAG_RD,
|
||||
(caddr_t)(long)SOCK_STREAM, 0, unp_pcblist, "S,xunpcb",
|
||||
"List of active local stream sockets");
|
||||
SYSCTL_PROC(_net_local_seqpacket, OID_AUTO, pcblist, CTLFLAG_RD,
|
||||
(caddr_t)(long)SOCK_SEQPACKET, 0, unp_pcblist, "S,xunpcb",
|
||||
"List of active local seqpacket sockets");
|
||||
SYSCTL_PROC(_net_local_dgram, OID_AUTO, pcblist, CTLTYPE_OPAQUE | CTLFLAG_RD,
|
||||
(void *)(intptr_t)SOCK_DGRAM, 0, unp_pcblist, "S,xunpcb",
|
||||
"List of active local datagram sockets");
|
||||
SYSCTL_PROC(_net_local_stream, OID_AUTO, pcblist, CTLTYPE_OPAQUE | CTLFLAG_RD,
|
||||
(void *)(intptr_t)SOCK_STREAM, 0, unp_pcblist, "S,xunpcb",
|
||||
"List of active local stream sockets");
|
||||
SYSCTL_PROC(_net_local_seqpacket, OID_AUTO, pcblist,
|
||||
CTLTYPE_OPAQUE | CTLFLAG_RD,
|
||||
(void *)(intptr_t)SOCK_SEQPACKET, 0, unp_pcblist, "S,xunpcb",
|
||||
"List of active local seqpacket sockets");
|
||||
|
||||
static void
|
||||
unp_shutdown(struct unpcb *unp)
|
||||
|
@ -2998,7 +2998,8 @@ sysctl_vfs_conflist(SYSCTL_HANDLER_ARGS)
|
||||
return (error);
|
||||
}
|
||||
|
||||
SYSCTL_PROC(_vfs, OID_AUTO, conflist, CTLFLAG_RD, NULL, 0, sysctl_vfs_conflist,
|
||||
SYSCTL_PROC(_vfs, OID_AUTO, conflist, CTLTYPE_OPAQUE | CTLFLAG_RD,
|
||||
NULL, 0, sysctl_vfs_conflist,
|
||||
"S,xvfsconf", "List of all configured filesystems");
|
||||
|
||||
#ifndef BURN_BRIDGES
|
||||
@ -4160,7 +4161,8 @@ sysctl_vfs_ctl(SYSCTL_HANDLER_ARGS)
|
||||
return (error);
|
||||
}
|
||||
|
||||
SYSCTL_PROC(_vfs, OID_AUTO, ctl, CTLFLAG_WR, NULL, 0, sysctl_vfs_ctl, "",
|
||||
SYSCTL_PROC(_vfs, OID_AUTO, ctl, CTLTYPE_OPAQUE | CTLFLAG_WR,
|
||||
NULL, 0, sysctl_vfs_ctl, "",
|
||||
"Sysctl by fsid");
|
||||
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user