Module Name: src
Committed By: martin
Date: Fri May 16 12:22:32 UTC 2014
Modified Files:
src/lib/libc/gen: sysctl.c sysctlgetmibinfo.c
src/sbin/sysctl: sysctl.c
src/sys/compat/linux/common: linux_sysctl.c
src/sys/compat/linux32/common: linux32_sysctl.c
src/sys/compat/netbsd32: netbsd32_sysctl.c
src/sys/kern: kern_sysctl.c
Log Message:
Get rid of all sysc_init_field uses - initialize fields directly in C99
notation.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/lib/libc/gen/sysctl.c
cvs rdiff -u -r1.10 -r1.11 src/lib/libc/gen/sysctlgetmibinfo.c
cvs rdiff -u -r1.152 -r1.153 src/sbin/sysctl/sysctl.c
cvs rdiff -u -r1.42 -r1.43 src/sys/compat/linux/common/linux_sysctl.c
cvs rdiff -u -r1.15 -r1.16 src/sys/compat/linux32/common/linux32_sysctl.c
cvs rdiff -u -r1.33 -r1.34 src/sys/compat/netbsd32/netbsd32_sysctl.c
cvs rdiff -u -r1.249 -r1.250 src/sys/kern/kern_sysctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gen/sysctl.c
diff -u src/lib/libc/gen/sysctl.c:1.33 src/lib/libc/gen/sysctl.c:1.34
--- src/lib/libc/gen/sysctl.c:1.33 Fri May 16 09:41:42 2014
+++ src/lib/libc/gen/sysctl.c Fri May 16 12:22:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sysctl.c,v 1.33 2014/05/16 09:41:42 martin Exp $ */
+/* $NetBSD: sysctl.c,v 1.34 2014/05/16 12:22:32 martin Exp $ */
/*-
* Copyright (c) 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)sysctl.c 8.2 (Berkeley) 1/4/94";
#else
-__RCSID("$NetBSD: sysctl.c,v 1.33 2014/05/16 09:41:42 martin Exp $");
+__RCSID("$NetBSD: sysctl.c,v 1.34 2014/05/16 12:22:32 martin Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -109,11 +109,11 @@ user_sysctl(const int *name, unsigned in
#define _INT(s, n, v, d) { \
.sysctl_flags = CTLFLAG_IMMEDIATE|CTLFLAG_PERMANENT| \
CTLTYPE_INT|SYSCTL_VERSION, \
- sysc_init_field(_sysctl_size, sizeof(int)), \
+ .sysctl_size = sizeof(int), \
.sysctl_name = (s), \
.sysctl_num = (n), \
- .sysctl_un = { .scu_idata = (v), }, \
- sysc_init_field(_sysctl_desc, (d)), \
+ .sysctl_un.scu_idata = (v), \
+ .sysctl_desc = (d), \
}
/*
@@ -129,22 +129,11 @@ user_sysctl(const int *name, unsigned in
{
.sysctl_flags = SYSCTL_VERSION|CTLFLAG_PERMANENT|
CTLTYPE_STRING,
- sysc_init_field(_sysctl_size, sizeof(_PATH_STDPATH)),
+ .sysctl_size = sizeof(_PATH_STDPATH),
.sysctl_name = "cs_path",
.sysctl_num = USER_CS_PATH,
- /*
- * XXX these nasty initializers (and the one in
- * the _INT() macro) can go away once all ports
- * are using gcc3, and become
- *
- * .sysctl_data = _PATH_STDPATH,
- * .sysctl_desc = NULL,
- */
- .sysctl_un = { .scu_data = {
- sysc_init_field(_sud_data,
- __UNCONST(_PATH_STDPATH)),
- }, },
- sysc_init_field(_sysctl_desc,
+ .sysctl_data = __UNCONST(_PATH_STDPATH),
+ .sysctl_desc = __UNCONST(
"A value for the PATH environment variable "
"that finds all the standard utilities"),
},
Index: src/lib/libc/gen/sysctlgetmibinfo.c
diff -u src/lib/libc/gen/sysctlgetmibinfo.c:1.10 src/lib/libc/gen/sysctlgetmibinfo.c:1.11
--- src/lib/libc/gen/sysctlgetmibinfo.c:1.10 Tue Mar 13 21:13:37 2012
+++ src/lib/libc/gen/sysctlgetmibinfo.c Fri May 16 12:22:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sysctlgetmibinfo.c,v 1.10 2012/03/13 21:13:37 christos Exp $ */
+/* $NetBSD: sysctlgetmibinfo.c,v 1.11 2014/05/16 12:22:32 martin Exp $ */
/*-
* Copyright (c) 2003,2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sysctlgetmibinfo.c,v 1.10 2012/03/13 21:13:37 christos Exp $");
+__RCSID("$NetBSD: sysctlgetmibinfo.c,v 1.11 2014/05/16 12:22:32 martin Exp $");
#endif /* LIBC_SCCS and not lint */
#ifndef RUMP_ACTION
@@ -71,7 +71,7 @@ static struct sysctlnode sysctl_mibroot
0
#else /* !lint */
.sysctl_flags = SYSCTL_VERSION|CTLFLAG_ROOT|CTLTYPE_NODE,
- sysc_init_field(_sysctl_size, sizeof(struct sysctlnode)),
+ .sysctl_size = sizeof(struct sysctlnode),
.sysctl_name = "(root)",
#endif /* !lint */
};
Index: src/sbin/sysctl/sysctl.c
diff -u src/sbin/sysctl/sysctl.c:1.152 src/sbin/sysctl/sysctl.c:1.153
--- src/sbin/sysctl/sysctl.c:1.152 Fri May 16 08:59:24 2014
+++ src/sbin/sysctl/sysctl.c Fri May 16 12:22:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sysctl.c,v 1.152 2014/05/16 08:59:24 martin Exp $ */
+/* $NetBSD: sysctl.c,v 1.153 2014/05/16 12:22:32 martin Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@ __COPYRIGHT("@(#) Copyright (c) 1993\
#if 0
static char sccsid[] = "@(#)sysctl.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: sysctl.c,v 1.152 2014/05/16 08:59:24 martin Exp $");
+__RCSID("$NetBSD: sysctl.c,v 1.153 2014/05/16 12:22:32 martin Exp $");
#endif
#endif /* not lint */
@@ -242,7 +242,7 @@ static const struct handlespec {
struct sysctlnode my_root = {
.sysctl_flags = SYSCTL_VERSION|CTLFLAG_ROOT|CTLTYPE_NODE,
- sysc_init_field(_sysctl_size, sizeof(struct sysctlnode)),
+ .sysctl_size = sizeof(struct sysctlnode),
.sysctl_num = 0,
.sysctl_name = "(prog_root)",
};
Index: src/sys/compat/linux/common/linux_sysctl.c
diff -u src/sys/compat/linux/common/linux_sysctl.c:1.42 src/sys/compat/linux/common/linux_sysctl.c:1.43
--- src/sys/compat/linux/common/linux_sysctl.c:1.42 Tue Feb 25 18:30:09 2014
+++ src/sys/compat/linux/common/linux_sysctl.c Fri May 16 12:22:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_sysctl.c,v 1.42 2014/02/25 18:30:09 pooka Exp $ */
+/* $NetBSD: linux_sysctl.c,v 1.43 2014/05/16 12:22:32 martin Exp $ */
/*-
* Copyright (c) 2003, 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sysctl.c,v 1.42 2014/02/25 18:30:09 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sysctl.c,v 1.43 2014/05/16 12:22:32 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -65,7 +65,7 @@ struct sysctlnode linux_sysctl_root = {
CTLFLAG_ROOT|CTLTYPE_NODE|CTLFLAG_READWRITE,
.sysctl_num = 0,
.sysctl_name = "(linux_root)",
- sysc_init_field(_sysctl_size, sizeof(struct sysctlnode)),
+ .sysctl_size = sizeof(struct sysctlnode),
};
static struct sysctllog *linux_clog1;
Index: src/sys/compat/linux32/common/linux32_sysctl.c
diff -u src/sys/compat/linux32/common/linux32_sysctl.c:1.15 src/sys/compat/linux32/common/linux32_sysctl.c:1.16
--- src/sys/compat/linux32/common/linux32_sysctl.c:1.15 Tue Feb 25 18:30:09 2014
+++ src/sys/compat/linux32/common/linux32_sysctl.c Fri May 16 12:22:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: linux32_sysctl.c,v 1.15 2014/02/25 18:30:09 pooka Exp $ */
+/* $NetBSD: linux32_sysctl.c,v 1.16 2014/05/16 12:22:32 martin Exp $ */
/*-
* Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved.
@@ -31,7 +31,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_sysctl.c,v 1.15 2014/02/25 18:30:09 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_sysctl.c,v 1.16 2014/05/16 12:22:32 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -65,7 +65,7 @@ struct sysctlnode linux32_sysctl_root =
CTLFLAG_ROOT|CTLTYPE_NODE|CTLFLAG_READWRITE,
.sysctl_num = 0,
.sysctl_name = "(linux32_root)",
- sysc_init_field(_sysctl_size, sizeof(struct sysctlnode)),
+ .sysctl_size = sizeof(struct sysctlnode),
};
static struct sysctllog *linux32_clog1;
Index: src/sys/compat/netbsd32/netbsd32_sysctl.c
diff -u src/sys/compat/netbsd32/netbsd32_sysctl.c:1.33 src/sys/compat/netbsd32/netbsd32_sysctl.c:1.34
--- src/sys/compat/netbsd32/netbsd32_sysctl.c:1.33 Fri Jan 20 14:08:07 2012
+++ src/sys/compat/netbsd32/netbsd32_sysctl.c Fri May 16 12:22:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_sysctl.c,v 1.33 2012/01/20 14:08:07 joerg Exp $ */
+/* $NetBSD: netbsd32_sysctl.c,v 1.34 2014/05/16 12:22:32 martin Exp $ */
/*
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysctl.c,v 1.33 2012/01/20 14:08:07 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysctl.c,v 1.34 2014/05/16 12:22:32 martin Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ddb.h"
@@ -67,7 +67,7 @@ struct sysctlnode netbsd32_sysctl_root =
.sysctl_flags = SYSCTL_VERSION|CTLFLAG_ROOT|CTLTYPE_NODE,
.sysctl_num = 0,
.sysctl_name = "(netbsd32_root)",
- sysc_init_field(_sysctl_size, sizeof(struct sysctlnode)),
+ .sysctl_size = sizeof(struct sysctlnode),
};
static struct sysctllog *netbsd32_clog;
Index: src/sys/kern/kern_sysctl.c
diff -u src/sys/kern/kern_sysctl.c:1.249 src/sys/kern/kern_sysctl.c:1.250
--- src/sys/kern/kern_sysctl.c:1.249 Thu Mar 27 21:09:33 2014
+++ src/sys/kern/kern_sysctl.c Fri May 16 12:22:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sysctl.c,v 1.249 2014/03/27 21:09:33 christos Exp $ */
+/* $NetBSD: kern_sysctl.c,v 1.250 2014/05/16 12:22:32 martin Exp $ */
/*-
* Copyright (c) 2003, 2007, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.249 2014/03/27 21:09:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.250 2014/05/16 12:22:32 martin Exp $");
#include "opt_defcorename.h"
#include "ksyms.h"
@@ -123,13 +123,7 @@ struct sysctlnode sysctl_root = {
CTLFLAG_ROOT|CTLFLAG_READWRITE|
CTLTYPE_NODE,
.sysctl_num = 0,
- /*
- * XXX once all ports are on gcc3, we can get rid of this
- * ugliness and simply make it into
- *
- * .sysctl_size = sizeof(struct sysctlnode),
- */
- sysc_init_field(_sysctl_size, sizeof(struct sysctlnode)),
+ .sysctl_size = sizeof(struct sysctlnode),
.sysctl_name = "(root)",
};
