diff options
| author |   guenther <guenther@openbsd.org> | 2019-11-28 04:34:50 +0000 |
|---|---|---|
| committer | guenther <guenther@openbsd.org> | 2019-11-28 04:34:50 +0000 |
| commit | 7818322eb05cabaecb756e1d7290e9c05176c3e4 (patch) | |
| tree | 84184e13f7b452bce0f2c6874b4b2cdd311e3045 | |
| parent | Usage on excessive select, delete, download, start, stop, panic arguments (diff) | |
| download | wireguard-openbsd-7818322eb05cabaecb756e1d7290e9c05176c3e4.tar.xz wireguard-openbsd-7818322eb05cabaecb756e1d7290e9c05176c3e4.zip | |
struct execsw's es_emul is no longer used, so delete it
ok deraadt@
| -rw-r--r-- | sys/kern/exec_conf.c | 6 | ||||
| -rw-r--r-- | sys/sys/exec.h | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sys/kern/exec_conf.c b/sys/kern/exec_conf.c index 20465504c31..43b0ebb9c12 100644 --- a/sys/kern/exec_conf.c +++ b/sys/kern/exec_conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_conf.c,v 1.35 2017/02/08 05:09:25 guenther Exp $ */ +/* $OpenBSD: exec_conf.c,v 1.36 2019/11/28 04:34:50 guenther Exp $ */ /* $NetBSD: exec_conf.c,v 1.16 1995/12/09 05:34:47 cgd Exp $ */ /* @@ -39,8 +39,8 @@ extern struct emul emul_native; struct execsw execsw[] = { - { EXEC_SCRIPT_HDRSZ, exec_script_makecmds, &emul_native, }, /* shell scripts */ - { sizeof(Elf_Ehdr), exec_elf_makecmds, &emul_native }, /* elf binaries */ + { EXEC_SCRIPT_HDRSZ, exec_script_makecmds }, /* shell scripts */ + { sizeof(Elf_Ehdr), exec_elf_makecmds }, /* elf binaries */ }; int nexecs = (sizeof execsw / sizeof(*execsw)); int exec_maxhdrsz; diff --git a/sys/sys/exec.h b/sys/sys/exec.h index b7e413cadde..77e1066e136 100644 --- a/sys/sys/exec.h +++ b/sys/sys/exec.h @@ -1,4 +1,4 @@ -/* $OpenBSD: exec.h,v 1.38 2018/06/01 03:27:59 mortimer Exp $ */ +/* $OpenBSD: exec.h,v 1.39 2019/11/28 04:34:50 guenther Exp $ */ /* $NetBSD: exec.h,v 1.59 1996/02/09 18:25:09 christos Exp $ */ /*- @@ -84,7 +84,6 @@ typedef int (*exec_makecmds_fcn)(struct proc *, struct exec_package *); struct execsw { u_int es_hdrsz; /* size of header for this format */ exec_makecmds_fcn es_check; /* function to check exec format */ - struct emul *es_emul; /* emulation */ }; struct exec_vmcmd { |