Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys remove use of gcc syntax for designated initialisers whe...
details: https://anonhg.NetBSD.org/src/rev/1fa638926770
branches: trunk
changeset: 509879:1fa638926770
user: lukem <lukem%NetBSD.org@localhost>
date: Tue May 15 02:00:12 2001 +0000
description:
remove use of gcc syntax for designated initialisers when initialising
unions `union_elem: ...', and use c99 syntax `.union_elem = ...' only
where necessary.
in this case, there's no need to tag elf_probe_func because that's the
first union element, and therefore, the implicit case. only specifically
mention ecoff_probe_func where necessary.
if we decide to not use this c99 feature for now, at least there's now
less stuff to rip out.
diffstat:
sys/kern/exec_conf.c | 28 ++++++++++++++--------------
sys/lkm/exec/freebsd_elf/lkminit_exec.c | 4 ++--
sys/lkm/exec/ibcs2_elf/lkminit_exec.c | 4 ++--
sys/lkm/exec/linux_elf/lkminit_exec.c | 4 ++--
sys/lkm/exec/netbsd32_elf/lkminit_exec.c | 4 ++--
sys/lkm/exec/osf1_ecoff/lkminit_exec.c | 4 ++--
sys/lkm/exec/svr4_elf/lkminit_exec.c | 4 ++--
sys/lkm/exec/ultrix_ecoff/lkminit_exec.c | 4 ++--
8 files changed, 28 insertions(+), 28 deletions(-)
diffs (238 lines):
diff -r 7a4d582ddac4 -r 1fa638926770 sys/kern/exec_conf.c
--- a/sys/kern/exec_conf.c Mon May 14 23:45:39 2001 +0000
+++ b/sys/kern/exec_conf.c Tue May 15 02:00:12 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_conf.c,v 1.55 2001/03/03 01:46:04 eeh Exp $ */
+/* $NetBSD: exec_conf.c,v 1.56 2001/05/15 02:00:12 lukem Exp $ */
/*
* Copyright (c) 1993, 1994 Christopher G. Demetriou
@@ -179,19 +179,19 @@
#ifdef EXEC_ECOFF
#ifdef COMPAT_OSF1
{ ECOFF_HDR_SIZE, exec_ecoff_makecmds,
- { ecoff_probe_func: osf1_exec_ecoff_probe },
+ { .ecoff_probe_func = osf1_exec_ecoff_probe },
&emul_osf1, EXECSW_PRIO_ANY,
howmany(OSF1_MAX_AUX_ENTRIES * sizeof (struct osf1_auxv) +
2 * (MAXPATHLEN + 1), sizeof (char *)), /* exec & loader names */
osf1_copyargs, cpu_exec_ecoff_setregs }, /* OSF1 ecoff binaries */
#endif /* COMPAT_OSF1 */
{ ECOFF_HDR_SIZE, exec_ecoff_makecmds,
- { ecoff_probe_func: cpu_exec_ecoff_probe },
+ { .ecoff_probe_func = cpu_exec_ecoff_probe },
&emul_netbsd, EXECSW_PRIO_ANY,
0, copyargs, cpu_exec_ecoff_setregs }, /* ecoff binaries */
#ifdef COMPAT_ULTRIX
{ ECOFF_HDR_SIZE, exec_ecoff_makecmds,
- { ecoff_probe_func: ultrix_exec_ecoff_probe },
+ { .ecoff_probe_func = ultrix_exec_ecoff_probe },
&emul_ultrix, EXECSW_PRIO_LAST, /* XXX probe func alw. succeeds */
0, copyargs, cpu_exec_ecoff_setregs }, /* Ultrix ecoff binaries */
#endif /* COMPAT_ULTRIX */
@@ -200,48 +200,48 @@
/* 32bit ELF bins */
#ifdef COMPAT_NETBSD32
{ sizeof (Elf32_Ehdr), exec_elf32_makecmds,
- { elf_probe_func: ELF32NAME2(netbsd32,probe) },
+ { ELF32NAME2(netbsd32,probe) },
&emul_netbsd32, EXECSW_PRIO_FIRST,
howmany(ELF_AUX_ENTRIES * sizeof(Aux32Info), sizeof (Elf32_Addr)),
netbsd32_elf32_copyargs, netbsd32_setregs }, /* NetBSD32 32bit ELF bins */
/* This one should go first so it matches instead of netbsd */
#endif
{ sizeof (Elf32_Ehdr), exec_elf32_makecmds,
- { elf_probe_func: ELF32NAME2(netbsd,probe) },
+ { ELF32NAME2(netbsd,probe) },
&emul_netbsd, EXECSW_PRIO_ANY,
howmany(ELF_AUX_ENTRIES * sizeof(Aux32Info), sizeof (Elf32_Addr)),
elf32_copyargs, setregs }, /* NetBSD 32bit ELF bins */
#ifdef COMPAT_FREEBSD
{ sizeof (Elf32_Ehdr), exec_elf32_makecmds,
- { elf_probe_func: ELF32NAME2(freebsd,probe) },
+ { ELF32NAME2(freebsd,probe) },
&emul_freebsd, EXECSW_PRIO_ANY,
FREEBSD_ELF_AUX_ARGSIZ,
elf32_copyargs, freebsd_setregs }, /* FreeBSD 32bit ELF bins (not 64bit safe )*/
#endif
#ifdef COMPAT_LINUX
{ sizeof (Elf32_Ehdr), exec_elf32_makecmds,
- { elf_probe_func: ELF32NAME2(linux,probe) },
+ { ELF32NAME2(linux,probe) },
&emul_linux, EXECSW_PRIO_ANY,
LINUX_ELF_AUX_ARGSIZ,
LINUX_COPYARGS_FUNCTION, setregs }, /* Linux 32bit ELF bins */
#endif
#ifdef COMPAT_SVR4_32
{ sizeof (Elf32_Ehdr), exec_elf32_makecmds,
- { elf_probe_func: ELF32NAME2(svr4_32,probe) },
+ { ELF32NAME2(svr4_32,probe) },
&emul_svr4_32, EXECSW_PRIO_ANY,
SVR4_32_AUX_ARGSIZ,
svr4_32_copyargs, svr4_32_setregs }, /* SVR4 32bit ELF bins (not 64bit safe) */
#endif
#ifdef COMPAT_SVR4
{ sizeof (Elf32_Ehdr), exec_elf32_makecmds,
- { elf_probe_func: ELF32NAME2(svr4,probe) },
+ { ELF32NAME2(svr4,probe) },
&emul_svr4, EXECSW_PRIO_ANY,
SVR4_AUX_ARGSIZ,
svr4_copyargs, svr4_setregs }, /* SVR4 32bit ELF bins (not 64bit safe) */
#endif
#ifdef COMPAT_IBCS2
{ sizeof (Elf32_Ehdr), exec_elf32_makecmds,
- { elf_probe_func: ELF32NAME2(ibcs2,probe) },
+ { ELF32NAME2(ibcs2,probe) },
&emul_ibcs2, EXECSW_PRIO_ANY,
IBCS2_ELF_AUX_ARGSIZ, elf32_copyargs, setregs },
/* SCO 32bit ELF bins (not 64bit safe) */
@@ -254,20 +254,20 @@
#ifdef EXEC_ELF64
/* 64bit ELF bins */
{ sizeof (Elf64_Ehdr), exec_elf64_makecmds,
- { elf_probe_func: ELF64NAME2(netbsd,probe) },
+ { ELF64NAME2(netbsd,probe) },
&emul_netbsd, EXECSW_PRIO_ANY,
howmany(ELF_AUX_ENTRIES * sizeof(Aux64Info), sizeof (Elf64_Addr)),
elf64_copyargs, setregs }, /* NetBSD 64bit ELF bins */
#ifdef COMPAT_LINUX
{ sizeof (Elf64_Ehdr), exec_elf64_makecmds,
- { elf_probe_func: ELF64NAME2(linux,probe) },
+ { ELF64NAME2(linux,probe) },
&emul_linux, EXECSW_PRIO_ANY,
LINUX_ELF_AUX_ARGSIZ,
linux_elf64_copyargs, setregs }, /* Linux 64bit ELF bins */
#endif
#ifdef COMPAT_SVR4
{ sizeof (Elf64_Ehdr), exec_elf64_makecmds,
- { elf_probe_func: ELF64NAME2(svr4,probe) },
+ { ELF64NAME2(svr4,probe) },
&emul_svr4, EXECSW_PRIO_ANY,
SVR4_AUX_ARGSIZ64,
svr4_copyargs64, svr4_setregs }, /* SVR4 64bit ELF bins (not 64bit safe) */
diff -r 7a4d582ddac4 -r 1fa638926770 sys/lkm/exec/freebsd_elf/lkminit_exec.c
--- a/sys/lkm/exec/freebsd_elf/lkminit_exec.c Mon May 14 23:45:39 2001 +0000
+++ b/sys/lkm/exec/freebsd_elf/lkminit_exec.c Tue May 15 02:00:12 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lkminit_exec.c,v 1.2 2000/12/17 21:36:49 jdolecek Exp $ */
+/* $NetBSD: lkminit_exec.c,v 1.3 2001/05/15 02:00:13 lukem Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
static struct execsw exec_freebsd_elf =
{ sizeof (Elf32_Ehdr), exec_elf32_makecmds,
- { elf_probe_func: ELFNAME2(freebsd,probe) },
+ { ELFNAME2(freebsd,probe) },
NULL, EXECSW_PRIO_ANY,
FREEBSD_ELF_AUX_ARGSIZ,
elf32_copyargs, freebsd_setregs }; /* FreeBSD 32bit ELF bins (not 64bit safe )*/
diff -r 7a4d582ddac4 -r 1fa638926770 sys/lkm/exec/ibcs2_elf/lkminit_exec.c
--- a/sys/lkm/exec/ibcs2_elf/lkminit_exec.c Mon May 14 23:45:39 2001 +0000
+++ b/sys/lkm/exec/ibcs2_elf/lkminit_exec.c Tue May 15 02:00:12 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lkminit_exec.c,v 1.1 2000/12/08 23:05:38 jdolecek Exp $ */
+/* $NetBSD: lkminit_exec.c,v 1.2 2001/05/15 02:00:13 lukem Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
static struct execsw exec_ibcs2_elf =
{ sizeof (Elf32_Ehdr), exec_elf32_makecmds,
- { elf_probe_func: ELFNAME2(ibcs2,probe) },
+ { ELFNAME2(ibcs2,probe) },
&emul_ibcs2, EXECSW_PRIO_ANY,
IBCS2_ELF_AUX_ARGSIZ, elf32_copyargs, setregs };
/* SCO 32bit ELF bins (not 64bit safe) */
diff -r 7a4d582ddac4 -r 1fa638926770 sys/lkm/exec/linux_elf/lkminit_exec.c
--- a/sys/lkm/exec/linux_elf/lkminit_exec.c Mon May 14 23:45:39 2001 +0000
+++ b/sys/lkm/exec/linux_elf/lkminit_exec.c Tue May 15 02:00:12 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lkminit_exec.c,v 1.1 2000/12/08 23:05:41 jdolecek Exp $ */
+/* $NetBSD: lkminit_exec.c,v 1.2 2001/05/15 02:00:13 lukem Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
static struct execsw exec_linux_elf =
{ sizeof (Elf_Ehdr), ELFNAME2(exec,makecmds),
- { elf_probe_func: ELFNAME2(linux,probe) },
+ { ELFNAME2(linux,probe) },
NULL, /* will be set by exec_add() */
EXECSW_PRIO_ANY,
LINUX_ELF_AUX_ARGSIZ,
diff -r 7a4d582ddac4 -r 1fa638926770 sys/lkm/exec/netbsd32_elf/lkminit_exec.c
--- a/sys/lkm/exec/netbsd32_elf/lkminit_exec.c Mon May 14 23:45:39 2001 +0000
+++ b/sys/lkm/exec/netbsd32_elf/lkminit_exec.c Tue May 15 02:00:12 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lkminit_exec.c,v 1.1 2000/12/08 23:05:44 jdolecek Exp $ */
+/* $NetBSD: lkminit_exec.c,v 1.2 2001/05/15 02:00:14 lukem Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
static struct execsw exec_netbsd32_elf =
{ sizeof (Elf32_Ehdr), exec_elf32_makecmds,
- { elf_probe_func: ELFNAME2(netbsd32,probe) },
+ { ELFNAME2(netbsd32,probe) },
NULL, EXECSW_PRIO_FIRST,
howmany(ELF_AUX_ENTRIES * sizeof(Aux32Info), sizeof (Elf32_Addr)),
netbsd32_elf32_copyargs, netbsd32_setregs }; /* NetBSD32 32bit ELF bins */
diff -r 7a4d582ddac4 -r 1fa638926770 sys/lkm/exec/osf1_ecoff/lkminit_exec.c
--- a/sys/lkm/exec/osf1_ecoff/lkminit_exec.c Mon May 14 23:45:39 2001 +0000
+++ b/sys/lkm/exec/osf1_ecoff/lkminit_exec.c Tue May 15 02:00:12 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lkminit_exec.c,v 1.1 2000/12/08 23:05:45 jdolecek Exp $ */
+/* $NetBSD: lkminit_exec.c,v 1.2 2001/05/15 02:00:14 lukem Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -51,7 +51,7 @@
static struct execsw exec_osf1_ecoff =
{ ECOFF_HDR_SIZE, exec_ecoff_makecmds,
- { ecoff_probe_func: osf1_exec_ecoff_probe },
+ { .ecoff_probe_func = osf1_exec_ecoff_probe },
NULL, EXECSW_PRIO_ANY,
howmany(OSF1_MAX_AUX_ENTRIES * sizeof (struct osf1_auxv) +
2 * (MAXPATHLEN + 1), sizeof (char *)), /* exec & loader names */
diff -r 7a4d582ddac4 -r 1fa638926770 sys/lkm/exec/svr4_elf/lkminit_exec.c
--- a/sys/lkm/exec/svr4_elf/lkminit_exec.c Mon May 14 23:45:39 2001 +0000
+++ b/sys/lkm/exec/svr4_elf/lkminit_exec.c Tue May 15 02:00:12 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lkminit_exec.c,v 1.1 2000/12/08 23:05:47 jdolecek Exp $ */
+/* $NetBSD: lkminit_exec.c,v 1.2 2001/05/15 02:00:14 lukem Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
static struct execsw exec_svr4_elf =
{ sizeof (Elf_Ehdr), exec_elf32_makecmds,
- { elf_probe_func: ELFNAME2(svr4,probe) },
+ { ELFNAME2(svr4,probe) },
NULL, EXECSW_PRIO_ANY,
SVR4_AUX_ARGSIZ,
svr4_copyargs, svr4_setregs }; /* SVR4 32bit ELF bins (not 64bit safe) */
diff -r 7a4d582ddac4 -r 1fa638926770 sys/lkm/exec/ultrix_ecoff/lkminit_exec.c
--- a/sys/lkm/exec/ultrix_ecoff/lkminit_exec.c Mon May 14 23:45:39 2001 +0000
+++ b/sys/lkm/exec/ultrix_ecoff/lkminit_exec.c Tue May 15 02:00:12 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lkminit_exec.c,v 1.1 2000/12/08 23:05:48 jdolecek Exp $ */
+/* $NetBSD: lkminit_exec.c,v 1.2 2001/05/15 02:00:15 lukem Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
static struct execsw exec_ultrix_ecoff =
{ ECOFF_HDR_SIZE, exec_ecoff_makecmds,
- { ecoff_probe_func: ultrix_exec_ecoff_probe },
+ { .ecoff_probe_func = ultrix_exec_ecoff_probe },
NULL, EXECSW_PRIO_LAST, /* XXX probe func alw. succeeds */
0, copyargs, cpu_exec_ecoff_setregs }; /* Ultrix ecoff binaries */
Home |
Main Index |
Thread Index |
Old Index