svn commit: r358334 - head/sys/sys

[Paweł Biernacki]

 Approved by:	kib (mentor, blanket)

> On 26 Feb 2020, at 16:12, Pawel Biernacki <kaktus at FreeBSD.org> wrote:
> 
> Author: kaktus
> Date: Wed Feb 26 15:12:38 2020
> New Revision: 358334
> URL: https://svnweb.freebsd.org/changeset/base/358334
> 
> Log:
>  Move the SYSCTL_ENFORCE_FLAGS to SYSCTL_NODE_WITH_LABEL where it should be
>  at the beginning.
> 
> Modified:
>  head/sys/sys/sysctl.h
> 
> Modified: head/sys/sys/sysctl.h
> ==============================================================================
> --- head/sys/sys/sysctl.h	Wed Feb 26 14:26:36 2020	(r358333)
> +++ head/sys/sys/sysctl.h	Wed Feb 26 15:12:38 2020	(r358334)
> @@ -324,7 +324,6 @@ TAILQ_HEAD(sysctl_ctx_list, sysctl_ctx_entry);
> 	SYSCTL_OID_RAW(sysctl___##name, &sysctl__children,	\
> 	    nbr, #name, CTLTYPE_NODE|(access), NULL, 0,		\
> 	    handler, "N", descr, NULL);				\
> -	SYSCTL_ENFORCE_FLAGS(access);				\
> 	CTASSERT(((access) & CTLTYPE) == 0 ||			\
> 	    ((access) & SYSCTL_CT_ASSERT_MASK) == CTLTYPE_NODE)
> 
> @@ -335,6 +334,7 @@ TAILQ_HEAD(sysctl_ctx_list, sysctl_ctx_entry);
> #define	SYSCTL_NODE_WITH_LABEL(parent, nbr, name, access, handler, descr, label) \
> 	SYSCTL_OID_GLOBAL(parent, nbr, name, CTLTYPE_NODE|(access),	\
> 	    NULL, 0, handler, "N", descr, label);			\
> +	SYSCTL_ENFORCE_FLAGS(access);					\
> 	CTASSERT(((access) & CTLTYPE) == 0 ||				\
> 	    ((access) & SYSCTL_CT_ASSERT_MASK) == CTLTYPE_NODE)
>