Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/compat Complete the rename: s/sa_/<compat>_sa_/g
details: https://anonhg.NetBSD.org/src/rev/bc812921abf0
branches: trunk
changeset: 539850:bc812921abf0
user: atatat <atatat%NetBSD.org@localhost>
date: Wed Nov 27 16:44:01 2002 +0000
description:
Complete the rename: s/sa_/<compat>_sa_/g
Also tweak the darwin siginfo stuff to avoid the same type of collision.
diffstat:
sys/compat/darwin/darwin_signal.c | 22 +++++++++---------
sys/compat/darwin/darwin_signal.h | 28 +++++++++++-----------
sys/compat/hpux/hpux.h | 8 +++---
sys/compat/hpux/hpux_sig.c | 30 ++++++++++++------------
sys/compat/netbsd32/netbsd32.h | 8 +++---
sys/compat/netbsd32/netbsd32_signal.c | 40 ++++++++++++++++----------------
sys/compat/osf1/osf1.h | 10 ++++----
sys/compat/osf1/osf1_cvt.c | 16 ++++++------
sys/compat/svr4_32/svr4_32_signal.c | 42 +++++++++++++++++-----------------
sys/compat/svr4_32/svr4_32_signal.h | 10 ++++----
10 files changed, 107 insertions(+), 107 deletions(-)
diffs (truncated from 494 to 300 lines):
diff -r e15bb4f8ff1d -r bc812921abf0 sys/compat/darwin/darwin_signal.c
--- a/sys/compat/darwin/darwin_signal.c Wed Nov 27 16:08:34 2002 +0000
+++ b/sys/compat/darwin/darwin_signal.c Wed Nov 27 16:44:01 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: darwin_signal.c,v 1.2 2002/11/26 00:05:41 manu Exp $ */
+/* $NetBSD: darwin_signal.c,v 1.3 2002/11/27 16:44:01 atatat Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: darwin_signal.c,v 1.2 2002/11/26 00:05:41 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: darwin_signal.c,v 1.3 2002/11/27 16:44:01 atatat Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -81,11 +81,11 @@
if (SCARG(uap, osa) != NULL)
osa = stackgap_alloc(p, &sg, sizeof(struct sigaction));
- sa.sa_handler = dsa.sa_handler.__sa_handler;
- native_sigset13_to_sigset(&dsa.sa_mask, &sa.sa_mask);
- if (dsa.sa_mask & DARWIN_SA_USERTRAMP)
+ sa.sa_handler = dsa.darwin_sa_handler.__sa_handler;
+ native_sigset13_to_sigset(&dsa.darwin_sa_mask, &sa.sa_mask);
+ if (dsa.darwin_sa_mask & DARWIN_SA_USERTRAMP)
DPRINTF(("darwin_sys_sigaction: ignoring SA_USERTRAMP\n"));
- sa.sa_flags = dsa.sa_mask & ~DARWIN_SA_USERTRAMP;
+ sa.sa_flags = dsa.darwin_sa_mask & ~DARWIN_SA_USERTRAMP;
if ((error = copyout(&sa, nsa, sizeof(sa))) != 0)
return error;
@@ -94,7 +94,7 @@
SCARG(&cup, nsa) = nsa;
if (SCARG(uap, osa) != NULL)
SCARG(&cup, osa) = osa;
- SCARG(&cup, tramp) = dsa.sa_tramp;
+ SCARG(&cup, tramp) = dsa.darwin_sa_tramp;
SCARG(&cup, vers) = 1;
if ((error = sys___sigaction_sigtramp(p, &cup, retval)) !=0)
@@ -106,10 +106,10 @@
if ((error = copyin(SCARG(&cup, osa), &sa, sizeof(sa))) != 0)
return error;
- sa13.sa_handler = sa.sa_handler;
- sa13.sa_mask = sa.sa_mask.__bits[0];
- native_sigset_to_sigset13(&sa.sa_mask, &sa13.sa_mask);
- sa13.sa_flags = sa.sa_flags;
+ sa13.osa_handler = sa.sa_handler;
+ sa13.osa_mask = sa.sa_mask.__bits[0];
+ native_sigset_to_sigset13(&sa.sa_mask, &sa13.osa_mask);
+ sa13.osa_flags = sa.sa_flags;
if ((error = copyout(&sa13, SCARG(uap, osa), sizeof(sa13))) != 0)
return error;
diff -r e15bb4f8ff1d -r bc812921abf0 sys/compat/darwin/darwin_signal.h
--- a/sys/compat/darwin/darwin_signal.h Wed Nov 27 16:08:34 2002 +0000
+++ b/sys/compat/darwin/darwin_signal.h Wed Nov 27 16:44:01 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: darwin_signal.h,v 1.2 2002/11/26 23:54:10 manu Exp $ */
+/* $NetBSD: darwin_signal.h,v 1.3 2002/11/27 16:44:01 atatat Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -47,15 +47,15 @@
};
typedef struct darwin___siginfo {
- int si_signo;
- int si_errno;
- int si_code;
- int si_pid;
- unsigned int si_uid;
- int si_status;
- void *si_addr;
- union darwin_sigval si_value;
- long si_band;
+ int darwin_si_signo;
+ int darwin_si_errno;
+ int darwin_si_code;
+ int darwin_si_pid;
+ unsigned int darwin_si_uid;
+ int darwin_si_status;
+ void *darwin_si_addr;
+ union darwin_sigval darwin_si_value;
+ long darwin_si_band;
int pad[7];
} darwin_siginfo_t;
@@ -72,10 +72,10 @@
union {
void (*__sa_handler)(int);
void (*__sa_sigaction)(int, struct darwin___siginfo *, void *);
- } sa_handler;
- void (*sa_tramp)(void *, int, int, darwin_siginfo_t *, void *);
- sigset13_t sa_mask;
- int sa_flags;
+ } darwin_sa_handler;
+ void (*darwin_sa_tramp)(void *, int, int, darwin_siginfo_t *, void *);
+ sigset13_t darwin_sa_mask;
+ int darwin_sa_flags;
};
void darwin_sendsig(int, sigset_t *, u_long);
diff -r e15bb4f8ff1d -r bc812921abf0 sys/compat/hpux/hpux.h
--- a/sys/compat/hpux/hpux.h Wed Nov 27 16:08:34 2002 +0000
+++ b/sys/compat/hpux/hpux.h Wed Nov 27 16:44:01 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: hpux.h,v 1.16 2001/07/22 13:34:09 wiz Exp $ */
+/* $NetBSD: hpux.h,v 1.17 2002/11/27 16:44:02 atatat Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -287,9 +287,9 @@
/* HP-UX POSIX signal stuff implementation */
typedef struct __hpux_sigset_t { int sigset[8]; } hpux_sigset_t;
struct hpux_sigaction {
- void (*sa_handler) __P((int));
- hpux_sigset_t sa_mask;
- int sa_flags;
+ void (*hpux_sa_handler) __P((int));
+ hpux_sigset_t hpux_sa_mask;
+ int hpux_sa_flags;
};
#define HPUXSA_ONSTACK 1
#define HPUXSA_RESETHAND 4
diff -r e15bb4f8ff1d -r bc812921abf0 sys/compat/hpux/hpux_sig.c
--- a/sys/compat/hpux/hpux_sig.c Wed Nov 27 16:08:34 2002 +0000
+++ b/sys/compat/hpux/hpux_sig.c Wed Nov 27 16:44:01 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: hpux_sig.c,v 1.23 2002/07/04 23:32:09 thorpej Exp $ */
+/* $NetBSD: hpux_sig.c,v 1.24 2002/11/27 16:44:02 atatat Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpux_sig.c,v 1.23 2002/07/04 23:32:09 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpux_sig.c,v 1.24 2002/11/27 16:44:02 atatat Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -309,16 +309,16 @@
sa = &action;
if (SCARG(uap, osa)) {
- sa->sa_handler = bsa->sa_handler;
- memset((caddr_t)&sa->sa_mask, 0, sizeof(sa->sa_mask));
- bsdtohpuxmask(&bsa->sa_mask, &sa->sa_mask.sigset[0]);
- sa->sa_flags = 0;
+ sa->hpux_sa_handler = bsa->sa_handler;
+ memset((caddr_t)&sa->hpux_sa_mask, 0, sizeof(sa->hpux_sa_mask));
+ bsdtohpuxmask(&bsa->sa_mask, &sa->hpux_sa_mask.sigset[0]);
+ sa->hpux_sa_flags = 0;
if (bsa->sa_flags & SA_ONSTACK)
- sa->sa_flags |= HPUXSA_ONSTACK;
+ sa->hpux_sa_flags |= HPUXSA_ONSTACK;
if (bsa->sa_flags & SA_RESETHAND)
- sa->sa_flags |= HPUXSA_RESETHAND;
+ sa->hpux_sa_flags |= HPUXSA_RESETHAND;
if (bsa->sa_flags & SA_NOCLDSTOP)
- sa->sa_flags |= HPUXSA_NOCLDSTOP;
+ sa->hpux_sa_flags |= HPUXSA_NOCLDSTOP;
error = copyout(sa, SCARG(uap, osa), sizeof (action));
if (error)
return (error);
@@ -329,17 +329,17 @@
error = copyin(SCARG(uap, nsa), sa, sizeof(action));
if (error)
return (error);
- if (sig == SIGCONT && sa->sa_handler == SIG_IGN)
+ if (sig == SIGCONT && sa->hpux_sa_handler == SIG_IGN)
return (EINVAL);
- act.sa_handler = sa->sa_handler;
- hpuxtobsdmask(sa->sa_mask.sigset[0], &act.sa_mask);
+ act.sa_handler = sa->hpux_sa_handler;
+ hpuxtobsdmask(sa->hpux_sa_mask.sigset[0], &act.sa_mask);
act.sa_flags = SA_RESTART;
- if (sa->sa_flags & HPUXSA_ONSTACK)
+ if (sa->hpux_sa_flags & HPUXSA_ONSTACK)
act.sa_flags |= SA_ONSTACK;
- if (sa->sa_flags & HPUXSA_RESETHAND)
+ if (sa->hpux_sa_flags & HPUXSA_RESETHAND)
act.sa_flags |= SA_RESETHAND;
- if (sa->sa_flags & HPUXSA_NOCLDSTOP)
+ if (sa->hpux_sa_flags & HPUXSA_NOCLDSTOP)
act.sa_flags |= SA_NOCLDSTOP;
error = sigaction1(p, sig, &act, NULL, NULL, 0);
diff -r e15bb4f8ff1d -r bc812921abf0 sys/compat/netbsd32/netbsd32.h
--- a/sys/compat/netbsd32/netbsd32.h Wed Nov 27 16:08:34 2002 +0000
+++ b/sys/compat/netbsd32/netbsd32.h Wed Nov 27 16:44:01 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32.h,v 1.22 2002/10/23 13:16:40 scw Exp $ */
+/* $NetBSD: netbsd32.h,v 1.23 2002/11/27 16:44:02 atatat Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -349,9 +349,9 @@
typedef netbsd32_pointer_t netbsd32_sigsetp_t;
typedef netbsd32_pointer_t netbsd32_sigactionp_t;
struct netbsd32_sigaction {
- netbsd32_voidp sa_handler; /* signal handler */
- sigset_t sa_mask; /* signal mask to apply */
- int sa_flags; /* see signal options below */
+ netbsd32_voidp netbsd32_sa_handler; /* signal handler */
+ sigset_t netbsd32_sa_mask; /* signal mask to apply */
+ int netbsd32_sa_flags; /* see signal options below */
};
typedef netbsd32_pointer_t netbsd32_sigaltstack13p_t;
diff -r e15bb4f8ff1d -r bc812921abf0 sys/compat/netbsd32/netbsd32_signal.c
--- a/sys/compat/netbsd32/netbsd32_signal.c Wed Nov 27 16:08:34 2002 +0000
+++ b/sys/compat/netbsd32/netbsd32_signal.c Wed Nov 27 16:44:01 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_signal.c,v 1.4 2002/10/23 13:16:45 scw Exp $ */
+/* $NetBSD: netbsd32_signal.c,v 1.5 2002/11/27 16:44:03 atatat Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_signal.c,v 1.4 2002/10/23 13:16:45 scw Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_signal.c,v 1.5 2002/11/27 16:44:03 atatat Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -63,9 +63,9 @@
(struct netbsd32_sigaction *)NETBSD32PTR64(SCARG(uap, nsa));
if (copyin(sa32p, &sa32, sizeof(sa32)))
return EFAULT;
- nsa.sa_handler = (void *)NETBSD32PTR64(sa32.sa_handler);
- nsa.sa_mask = sa32.sa_mask;
- nsa.sa_flags = sa32.sa_flags;
+ nsa.sa_handler = (void *)NETBSD32PTR64(sa32.netbsd32_sa_handler);
+ nsa.sa_mask = sa32.netbsd32_sa_mask;
+ nsa.sa_flags = sa32.netbsd32_sa_flags;
}
error = sigaction1(p, SCARG(uap, signum),
SCARG(uap, nsa) ? &nsa : 0,
@@ -76,9 +76,9 @@
return (error);
if (SCARG(uap, osa)) {
- sa32.sa_handler = (netbsd32_sigactionp_t)(u_long)osa.sa_handler;
- sa32.sa_mask = osa.sa_mask;
- sa32.sa_flags = osa.sa_flags;
+ sa32.netbsd32_sa_handler = (netbsd32_sigactionp_t)(u_long)osa.sa_handler;
+ sa32.netbsd32_sa_mask = osa.sa_mask;
+ sa32.netbsd32_sa_flags = osa.sa_flags;
sa32p =
(struct netbsd32_sigaction *)NETBSD32PTR64(SCARG(uap, osa));
if (copyout(&sa32, sa32p, sizeof(sa32)))
@@ -148,9 +148,9 @@
sizeof(sa32));
if (error)
return (error);
- nsa.sa_handler = (void *)NETBSD32PTR64(sa32.sa_handler);
- nsa.sa_mask = sa32.sa_mask;
- nsa.sa_flags = sa32.sa_flags;
+ nsa.sa_handler = (void *)NETBSD32PTR64(sa32.netbsd32_sa_handler);
+ nsa.sa_mask = sa32.netbsd32_sa_mask;
+ nsa.sa_flags = sa32.netbsd32_sa_flags;
}
error = sigaction1(p, SCARG(uap, signum),
SCARG(uap, nsa) ? &nsa : 0, SCARG(uap, osa) ? &osa : 0,
@@ -158,9 +158,9 @@
if (error)
return (error);
if (SCARG(uap, osa)) {
- sa32.sa_handler = (netbsd32_voidp)(u_long)osa.sa_handler;
- sa32.sa_mask = osa.sa_mask;
- sa32.sa_flags = osa.sa_flags;
+ sa32.netbsd32_sa_handler = (netbsd32_voidp)(u_long)osa.sa_handler;
+ sa32.netbsd32_sa_mask = osa.sa_mask;
+ sa32.netbsd32_sa_flags = osa.sa_flags;
error = copyout(&sa32, (caddr_t)NETBSD32PTR64(SCARG(uap, osa)),
sizeof(sa32));
if (error)
@@ -192,9 +192,9 @@
sizeof(sa32));
if (error)
return (error);
- nsa.sa_handler = (void *)NETBSD32PTR64(sa32.sa_handler);
- nsa.sa_mask = sa32.sa_mask;
- nsa.sa_flags = sa32.sa_flags;
+ nsa.sa_handler = (void *)NETBSD32PTR64(sa32.netbsd32_sa_handler);
+ nsa.sa_mask = sa32.netbsd32_sa_mask;
+ nsa.sa_flags = sa32.netbsd32_sa_flags;
}
error = sigaction1(p, SCARG(uap, signum),
SCARG(uap, nsa) ? &nsa : 0, SCARG(uap, osa) ? &osa : 0,
Home |
Main Index |
Thread Index |
Old Index