[src/trunk]: src/sys Rename es_check in struct execsw to es_makecmds.

[junyoung <junyoung%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ba67f51a95b7
branches:  trunk
changeset: 558302:ba67f51a95b7
user:      junyoung <junyoung%NetBSD.org@localhost>
date:      Fri Feb 06 08:02:58 2004 +0000

description:
Rename es_check in struct execsw to es_makecmds.

diffstat:

 sys/arch/arm/arm/arm_machdep.c |   6 +++---
 sys/compat/ibcs2/ibcs2_exec.c  |   6 +++---
 sys/kern/kern_exec.c           |  12 ++++++------
 sys/sys/exec.h                 |   4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diffs (123 lines):

diff -r f51e2793bd99 -r ba67f51a95b7 sys/arch/arm/arm/arm_machdep.c
--- a/sys/arch/arm/arm/arm_machdep.c    Fri Feb 06 07:47:10 2004 +0000
+++ b/sys/arch/arm/arm/arm_machdep.c    Fri Feb 06 08:02:58 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: arm_machdep.c,v 1.7 2003/10/25 19:44:42 scw Exp $      */
+/*     $NetBSD: arm_machdep.c,v 1.8 2004/02/06 08:02:58 junyoung Exp $ */
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: arm_machdep.c,v 1.7 2003/10/25 19:44:42 scw Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm_machdep.c,v 1.8 2004/02/06 08:02:58 junyoung Exp $");
 
 #include <sys/exec.h>
 #include <sys/proc.h>
@@ -135,7 +135,7 @@
 #endif
 
 #if defined(COMPAT_15) && defined(EXEC_AOUT)
-       if (pack->ep_es->es_check == exec_aout_makecmds)
+       if (pack->ep_es->es_makecmds == exec_aout_makecmds)
                l->l_addr->u_pcb.pcb_flags = PCB_NOALIGNFLT;
        else
 #endif
diff -r f51e2793bd99 -r ba67f51a95b7 sys/compat/ibcs2/ibcs2_exec.c
--- a/sys/compat/ibcs2/ibcs2_exec.c     Fri Feb 06 07:47:10 2004 +0000
+++ b/sys/compat/ibcs2/ibcs2_exec.c     Fri Feb 06 08:02:58 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ibcs2_exec.c,v 1.58 2003/12/20 19:01:30 fvdl Exp $     */
+/*     $NetBSD: ibcs2_exec.c,v 1.59 2004/02/06 08:02:58 junyoung Exp $ */
 
 /*
  * Copyright (c) 1994, 1995, 1998 Scott Bartram
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ibcs2_exec.c,v 1.58 2003/12/20 19:01:30 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibcs2_exec.c,v 1.59 2004/02/06 08:02:58 junyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -112,7 +112,7 @@
        struct proc *p;
        struct exec_package *epp;
 {
-       if (epp->ep_es->es_check == exec_ibcs2_xout_makecmds)
+       if (epp->ep_es->es_makecmds == exec_ibcs2_xout_makecmds)
                p->p_emuldata = IBCS2_EXEC_XENIX;
        else
                p->p_emuldata = IBCS2_EXEC_OTHER;
diff -r f51e2793bd99 -r ba67f51a95b7 sys/kern/kern_exec.c
--- a/sys/kern/kern_exec.c      Fri Feb 06 07:47:10 2004 +0000
+++ b/sys/kern/kern_exec.c      Fri Feb 06 08:02:58 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_exec.c,v 1.181 2004/02/05 22:26:52 christos Exp $ */
+/*     $NetBSD: kern_exec.c,v 1.182 2004/02/06 08:02:59 junyoung Exp $ */
 
 /*-
  * Copyright (C) 1993, 1994, 1996 Christopher G. Demetriou
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.181 2004/02/05 22:26:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.182 2004/02/06 08:02:59 junyoung Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_syscall_debug.h"
@@ -294,12 +294,12 @@
                int newerror;
 
                epp->ep_esch = execsw[i];
-               newerror = (*execsw[i]->es_check)(p, epp);
+               newerror = (*execsw[i]->es_makecmds)(p, epp);
                /* make sure the first "interesting" error code is saved. */
                if (!newerror || error == ENOEXEC)
                        error = newerror;
 
-               /* if es_check call was successful, update epp->ep_es */
+               /* if es_makecmds call was successful, update epp->ep_es */
                if (!newerror && (epp->ep_flags & EXEC_HASES) == 0)
                        epp->ep_es = execsw[i];
 
@@ -1062,7 +1062,7 @@
 
        LIST_FOREACH(it, &ex_head, ex_list) {
                /* assume tuple (makecmds, probe_func, emulation) is unique */
-               if (it->es->es_check == esp->es_check
+               if (it->es->es_makecmds == esp->es_makecmds
                    && it->es->u.elf_probe_func == esp->u.elf_probe_func
                    && it->es->es_emul == esp->es_emul) {
                        error = EEXIST;
@@ -1098,7 +1098,7 @@
 
        LIST_FOREACH(it, &ex_head, ex_list) {
                /* assume tuple (makecmds, probe_func, emulation) is unique */
-               if (it->es->es_check == esp->es_check
+               if (it->es->es_makecmds == esp->es_makecmds
                    && it->es->u.elf_probe_func == esp->u.elf_probe_func
                    && it->es->es_emul == esp->es_emul)
                        break;
diff -r f51e2793bd99 -r ba67f51a95b7 sys/sys/exec.h
--- a/sys/sys/exec.h    Fri Feb 06 07:47:10 2004 +0000
+++ b/sys/sys/exec.h    Fri Feb 06 08:02:58 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: exec.h,v 1.102 2003/12/10 12:06:25 agc Exp $   */
+/*     $NetBSD: exec.h,v 1.103 2004/02/06 08:02:59 junyoung Exp $      */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -141,7 +141,7 @@
 
 struct execsw {
        u_int   es_hdrsz;               /* size of header for this format */
-       exec_makecmds_fcn es_check;     /* function to check exec format */
+       exec_makecmds_fcn es_makecmds;  /* function to setup vmcmds */
        union {                         /* probe function */
                int (*elf_probe_func) __P((struct proc *,
                        struct exec_package *, void *, char *, vaddr_t *));