Module Name: src
Committed By: simonb
Date: Tue Jan 19 03:20:13 UTC 2021
Modified Files:
src/sys/compat/netbsd32: netbsd32_compat_09.c netbsd32_compat_10_sysv.c
netbsd32_compat_12.c netbsd32_compat_13.c netbsd32_compat_14_sysv.c
netbsd32_compat_20.c netbsd32_compat_30.c netbsd32_compat_43.c
netbsd32_compat_50.c netbsd32_compat_50_quota.c
netbsd32_compat_50_sysv.c netbsd32_conv.h netbsd32_exec_aout.c
netbsd32_fs.c netbsd32_ipc.c netbsd32_rlimit.c
netbsd32_rndpseudo_50.c netbsd32_signal.c netbsd32_socket.c
netbsd32_sysctl.c netbsd32_time.c
Log Message:
KNF consistency: No parentheses are needed around the return value.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/compat/netbsd32/netbsd32_compat_09.c \
src/sys/compat/netbsd32/netbsd32_ipc.c
cvs rdiff -u -r1.2 -r1.3 src/sys/compat/netbsd32/netbsd32_compat_10_sysv.c
cvs rdiff -u -r1.34 -r1.35 src/sys/compat/netbsd32/netbsd32_compat_12.c
cvs rdiff -u -r1.27 -r1.28 src/sys/compat/netbsd32/netbsd32_compat_13.c
cvs rdiff -u -r1.3 -r1.4 src/sys/compat/netbsd32/netbsd32_compat_14_sysv.c \
src/sys/compat/netbsd32/netbsd32_compat_50_sysv.c
cvs rdiff -u -r1.39 -r1.40 src/sys/compat/netbsd32/netbsd32_compat_20.c
cvs rdiff -u -r1.35 -r1.36 src/sys/compat/netbsd32/netbsd32_compat_30.c
cvs rdiff -u -r1.60 -r1.61 src/sys/compat/netbsd32/netbsd32_compat_43.c
cvs rdiff -u -r1.49 -r1.50 src/sys/compat/netbsd32/netbsd32_compat_50.c
cvs rdiff -u -r1.1 -r1.2 src/sys/compat/netbsd32/netbsd32_compat_50_quota.c \
src/sys/compat/netbsd32/netbsd32_rlimit.c
cvs rdiff -u -r1.43 -r1.44 src/sys/compat/netbsd32/netbsd32_conv.h
cvs rdiff -u -r1.30 -r1.31 src/sys/compat/netbsd32/netbsd32_exec_aout.c
cvs rdiff -u -r1.90 -r1.91 src/sys/compat/netbsd32/netbsd32_fs.c
cvs rdiff -u -r1.5 -r1.6 src/sys/compat/netbsd32/netbsd32_rndpseudo_50.c
cvs rdiff -u -r1.50 -r1.51 src/sys/compat/netbsd32/netbsd32_signal.c
cvs rdiff -u -r1.54 -r1.55 src/sys/compat/netbsd32/netbsd32_socket.c
cvs rdiff -u -r1.44 -r1.45 src/sys/compat/netbsd32/netbsd32_sysctl.c
cvs rdiff -u -r1.53 -r1.54 src/sys/compat/netbsd32/netbsd32_time.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/netbsd32_compat_09.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_09.c:1.19 src/sys/compat/netbsd32/netbsd32_compat_09.c:1.20
--- src/sys/compat/netbsd32/netbsd32_compat_09.c:1.19 Sun Jan 27 02:08:40 2019
+++ src/sys/compat/netbsd32/netbsd32_compat_09.c Tue Jan 19 03:20:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_09.c,v 1.19 2019/01/27 02:08:40 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_09.c,v 1.20 2021/01/19 03:20:13 simonb Exp $ */
/*
* Copyright (c) 1998 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_09.c,v 1.19 2019/01/27 02:08:40 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_09.c,v 1.20 2021/01/19 03:20:13 simonb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -59,8 +59,8 @@ compat_09_netbsd32_ogetdomainname(struct
name[0] = CTL_KERN;
name[1] = KERN_DOMAINNAME;
sz = SCARG(uap, len);
- return (old_sysctl(&name[0], 2,
- (char *)SCARG_P32(uap, domainname), &sz, 0, 0, l));
+ return old_sysctl(&name[0], 2,
+ (char *)SCARG_P32(uap, domainname), &sz, 0, 0, l);
}
int
@@ -74,8 +74,8 @@ compat_09_netbsd32_osetdomainname(struct
name[0] = CTL_KERN;
name[1] = KERN_DOMAINNAME;
- return (old_sysctl(&name[0], 2, 0, 0,
- (char *)SCARG_P32(uap, domainname), SCARG(uap, len), l));
+ return old_sysctl(&name[0], 2, 0, 0,
+ (char *)SCARG_P32(uap, domainname), SCARG(uap, len), l);
}
int
@@ -87,7 +87,7 @@ compat_09_netbsd32_uname(struct lwp *l,
struct compat_09_sys_uname_args ua;
NETBSD32TOP_UAP(name, struct outsname);
- return (compat_09_sys_uname(l, &ua, retval));
+ return compat_09_sys_uname(l, &ua, retval);
}
static struct syscall_package compat_netbsd32_09_syscalls[] = {
Index: src/sys/compat/netbsd32/netbsd32_ipc.c
diff -u src/sys/compat/netbsd32/netbsd32_ipc.c:1.19 src/sys/compat/netbsd32/netbsd32_ipc.c:1.20
--- src/sys/compat/netbsd32/netbsd32_ipc.c:1.19 Sun Jan 27 02:08:40 2019
+++ src/sys/compat/netbsd32/netbsd32_ipc.c Tue Jan 19 03:20:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_ipc.c,v 1.19 2019/01/27 02:08:40 pgoyette Exp $ */
+/* $NetBSD: netbsd32_ipc.c,v 1.20 2021/01/19 03:20:13 simonb Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_ipc.c,v 1.19 2019/01/27 02:08:40 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_ipc.c,v 1.20 2021/01/19 03:20:13 simonb Exp $");
#if defined(_KERNEL_OPT)
#include "opt_sysv.h"
@@ -162,7 +162,7 @@ netbsd32_____semctl50(struct lwp *l, con
error = copyin(NETBSD32PTR64(karg32.buf), &sembuf32,
sizeof(sembuf32));
if (error)
- return (error);
+ return error;
netbsd32_to_semid_ds(&sembuf32, &sembuf);
}
}
@@ -176,7 +176,7 @@ netbsd32_____semctl50(struct lwp *l, con
sizeof(sembuf32));
}
- return (error);
+ return error;
}
int
@@ -192,7 +192,7 @@ netbsd32_semget(struct lwp *l, const str
NETBSD32TOX_UAP(key, key_t);
NETBSD32TO64_UAP(nsems);
NETBSD32TO64_UAP(semflg);
- return (sys_semget(l, &ua, retval));
+ return sys_semget(l, &ua, retval);
}
int
@@ -208,7 +208,7 @@ netbsd32_semop(struct lwp *l, const stru
NETBSD32TO64_UAP(semid);
NETBSD32TOP_UAP(sops, struct sembuf);
NETBSD32TOX_UAP(nsops, size_t);
- return (sys_semop(l, &ua, retval));
+ return sys_semop(l, &ua, retval);
}
int
@@ -220,7 +220,7 @@ netbsd32_semconfig(struct lwp *l, const
struct sys_semconfig_args ua;
NETBSD32TO64_UAP(flag);
- return (sys_semconfig(l, &ua, retval));
+ return sys_semconfig(l, &ua, retval);
}
#endif /* SYSVSEM */
@@ -392,7 +392,7 @@ netbsd32_shmdt(struct lwp *l, const stru
struct sys_shmdt_args ua;
NETBSD32TOP_UAP(shmaddr, const char);
- return (sys_shmdt(l, &ua, retval));
+ return sys_shmdt(l, &ua, retval);
}
int
@@ -408,6 +408,6 @@ netbsd32_shmget(struct lwp *l, const str
NETBSD32TOX_UAP(key, key_t);
NETBSD32TOX_UAP(size, size_t);
NETBSD32TO64_UAP(shmflg);
- return (sys_shmget(l, &ua, retval));
+ return sys_shmget(l, &ua, retval);
}
#endif /* SYSVSHM */
Index: src/sys/compat/netbsd32/netbsd32_compat_10_sysv.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_10_sysv.c:1.2 src/sys/compat/netbsd32/netbsd32_compat_10_sysv.c:1.3
--- src/sys/compat/netbsd32/netbsd32_compat_10_sysv.c:1.2 Sun Jan 27 02:08:40 2019
+++ src/sys/compat/netbsd32/netbsd32_compat_10_sysv.c Tue Jan 19 03:20:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_10_sysv.c,v 1.2 2019/01/27 02:08:40 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_10_sysv.c,v 1.3 2021/01/19 03:20:13 simonb Exp $ */
/*
* Copyright (c) 1994 Adam Glass and Charles M. Hannum. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_10_sysv.c,v 1.2 2019/01/27 02:08:40 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_10_sysv.c,v 1.3 2021/01/19 03:20:13 simonb Exp $");
#ifdef _KERNEL_OPT
#include "opt_sysv.h"
@@ -100,20 +100,20 @@ compat_10_netbsd32_semsys(struct lwp *l,
SCARG(&semget_args, key) = SCARG(uap, a2);
SCARG(&semget_args, nsems) = SCARG(uap, a3);
SCARG(&semget_args, semflg) = SCARG(uap, a4);
- return (sys_semget(l, &semget_args, retval));
+ return sys_semget(l, &semget_args, retval);
case 2: /* semop() */
SCARG(&semop_args, semid) = SCARG(uap, a2);
SCARG(&semop_args, sops) = NETBSD32IPTR64(SCARG(uap, a3));
SCARG(&semop_args, nsops) = SCARG(uap, a4);
- return (sys_semop(l, &semop_args, retval));
+ return sys_semop(l, &semop_args, retval);
case 3: /* semconfig() */
SCARG(&semconfig_args, flag) = SCARG(uap, a2);
- return (sys_semconfig(l, &semconfig_args, retval));
+ return sys_semconfig(l, &semconfig_args, retval);
default:
- return (EINVAL);
+ return EINVAL;
}
}
#endif
@@ -152,26 +152,26 @@ compat_10_netbsd32_shmsys(struct lwp *l,
SCARG(&shmat_args, shmid) = SCARG(uap, a2);
SCARG(&shmat_args, shmaddr) = NETBSD32IPTR64(SCARG(uap, a3));
SCARG(&shmat_args, shmflg) = SCARG(uap, a4);
- return (sys_shmat(l, &shmat_args, retval));
+ return sys_shmat(l, &shmat_args, retval);
case 1: /* shmctl() */
SCARG(&shmctl_args, shmid) = SCARG(uap, a2);
SCARG(&shmctl_args, cmd) = SCARG(uap, a3);
SCARG(&shmctl_args, buf) = NETBSD32IPTR64(SCARG(uap, a4));
- return (compat_14_sys_shmctl(l, &shmctl_args, retval));
+ return compat_14_sys_shmctl(l, &shmctl_args, retval);
case 2: /* shmdt() */
SCARG(&shmdt_args, shmaddr) = NETBSD32IPTR64(SCARG(uap, a2));
- return (sys_shmdt(l, &shmdt_args, retval));
+ return sys_shmdt(l, &shmdt_args, retval);
case 3: /* shmget() */
SCARG(&shmget_args, key) = SCARG(uap, a2);
SCARG(&shmget_args, size) = SCARG(uap, a3);
SCARG(&shmget_args, shmflg) = SCARG(uap, a4);
- return (sys_shmget(l, &shmget_args, retval));
+ return sys_shmget(l, &shmget_args, retval);
default:
- return (EINVAL);
+ return EINVAL;
}
}
#endif
@@ -216,19 +216,19 @@ compat_10_netbsd32_msgsys(struct lwp *l,
SCARG(&msgctl_args, msqid) = SCARG(uap, a2);
SCARG(&msgctl_args, cmd) = SCARG(uap, a3);
SCARG(&msgctl_args, buf) = NETBSD32IPTR64(SCARG(uap, a4));
- return (compat_14_sys_msgctl(l, &msgctl_args, retval));
+ return compat_14_sys_msgctl(l, &msgctl_args, retval);
case 1: /* msgget() */
SCARG(&msgget_args, key) = SCARG(uap, a2);
SCARG(&msgget_args, msgflg) = SCARG(uap, a3);
- return (sys_msgget(l, &msgget_args, retval));
+ return sys_msgget(l, &msgget_args, retval);
case 2: /* msgsnd() */
SCARG(&msgsnd_args, msqid) = SCARG(uap, a2);
SCARG(&msgsnd_args, msgp) = NETBSD32IPTR64(SCARG(uap, a3));
SCARG(&msgsnd_args, msgsz) = SCARG(uap, a4);
SCARG(&msgsnd_args, msgflg) = SCARG(uap, a5);
- return (sys_msgsnd(l, &msgsnd_args, retval));
+ return sys_msgsnd(l, &msgsnd_args, retval);
case 3: /* msgrcv() */
SCARG(&msgrcv_args, msqid) = SCARG(uap, a2);
@@ -236,10 +236,10 @@ compat_10_netbsd32_msgsys(struct lwp *l,
SCARG(&msgrcv_args, msgsz) = SCARG(uap, a4);
SCARG(&msgrcv_args, msgtyp) = SCARG(uap, a5);
SCARG(&msgrcv_args, msgflg) = SCARG(uap, a6);
- return (sys_msgrcv(l, &msgrcv_args, retval));
+ return sys_msgrcv(l, &msgrcv_args, retval);
default:
- return (EINVAL);
+ return EINVAL;
}
}
#endif
Index: src/sys/compat/netbsd32/netbsd32_compat_12.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_12.c:1.34 src/sys/compat/netbsd32/netbsd32_compat_12.c:1.35
--- src/sys/compat/netbsd32/netbsd32_compat_12.c:1.34 Sun Jan 27 02:08:40 2019
+++ src/sys/compat/netbsd32/netbsd32_compat_12.c Tue Jan 19 03:20:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_12.c,v 1.34 2019/01/27 02:08:40 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_12.c,v 1.35 2021/01/19 03:20:13 simonb Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_12.c,v 1.34 2019/01/27 02:08:40 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_12.c,v 1.35 2021/01/19 03:20:13 simonb Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -94,7 +94,7 @@ compat_12_netbsd32_reboot(struct lwp *l,
struct compat_12_sys_reboot_args ua;
NETBSD32TO64_UAP(opt);
- return (compat_12_sys_reboot(l, &ua, retval));
+ return compat_12_sys_reboot(l, &ua, retval);
}
int
@@ -109,7 +109,7 @@ compat_12_netbsd32_msync(struct lwp *l,
NETBSD32TOP_UAP(addr, void *);
NETBSD32TOX_UAP(len, size_t);
SCARG(&ua, flags) = MS_SYNC | MS_INVALIDATE;
- return (sys___msync13(l, &ua, retval));
+ return sys___msync13(l, &ua, retval);
}
int
@@ -123,7 +123,7 @@ compat_12_netbsd32_oswapon(struct lwp *l
SCARG(&ua, cmd) = SWAP_ON;
SCARG(&ua, arg) = SCARG_P32(uap, name);
SCARG(&ua, misc) = 0; /* priority */
- return (sys_swapctl(l, &ua, retval));
+ return sys_swapctl(l, &ua, retval);
}
int
@@ -140,12 +140,12 @@ compat_12_netbsd32_stat12(struct lwp *l,
error = do_sys_stat(SCARG_P32(uap, path), FOLLOW, &sb);
if (error)
- return (error);
+ return error;
compat_12_stat_conv(&sb, &sb12);
netbsd32_stat12_to_netbsd32(&sb12, &sb32);
- return (copyout(&sb32, SCARG_P32(uap, ub), sizeof sb32));
+ return copyout(&sb32, SCARG_P32(uap, ub), sizeof sb32);
}
int
@@ -162,12 +162,12 @@ compat_12_netbsd32_fstat12(struct lwp *l
error = do_sys_fstat(SCARG(uap, fd), &sb);
if (error)
- return (error);
+ return error;
compat_12_stat_conv(&sb, &sb12);
netbsd32_stat12_to_netbsd32(&sb12, &sb32);
- return (copyout(&sb32, SCARG_P32(uap, sb), sizeof sb32));
+ return copyout(&sb32, SCARG_P32(uap, sb), sizeof sb32);
}
int
@@ -184,12 +184,12 @@ compat_12_netbsd32_lstat12(struct lwp *l
error = do_sys_stat(SCARG_P32(uap, path), NOFOLLOW, &sb);
if (error)
- return (error);
+ return error;
compat_12_stat_conv(&sb, &sb12);
netbsd32_stat12_to_netbsd32(&sb12, &sb32);
- return (copyout(&sb32, SCARG_P32(uap, ub), sizeof sb32));
+ return copyout(&sb32, SCARG_P32(uap, ub), sizeof sb32);
}
int
@@ -208,7 +208,7 @@ compat_12_netbsd32_getdirentries(struct
NETBSD32TO64_UAP(count);
NETBSD32TOP_UAP(basep, long);
- return (compat_12_sys_getdirentries(l, &ua, retval));
+ return compat_12_sys_getdirentries(l, &ua, retval);
}
static struct syscall_package compat_netbsd32_12_syscalls[] = {
Index: src/sys/compat/netbsd32/netbsd32_compat_13.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_13.c:1.27 src/sys/compat/netbsd32/netbsd32_compat_13.c:1.28
--- src/sys/compat/netbsd32/netbsd32_compat_13.c:1.27 Sun Jan 27 02:08:40 2019
+++ src/sys/compat/netbsd32/netbsd32_compat_13.c Tue Jan 19 03:20:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_13.c,v 1.27 2019/01/27 02:08:40 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_13.c,v 1.28 2021/01/19 03:20:13 simonb Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_13.c,v 1.27 2019/01/27 02:08:40 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_13.c,v 1.28 2021/01/19 03:20:13 simonb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -74,10 +74,10 @@ compat_13_netbsd32_sigprocmask(struct lw
error = sigprocmask1(l, SCARG(uap, how), &nbss, &obss);
mutex_exit(p->p_lock);
if (error)
- return (error);
+ return error;
native_sigset_to_sigset13(&obss, &oess);
*retval = oess;
- return (0);
+ return 0;
}
int
@@ -91,7 +91,7 @@ compat_13_netbsd32_sigsuspend(struct lwp
ess = SCARG(uap, mask);
native_sigset13_to_sigset(&ess, &bss);
- return (sigsuspend1(l, &bss));
+ return sigsuspend1(l, &bss);
}
static struct syscall_package compat_netbsd32_13_syscalls[] = {
Index: src/sys/compat/netbsd32/netbsd32_compat_14_sysv.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_14_sysv.c:1.3 src/sys/compat/netbsd32/netbsd32_compat_14_sysv.c:1.4
--- src/sys/compat/netbsd32/netbsd32_compat_14_sysv.c:1.3 Thu Feb 21 03:37:19 2019
+++ src/sys/compat/netbsd32/netbsd32_compat_14_sysv.c Tue Jan 19 03:20:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_14_sysv.c,v 1.3 2019/02/21 03:37:19 mrg Exp $ */
+/* $NetBSD: netbsd32_compat_14_sysv.c,v 1.4 2021/01/19 03:20:13 simonb Exp $ */
/*
* Copyright (c) 1999 Eduardo E. Horvath
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_14_sysv.c,v 1.3 2019/02/21 03:37:19 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_14_sysv.c,v 1.4 2021/01/19 03:20:13 simonb Exp $");
#ifdef _KERNEL_OPT
#include "opt_sysv.h"
@@ -217,7 +217,7 @@ compat_14_netbsd32_msgctl(struct lwp *l,
error = copyin(SCARG_P32(uap, buf),
&omsqbuf, sizeof(omsqbuf));
if (error)
- return (error);
+ return error;
netbsd32_msqid_ds14_to_native(&omsqbuf, &msqbuf);
}
@@ -230,7 +230,7 @@ compat_14_netbsd32_msgctl(struct lwp *l,
SCARG_P32(uap, buf), sizeof(omsqbuf));
}
- return (error);
+ return error;
}
#endif
@@ -269,11 +269,11 @@ compat_14_netbsd32___semctl(struct lwp *
error = copyin(NETBSD32IPTR64(SCARG(uap, arg)), &arg,
sizeof(arg));
if (error)
- return (error);
+ return error;
if (cmd == IPC_SET) {
error = copyin(arg.buf, &osembuf, sizeof(osembuf));
if (error)
- return (error);
+ return error;
netbsd32_semid_ds14_to_native(&osembuf, &sembuf);
}
}
@@ -286,7 +286,7 @@ compat_14_netbsd32___semctl(struct lwp *
error = copyout(&osembuf, arg.buf, sizeof(osembuf));
}
- return (error);
+ return error;
}
#endif
@@ -308,7 +308,7 @@ compat_14_netbsd32_shmctl(struct lwp *l,
if (cmd == IPC_SET) {
error = copyin(SCARG_P32(uap, buf), &oshmbuf, sizeof(oshmbuf));
if (error)
- return (error);
+ return error;
netbsd32_shmid_ds14_to_native(&oshmbuf, &shmbuf);
}
@@ -320,7 +320,7 @@ compat_14_netbsd32_shmctl(struct lwp *l,
error = copyout(&oshmbuf, SCARG_P32(uap, buf), sizeof(oshmbuf));
}
- return (error);
+ return error;
}
#endif
Index: src/sys/compat/netbsd32/netbsd32_compat_50_sysv.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_50_sysv.c:1.3 src/sys/compat/netbsd32/netbsd32_compat_50_sysv.c:1.4
--- src/sys/compat/netbsd32/netbsd32_compat_50_sysv.c:1.3 Sun Dec 15 16:48:26 2019
+++ src/sys/compat/netbsd32/netbsd32_compat_50_sysv.c Tue Jan 19 03:20:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_50_sysv.c,v 1.3 2019/12/15 16:48:26 tsutsui Exp $ */
+/* $NetBSD: netbsd32_compat_50_sysv.c,v 1.4 2021/01/19 03:20:13 simonb Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50_sysv.c,v 1.3 2019/12/15 16:48:26 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50_sysv.c,v 1.4 2021/01/19 03:20:13 simonb Exp $");
#if defined(_KERNEL_OPT)
#include "opt_sysv.h"
@@ -118,7 +118,7 @@ do_netbsd32___semctl14(struct lwp *l, co
error = copyin(NETBSD32PTR64(karg32.buf), &sembuf32,
sizeof(sembuf32));
if (error)
- return (error);
+ return error;
netbsd32_to_semid_ds50(&sembuf32, &sembuf);
}
}
@@ -132,7 +132,7 @@ do_netbsd32___semctl14(struct lwp *l, co
sizeof(sembuf32));
}
- return (error);
+ return error;
}
#endif
Index: src/sys/compat/netbsd32/netbsd32_compat_20.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_20.c:1.39 src/sys/compat/netbsd32/netbsd32_compat_20.c:1.40
--- src/sys/compat/netbsd32/netbsd32_compat_20.c:1.39 Wed Jan 1 14:52:38 2020
+++ src/sys/compat/netbsd32/netbsd32_compat_20.c Tue Jan 19 03:20:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_20.c,v 1.39 2020/01/01 14:52:38 maxv Exp $ */
+/* $NetBSD: netbsd32_compat_20.c,v 1.40 2021/01/19 03:20:13 simonb Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_20.c,v 1.39 2020/01/01 14:52:38 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_20.c,v 1.40 2021/01/19 03:20:13 simonb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -163,7 +163,7 @@ compat_20_netbsd32_statfs(struct lwp *l,
error = namei_simple_user(SCARG_P32(uap, path),
NSM_FOLLOW_TRYEMULROOT, &vp);
if (error != 0)
- return (error);
+ return error;
mp = vp->v_mount;
vrele(vp);
sb = STATVFSBUF_GET();
@@ -191,7 +191,7 @@ compat_20_netbsd32_fstatfs(struct lwp *l
/* fd_getvnode() will use the descriptor for us */
if ((error = fd_getvnode(SCARG(uap, fd), &fp)) != 0)
- return (error);
+ return error;
mp = fp->f_vnode->v_mount;
sb = STATVFSBUF_GET();
if ((error = dostatvfs(mp, sb, l, 0, 0)) != 0)
@@ -201,7 +201,7 @@ compat_20_netbsd32_fstatfs(struct lwp *l
out:
STATVFSBUF_PUT(sb);
fd_putfile(SCARG(uap, fd));
- return (error);
+ return error)
}
int
@@ -218,7 +218,7 @@ compat_20_netbsd32_fhstatfs(struct lwp *
#ifdef notyet
NETBSD32TOP_UAP(flags, int);
#endif
- return (compat_30_sys_fhstatvfs1(l, &ua, retval));
+ return compat_30_sys_fhstatvfs1(l, &ua, retval);
}
static struct syscall_package compat_netbsd32_20_syscalls[] = {
Index: src/sys/compat/netbsd32/netbsd32_compat_30.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_30.c:1.35 src/sys/compat/netbsd32/netbsd32_compat_30.c:1.36
--- src/sys/compat/netbsd32/netbsd32_compat_30.c:1.35 Fri Jan 31 09:01:23 2020
+++ src/sys/compat/netbsd32/netbsd32_compat_30.c Tue Jan 19 03:20:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_30.c,v 1.35 2020/01/31 09:01:23 maxv Exp $ */
+/* $NetBSD: netbsd32_compat_30.c,v 1.36 2021/01/19 03:20:13 simonb Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_30.c,v 1.35 2020/01/31 09:01:23 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_30.c,v 1.36 2021/01/19 03:20:13 simonb Exp $");
#if defined(_KERNEL_OPT)
#include <opt_ntp.h>
@@ -81,7 +81,7 @@ compat_30_netbsd32_getdents(struct lwp *
/* fd_getvnode() will use the descriptor for us */
if ((error = fd_getvnode(SCARG(uap, fd), &fp)) != 0)
- return (error);
+ return error;
if ((fp->f_flag & FREAD) == 0) {
error = EBADF;
goto out;
@@ -98,7 +98,7 @@ compat_30_netbsd32_getdents(struct lwp *
kmem_free(buf, count);
out:
fd_putfile(SCARG(uap, fd));
- return (error);
+ return error;
}
int
@@ -117,10 +117,10 @@ compat_30_netbsd32___stat13(struct lwp *
error = do_sys_stat(path, FOLLOW, &sb);
if (error)
- return (error);
+ return error;
netbsd32_from___stat13(&sb, &sb32);
error = copyout(&sb32, SCARG_P32(uap, ub), sizeof(sb32));
- return (error);
+ return error;
}
int
@@ -139,7 +139,7 @@ compat_30_netbsd32___fstat13(struct lwp
netbsd32_from___stat13(&ub, &sb32);
error = copyout(&sb32, SCARG_P32(uap, sb), sizeof(sb32));
}
- return (error);
+ return error;
}
int
@@ -158,10 +158,10 @@ compat_30_netbsd32___lstat13(struct lwp
error = do_sys_stat(path, NOFOLLOW, &sb);
if (error)
- return (error);
+ return error;
netbsd32_from___stat13(&sb, &sb32);
error = copyout(&sb32, SCARG_P32(uap, ub), sizeof(sb32));
- return (error);
+ return error;
}
int
@@ -183,24 +183,24 @@ compat_30_netbsd32_fhstat(struct lwp *l,
*/
if ((error = kauth_authorize_system(l->l_cred,
KAUTH_SYSTEM_FILEHANDLE, 0, NULL, NULL, NULL)))
- return (error);
+ return error;
if ((error = copyin(SCARG_P32(uap, fhp), &fh, sizeof(fh))) != 0)
- return (error);
+ return error;
if ((mp = vfs_getvfs(&fh.fh_fsid)) == NULL)
- return (ESTALE);
+ return ESTALE;
if (mp->mnt_op->vfs_fhtovp == NULL)
return EOPNOTSUPP;
if ((error = VFS_FHTOVP(mp, (struct fid*)&fh.fh_fid, LK_EXCLUSIVE, &vp)))
- return (error);
+ return error;
error = vn_stat(vp, &sb);
vput(vp);
if (error)
- return (error);
+ return error;
netbsd32_from___stat13(&sb, &sb32);
error = copyout(&sb32, SCARG_P32(uap, sb), sizeof(sb32));
- return (error);
+ return error;
}
int
@@ -227,7 +227,7 @@ compat_30_netbsd32_fhstatvfs1(struct lwp
}
STATVFSBUF_PUT(sbuf);
- return (error);
+ return error;
}
int
@@ -243,7 +243,7 @@ compat_30_netbsd32_socket(struct lwp *l,
NETBSD32TO64_UAP(domain);
NETBSD32TO64_UAP(type);
NETBSD32TO64_UAP(protocol);
- return (compat_30_sys_socket(l, &ua, retval));
+ return compat_30_sys_socket(l, &ua, retval);
}
int
@@ -258,7 +258,7 @@ compat_30_netbsd32_getfh(struct lwp *l,
NETBSD32TOP_UAP(fname, const char);
NETBSD32TOP_UAP(fhp, struct compat_30_fhandle);
/* Lucky for us a fhandle_t doesn't change sizes */
- return (compat_30_sys_getfh(l, &ua, retval));
+ return compat_30_sys_getfh(l, &ua, retval);
}
@@ -299,7 +299,7 @@ compat_30_netbsd32_fhopen(struct lwp *l,
NETBSD32TOP_UAP(fhp, struct compat_30_fhandle);
NETBSD32TO64_UAP(flags);
- return (compat_30_sys_fhopen(l, &ua, retval));
+ return compat_30_sys_fhopen(l, &ua, retval);
}
#ifdef NTP
@@ -330,7 +330,7 @@ compat_30_netbsd32_ntp_gettime(struct lw
*retval = (*vec_ntp_timestatus)();
}
- return (error);
+ return error;
}
#endif
Index: src/sys/compat/netbsd32/netbsd32_compat_43.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_43.c:1.60 src/sys/compat/netbsd32/netbsd32_compat_43.c:1.61
--- src/sys/compat/netbsd32/netbsd32_compat_43.c:1.60 Sat Mar 7 00:56:41 2020
+++ src/sys/compat/netbsd32/netbsd32_compat_43.c Tue Jan 19 03:20:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_43.c,v 1.60 2020/03/07 00:56:41 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_43.c,v 1.61 2021/01/19 03:20:13 simonb Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_43.c,v 1.60 2020/03/07 00:56:41 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_43.c,v 1.61 2021/01/19 03:20:13 simonb Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_43.h"
@@ -112,7 +112,7 @@ compat_43_netbsd32_ocreat(struct lwp *l,
NETBSD32TO64_UAP(mode);
SCARG(&ua, flags) = O_WRONLY | O_CREAT | O_TRUNC;
- return (sys_open(l, &ua, retval));
+ return sys_open(l, &ua, retval);
}
int
@@ -200,7 +200,7 @@ compat_43_netbsd32_otruncate(struct lwp
NETBSD32TOP_UAP(path, const char);
NETBSD32TO64_UAP(length);
- return (sys_truncate(l, &ua, retval));
+ return sys_truncate(l, &ua, retval);
}
int
@@ -214,7 +214,7 @@ compat_43_netbsd32_oftruncate(struct lwp
NETBSD32TO64_UAP(fd);
NETBSD32TO64_UAP(length);
- return (sys_ftruncate(l, &ua, retval));
+ return sys_ftruncate(l, &ua, retval);
}
int
@@ -232,7 +232,7 @@ compat_43_netbsd32_ogetdirentries(struct
NETBSD32TOP_UAP(buf, char);
NETBSD32TO64_UAP(count);
NETBSD32TOP_UAP(basep, long);
- return (compat_43_sys_getdirentries(l, &ua, retval));
+ return compat_43_sys_getdirentries(l, &ua, retval);
}
/* kernel syscalls */
@@ -251,7 +251,7 @@ compat_43_netbsd32_ogetkerninfo(struct l
NETBSD32TOP_UAP(where, char);
NETBSD32TOP_UAP(size, int);
NETBSD32TO64_UAP(arg);
- return (compat_43_sys_getkerninfo(l, &ua, retval));
+ return compat_43_sys_getkerninfo(l, &ua, retval);
}
int
@@ -267,8 +267,8 @@ compat_43_netbsd32_ogethostname(struct l
name[0] = CTL_KERN;
name[1] = KERN_HOSTNAME;
sz = SCARG(uap, len);
- return (old_sysctl(&name[0], 2,
- SCARG_P32(uap, hostname), &sz, 0, 0, l));
+ return old_sysctl(&name[0], 2,
+ SCARG_P32(uap, hostname), &sz, 0, 0, l);
}
int
@@ -295,7 +295,7 @@ compat_43_netbsd32_sethostid(struct lwp
struct compat_43_sys_sethostid_args ua;
NETBSD32TO64_UAP(hostid);
- return (compat_43_sys_sethostid(l, &ua, retval));
+ return compat_43_sys_sethostid(l, &ua, retval);
}
int
@@ -309,7 +309,7 @@ compat_43_netbsd32_ogetrlimit(struct lwp
NETBSD32TO64_UAP(which);
NETBSD32TOP_UAP(rlp, struct orlimit);
- return (compat_43_sys_getrlimit(l, &ua, retval));
+ return compat_43_sys_getrlimit(l, &ua, retval);
}
int
@@ -323,7 +323,7 @@ compat_43_netbsd32_osetrlimit(struct lwp
NETBSD32TO64_UAP(which);
NETBSD32TOP_UAP(rlp, struct orlimit);
- return (compat_43_sys_setrlimit(l, &ua, retval));
+ return compat_43_sys_setrlimit(l, &ua, retval);
}
int
@@ -337,7 +337,7 @@ compat_43_netbsd32_killpg(struct lwp *l,
NETBSD32TO64_UAP(pgid);
NETBSD32TO64_UAP(signum);
- return (compat_43_sys_killpg(l, &ua, retval));
+ return compat_43_sys_killpg(l, &ua, retval);
}
/* virtual memory syscalls */
@@ -360,7 +360,7 @@ compat_43_netbsd32_ommap(struct lwp *l,
NETBSD32TO64_UAP(flags);
NETBSD32TO64_UAP(fd);
NETBSD32TOX_UAP(pos, long);
- return (compat_43_sys_mmap(l, &ua, retval));
+ return compat_43_sys_mmap(l, &ua, retval);
}
/* network syscalls */
@@ -377,7 +377,7 @@ compat_43_netbsd32_oaccept(struct lwp *l
NETBSD32TOX_UAP(s, int);
NETBSD32TOP_UAP(name, void *);
NETBSD32TOP_UAP(anamelen, int);
- return (compat_43_sys_accept(l, &ua, retval));
+ return compat_43_sys_accept(l, &ua, retval);
}
int
@@ -395,7 +395,7 @@ compat_43_netbsd32_osend(struct lwp *l,
NETBSD32TOP_UAP(buf, void *);
NETBSD32TO64_UAP(len);
NETBSD32TO64_UAP(flags);
- return (compat_43_sys_send(l, &ua, retval));
+ return compat_43_sys_send(l, &ua, retval);
}
int
@@ -413,7 +413,7 @@ compat_43_netbsd32_orecv(struct lwp *l,
NETBSD32TOP_UAP(buf, void *);
NETBSD32TO64_UAP(len);
NETBSD32TO64_UAP(flags);
- return (compat_43_sys_recv(l, &ua, retval));
+ return compat_43_sys_recv(l, &ua, retval);
}
/*
@@ -435,7 +435,7 @@ compat_43_netbsd32_orecvmsg(struct lwp *
error = copyin(SCARG_P32(uap, msg), &omsg, sizeof(omsg));
if (error)
- return (error);
+ return error;
if (NETBSD32PTR64(omsg.msg_accrights) == NULL)
omsg.msg_accrightslen = 0;
@@ -520,7 +520,7 @@ compat_43_netbsd32_osendmsg(struct lwp *
error = copyin(SCARG_P32(uap, msg), &omsg, sizeof(omsg));
if (error != 0)
- return (error);
+ return error;
iov = netbsd32_get_iov(NETBSD32PTR64(omsg.msg_iov), omsg.msg_iovlen,
aiov, __arraycount(aiov));
@@ -556,7 +556,7 @@ compat_43_netbsd32_osendmsg(struct lwp *
out:
if (iov != aiov)
kmem_free(iov, omsg.msg_iovlen * sizeof(*iov));
- return (error);
+ return error;
}
int
@@ -578,7 +578,7 @@ compat_43_netbsd32_orecvfrom(struct lwp
NETBSD32TO64_UAP(flags);
NETBSD32TOP_UAP(from, void *);
NETBSD32TOP_UAP(fromlenaddr, int);
- return (compat_43_sys_recvfrom(l, &ua, retval));
+ return compat_43_sys_recvfrom(l, &ua, retval);
}
int
@@ -594,7 +594,7 @@ compat_43_netbsd32_ogetsockname(struct l
NETBSD32TO64_UAP(fdec);
NETBSD32TOP_UAP(asa, void *);
NETBSD32TOP_UAP(alen, int *);
- return (compat_43_sys_getsockname(l, &ua, retval));
+ return compat_43_sys_getsockname(l, &ua, retval);
}
int
@@ -610,7 +610,7 @@ compat_43_netbsd32_ogetpeername(struct l
NETBSD32TO64_UAP(fdes);
NETBSD32TOP_UAP(asa, void *);
NETBSD32TOP_UAP(alen, int *);
- return (compat_43_sys_getpeername(l, &ua, retval));
+ return compat_43_sys_getpeername(l, &ua, retval);
}
/* signal syscalls */
@@ -664,7 +664,7 @@ compat_43_netbsd32_sigblock(struct lwp *
struct compat_43_sys_sigblock_args ua;
NETBSD32TO64_UAP(mask);
- return (compat_43_sys_sigblock(l, &ua, retval));
+ return compat_43_sys_sigblock(l, &ua, retval);
}
int
@@ -676,7 +676,7 @@ compat_43_netbsd32_sigsetmask(struct lwp
struct compat_43_sys_sigsetmask_args ua;
NETBSD32TO64_UAP(mask);
- return (compat_43_sys_sigsetmask(l, &ua, retval));
+ return compat_43_sys_sigsetmask(l, &ua, retval);
}
int
Index: src/sys/compat/netbsd32/netbsd32_compat_50.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_50.c:1.49 src/sys/compat/netbsd32/netbsd32_compat_50.c:1.50
--- src/sys/compat/netbsd32/netbsd32_compat_50.c:1.49 Thu Apr 30 03:30:10 2020
+++ src/sys/compat/netbsd32/netbsd32_compat_50.c Tue Jan 19 03:20:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_50.c,v 1.49 2020/04/30 03:30:10 riastradh Exp $ */
+/* $NetBSD: netbsd32_compat_50.c,v 1.50 2021/01/19 03:20:13 simonb Exp $ */
/*-
* Copyright (c) 2008, 2020 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.49 2020/04/30 03:30:10 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.50 2021/01/19 03:20:13 simonb Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -252,7 +252,7 @@ compat_50_netbsd32_adjtime(struct lwp *l
if ((error = kauth_authorize_system(l->l_cred,
KAUTH_SYSTEM_TIME, KAUTH_REQ_SYSTEM_TIME_ADJTIME, NULL, NULL,
NULL)) != 0)
- return (error);
+ return error;
if (SCARG_P32(uap, olddelta)) {
mutex_spin_enter(&timecounter_lock);
@@ -266,13 +266,13 @@ compat_50_netbsd32_adjtime(struct lwp *l
error = copyout(&atv, SCARG_P32(uap, olddelta), sizeof(atv));
if (error)
- return (error);
+ return error;
}
if (SCARG_P32(uap, delta)) {
error = copyin(SCARG_P32(uap, delta), &atv, sizeof(atv));
if (error)
- return (error);
+ return error;
mutex_spin_enter(&timecounter_lock);
time_adjtime = (int64_t)atv.tv_sec * 1000000 + atv.tv_usec;
@@ -344,7 +344,7 @@ compat_50_netbsd32_clock_settime(struct
int error;
if ((error = copyin(SCARG_P32(uap, tp), &ts32, sizeof(ts32))) != 0)
- return (error);
+ return error;
netbsd32_to_timespec50(&ts32, &ats);
return clock_settime1(l->l_proc, SCARG(uap, clock_id), &ats, true);
@@ -389,7 +389,7 @@ compat_50_netbsd32_timer_settime(struct
struct netbsd32_itimerspec50 its32;
if ((error = copyin(SCARG_P32(uap, value), &its32, sizeof(its32))) != 0)
- return (error);
+ return error;
netbsd32_to_timespec50(&its32.it_interval, &value.it_interval);
netbsd32_to_timespec50(&its32.it_value, &value.it_value);
@@ -443,7 +443,7 @@ compat_50_netbsd32_nanosleep(struct lwp
error = copyin(SCARG_P32(uap, rqtp), &ts32, sizeof(ts32));
if (error)
- return (error);
+ return error;
netbsd32_to_timespec50(&ts32, &rqt);
error = nanosleep1(l, CLOCK_MONOTONIC, 0, &rqt,
@@ -876,18 +876,18 @@ compat_50_netbsd32_setitimer(struct lwp
int error;
if ((u_int)which > ITIMER_PROF)
- return (EINVAL);
+ return EINVAL;
itv32 = SCARG_P32(uap, itv);
if (itv32) {
if ((error = copyin(itv32, &s32it, sizeof(s32it))))
- return (error);
+ return error;
netbsd32_to_itimerval50(&s32it, &aitv);
}
if (SCARG_P32(uap, oitv) != 0) {
SCARG(&getargs, which) = which;
SCARG(&getargs, itv) = SCARG(uap, oitv);
if ((error = compat_50_netbsd32_getitimer(l, &getargs, retval)) != 0)
- return (error);
+ return error;
}
if (itv32 == 0)
return 0;
@@ -946,7 +946,7 @@ compat_50_netbsd32_ntp_gettime(struct lw
*retval = (*vec_ntp_timestatus)();
}
- return (error);
+ return error;
}
#endif
Index: src/sys/compat/netbsd32/netbsd32_compat_50_quota.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_50_quota.c:1.1 src/sys/compat/netbsd32/netbsd32_compat_50_quota.c:1.2
--- src/sys/compat/netbsd32/netbsd32_compat_50_quota.c:1.1 Thu Mar 12 15:02:29 2020
+++ src/sys/compat/netbsd32/netbsd32_compat_50_quota.c Tue Jan 19 03:20:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_50_quota.c,v 1.1 2020/03/12 15:02:29 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_50_quota.c,v 1.2 2021/01/19 03:20:13 simonb Exp $ */
/*-
* Copyright (c) 2008, 2020 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50_quota.c,v 1.1 2020/03/12 15:02:29 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50_quota.c,v 1.2 2021/01/19 03:20:13 simonb Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -65,7 +65,7 @@ compat_50_netbsd32_quotactl(struct lwp *
NETBSD32TO64_UAP(cmd);
NETBSD32TO64_UAP(uid);
NETBSD32TOP_UAP(arg, void *);
- return (compat_50_sys_quotactl(l, &ua, retval));
+ return compat_50_sys_quotactl(l, &ua, retval);
}
static struct syscall_package compat_netbsd32_quota_50_syscalls[] = {
Index: src/sys/compat/netbsd32/netbsd32_rlimit.c
diff -u src/sys/compat/netbsd32/netbsd32_rlimit.c:1.1 src/sys/compat/netbsd32/netbsd32_rlimit.c:1.2
--- src/sys/compat/netbsd32/netbsd32_rlimit.c:1.1 Mon Dec 24 20:44:39 2018
+++ src/sys/compat/netbsd32/netbsd32_rlimit.c Tue Jan 19 03:20:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_rlimit.c,v 1.1 2018/12/24 20:44:39 mrg Exp $ */
+/* $NetBSD: netbsd32_rlimit.c,v 1.2 2021/01/19 03:20:13 simonb Exp $ */
/*
* Copyright (c) 1998, 2001, 2008, 2018 Matthew R. Green
@@ -31,7 +31,7 @@
/* rlimit netbsd32 related code */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_rlimit.c,v 1.1 2018/12/24 20:44:39 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_rlimit.c,v 1.2 2021/01/19 03:20:13 simonb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -104,7 +104,7 @@ netbsd32_setrlimit(struct lwp *l, const
error = copyin(SCARG_P32(uap, rlp), &alim, sizeof(struct rlimit));
if (error)
- return (error);
+ return error;
fixlimit(which, &alim);
Index: src/sys/compat/netbsd32/netbsd32_conv.h
diff -u src/sys/compat/netbsd32/netbsd32_conv.h:1.43 src/sys/compat/netbsd32/netbsd32_conv.h:1.44
--- src/sys/compat/netbsd32/netbsd32_conv.h:1.43 Mon Jan 18 23:14:22 2021
+++ src/sys/compat/netbsd32/netbsd32_conv.h Tue Jan 19 03:20:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_conv.h,v 1.43 2021/01/18 23:14:22 simonb Exp $ */
+/* $NetBSD: netbsd32_conv.h,v 1.44 2021/01/19 03:20:13 simonb Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -255,9 +255,9 @@ netbsd32_to_iovecin(const struct netbsd3
*/
for (i = 0; i < len; i++, iovp++, iov32p++) {
if ((error = copyin(&iov32p->iov_base, &iov_base, sizeof(iov_base))))
- return (error);
+ return error;
if ((error = copyin(&iov32p->iov_len, &iov_len, sizeof(iov_len))))
- return (error);
+ return error;
iovp->iov_base = (void *)(u_long)iov_base;
iovp->iov_len = (size_t)iov_len;
}
Index: src/sys/compat/netbsd32/netbsd32_exec_aout.c
diff -u src/sys/compat/netbsd32/netbsd32_exec_aout.c:1.30 src/sys/compat/netbsd32/netbsd32_exec_aout.c:1.31
--- src/sys/compat/netbsd32/netbsd32_exec_aout.c:1.30 Sat Aug 6 15:13:13 2016
+++ src/sys/compat/netbsd32/netbsd32_exec_aout.c Tue Jan 19 03:20:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_exec_aout.c,v 1.30 2016/08/06 15:13:13 maxv Exp $ */
+/* $NetBSD: netbsd32_exec_aout.c,v 1.31 2021/01/19 03:20:13 simonb Exp $ */
/* from: NetBSD: exec_aout.c,v 1.15 1996/09/26 23:34:46 cgd Exp */
/*
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_exec_aout.c,v 1.30 2016/08/06 15:13:13 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_exec_aout.c,v 1.31 2021/01/19 03:20:13 simonb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -169,7 +169,7 @@ netbsd32_exec_aout_prep_zmagic(struct lw
error = vn_marktext(epp->ep_vp);
if (error)
- return (error);
+ return error;
/* set up command for text segment */
NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_pagedvn, execp->a_text,
@@ -299,7 +299,7 @@ netbsd32_exec_aout_prep_oldzmagic(struct
error = vn_marktext(epp->ep_vp);
if (error)
- return (error);
+ return error;
/* set up command for text segment */
NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_pagedvn, execp->a_text,
Index: src/sys/compat/netbsd32/netbsd32_fs.c
diff -u src/sys/compat/netbsd32/netbsd32_fs.c:1.90 src/sys/compat/netbsd32/netbsd32_fs.c:1.91
--- src/sys/compat/netbsd32/netbsd32_fs.c:1.90 Sat May 23 23:42:42 2020
+++ src/sys/compat/netbsd32/netbsd32_fs.c Tue Jan 19 03:20:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_fs.c,v 1.90 2020/05/23 23:42:42 ad Exp $ */
+/* $NetBSD: netbsd32_fs.c,v 1.91 2021/01/19 03:20:13 simonb Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_fs.c,v 1.90 2020/05/23 23:42:42 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_fs.c,v 1.91 2021/01/19 03:20:13 simonb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -119,16 +119,16 @@ netbsd32_readv(struct lwp *l, const stru
file_t *fp;
if ((fp = fd_getfile(fd)) == NULL)
- return (EBADF);
+ return EBADF;
if ((fp->f_flag & FREAD) == 0) {
fd_putfile(fd);
- return (EBADF);
+ return EBADF;
}
- return (dofilereadv32(fd, fp,
+ return dofilereadv32(fd, fp,
(struct netbsd32_iovec *)SCARG_P32(uap, iovp),
- SCARG(uap, iovcnt), &fp->f_offset, FOF_UPDATE_OFFSET, retval));
+ SCARG(uap, iovcnt), &fp->f_offset, FOF_UPDATE_OFFSET, retval);
}
/* Damn thing copies in the iovec! */
@@ -210,7 +210,7 @@ done:
kmem_free(needfree, iovlen);
out:
fd_putfile(fd);
- return (error);
+ return error;
}
int
@@ -225,16 +225,16 @@ netbsd32_writev(struct lwp *l, const str
file_t *fp;
if ((fp = fd_getfile(fd)) == NULL)
- return (EBADF);
+ return EBADF;
if ((fp->f_flag & FWRITE) == 0) {
fd_putfile(fd);
- return (EBADF);
+ return EBADF;
}
- return (dofilewritev32(fd, fp,
+ return dofilewritev32(fd, fp,
(struct netbsd32_iovec *)SCARG_P32(uap, iovp),
- SCARG(uap, iovcnt), &fp->f_offset, FOF_UPDATE_OFFSET, retval));
+ SCARG(uap, iovcnt), &fp->f_offset, FOF_UPDATE_OFFSET, retval);
}
int
@@ -319,7 +319,7 @@ done:
kmem_free(needfree, iovlen);
out:
fd_putfile(fd);
- return (error);
+ return error;
}
/*
@@ -497,12 +497,12 @@ netbsd32___futimes50(struct lwp *l, cons
/* fd_getvnode() will use the descriptor for us */
if ((error = fd_getvnode(SCARG(uap, fd), &fp)) != 0)
- return (error);
+ return error;
error = do_sys_utimes(l, fp->f_vnode, NULL, 0, tvp, UIO_SYSSPACE);
fd_putfile(SCARG(uap, fd));
- return (error);
+ return error;
}
int
@@ -519,7 +519,7 @@ netbsd32___getdents30(struct lwp *l,
/* fd_getvnode() will use the descriptor for us */
if ((error = fd_getvnode(SCARG(uap, fd), &fp)) != 0)
- return (error);
+ return error;
if ((fp->f_flag & FREAD) == 0) {
error = EBADF;
goto out;
@@ -530,7 +530,7 @@ netbsd32___getdents30(struct lwp *l,
*retval = done;
out:
fd_putfile(SCARG(uap, fd));
- return (error);
+ return error;
}
int
@@ -568,10 +568,10 @@ netbsd32___stat50(struct lwp *l, const s
error = do_sys_stat(path, FOLLOW, &sb);
if (error)
- return (error);
+ return error;
netbsd32_from_stat(&sb, &sb32);
error = copyout(&sb32, SCARG_P32(uap, ub), sizeof(sb32));
- return (error);
+ return error;
}
int
@@ -590,7 +590,7 @@ netbsd32___fstat50(struct lwp *l, const
netbsd32_from_stat(&ub, &sb32);
error = copyout(&sb32, SCARG_P32(uap, sb), sizeof(sb32));
}
- return (error);
+ return error;
}
int
@@ -609,10 +609,10 @@ netbsd32___lstat50(struct lwp *l, const
error = do_sys_stat(path, NOFOLLOW, &sb);
if (error)
- return (error);
+ return error;
netbsd32_from_stat(&sb, &sb32);
error = copyout(&sb32, SCARG_P32(uap, ub), sizeof(sb32));
- return (error);
+ return error;
}
int
@@ -651,11 +651,11 @@ netbsd32_preadv(struct lwp *l, const str
int error, fd = SCARG(uap, fd);
if ((fp = fd_getfile(fd)) == NULL)
- return (EBADF);
+ return EBADF;
if ((fp->f_flag & FREAD) == 0) {
fd_putfile(fd);
- return (EBADF);
+ return EBADF;
}
vp = fp->f_vnode;
@@ -673,12 +673,12 @@ netbsd32_preadv(struct lwp *l, const str
if ((error = VOP_SEEK(vp, fp->f_offset, offset, fp->f_cred)) != 0)
goto out;
- return (dofilereadv32(fd, fp, SCARG_P32(uap, iovp),
- SCARG(uap, iovcnt), &offset, 0, retval));
+ return dofilereadv32(fd, fp, SCARG_P32(uap, iovp),
+ SCARG(uap, iovcnt), &offset, 0, retval);
out:
fd_putfile(fd);
- return (error);
+ return error;
}
int
@@ -697,11 +697,11 @@ netbsd32_pwritev(struct lwp *l, const st
int error, fd = SCARG(uap, fd);
if ((fp = fd_getfile(fd)) == NULL)
- return (EBADF);
+ return EBADF;
if ((fp->f_flag & FWRITE) == 0) {
fd_putfile(fd);
- return (EBADF);
+ return EBADF;
}
vp = fp->f_vnode;
@@ -719,12 +719,12 @@ netbsd32_pwritev(struct lwp *l, const st
if ((error = VOP_SEEK(vp, fp->f_offset, offset, fp->f_cred)) != 0)
goto out;
- return (dofilewritev32(fd, fp, SCARG_P32(uap, iovp),
- SCARG(uap, iovcnt), &offset, 0, retval));
+ return dofilewritev32(fd, fp, SCARG_P32(uap, iovp),
+ SCARG(uap, iovcnt), &offset, 0, retval);
out:
fd_putfile(fd);
- return (error);
+ return error;
}
/*
@@ -1381,9 +1381,9 @@ netbsd32_futimens(struct lwp *l, const s
/* fd_getvnode() will use the descriptor for us */
if ((error = fd_getvnode(SCARG(uap, fd), &fp)) != 0)
- return (error);
+ return error;
error = do_sys_utimensat(l, AT_FDCWD, fp->f_vnode, NULL, 0,
tsp, UIO_SYSSPACE);
fd_putfile(SCARG(uap, fd));
- return (error);
+ return error;
}
Index: src/sys/compat/netbsd32/netbsd32_rndpseudo_50.c
diff -u src/sys/compat/netbsd32/netbsd32_rndpseudo_50.c:1.5 src/sys/compat/netbsd32/netbsd32_rndpseudo_50.c:1.6
--- src/sys/compat/netbsd32/netbsd32_rndpseudo_50.c:1.5 Thu Apr 30 03:30:10 2020
+++ src/sys/compat/netbsd32/netbsd32_rndpseudo_50.c Tue Jan 19 03:20:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_rndpseudo_50.c,v 1.5 2020/04/30 03:30:10 riastradh Exp $ */
+/* $NetBSD: netbsd32_rndpseudo_50.c,v 1.6 2021/01/19 03:20:13 simonb Exp $ */
/*-
* Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_rndpseudo_50.c,v 1.5 2020/04/30 03:30:10 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_rndpseudo_50.c,v 1.6 2021/01/19 03:20:13 simonb Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -80,7 +80,7 @@ compat32_50_rnd_ioctl(struct file *fp, u
size_t count;
if (rst50_32->count > RND_MAXSTATCOUNT50)
- return (EINVAL);
+ return EINVAL;
rstbuf.start = rst50_32->start;
rstbuf.count = rst50_32->count;
Index: src/sys/compat/netbsd32/netbsd32_signal.c
diff -u src/sys/compat/netbsd32/netbsd32_signal.c:1.50 src/sys/compat/netbsd32/netbsd32_signal.c:1.51
--- src/sys/compat/netbsd32/netbsd32_signal.c:1.50 Mon Nov 18 11:01:41 2019
+++ src/sys/compat/netbsd32/netbsd32_signal.c Tue Jan 19 03:20:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_signal.c,v 1.50 2019/11/18 11:01:41 rin Exp $ */
+/* $NetBSD: netbsd32_signal.c,v 1.51 2021/01/19 03:20:13 simonb Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_signal.c,v 1.50 2019/11/18 11:01:41 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_signal.c,v 1.51 2021/01/19 03:20:13 simonb Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ktrace.h"
@@ -83,7 +83,7 @@ netbsd32_sigaction(struct lwp *l, const
NULL, 0);
if (error)
- return (error);
+ return error;
if (SCARG_P32(uap, osa)) {
NETBSD32PTR32(sa32.netbsd32_sa_handler, osa.sa_handler);
@@ -94,7 +94,7 @@ netbsd32_sigaction(struct lwp *l, const
return EFAULT;
}
- return (0);
+ return 0;
}
int
@@ -123,7 +123,7 @@ netbsd32___sigaction14(struct lwp *l, co
if (SCARG_P32(uap, nsa)) {
error = copyin(SCARG_P32(uap, nsa), &sa32, sizeof(sa32));
if (error)
- return (error);
+ return error;
nsa.sa_handler = NETBSD32PTR64(sa32.netbsd32_sa_handler);
nsa.sa_mask = sa32.netbsd32_sa_mask;
nsa.sa_flags = sa32.netbsd32_sa_flags;
@@ -133,16 +133,16 @@ netbsd32___sigaction14(struct lwp *l, co
SCARG_P32(uap, osa) ? &osa : 0,
NULL, 0);
if (error)
- return (error);
+ return error;
if (SCARG_P32(uap, osa)) {
NETBSD32PTR32(sa32.netbsd32_sa_handler, osa.sa_handler);
sa32.netbsd32_sa_mask = osa.sa_mask;
sa32.netbsd32_sa_flags = osa.sa_flags;
error = copyout(&sa32, SCARG_P32(uap, osa), sizeof(sa32));
if (error)
- return (error);
+ return error;
}
- return (0);
+ return 0;
}
/* ARGSUSED */
@@ -163,7 +163,7 @@ netbsd32___sigaction_sigtramp(struct lwp
if (SCARG_P32(uap, nsa)) {
error = copyin(SCARG_P32(uap, nsa), &sa32, sizeof(sa32));
if (error)
- return (error);
+ return error;
nsa.sa_handler = NETBSD32PTR64(sa32.netbsd32_sa_handler);
nsa.sa_mask = sa32.netbsd32_sa_mask;
nsa.sa_flags = sa32.netbsd32_sa_flags;
@@ -173,16 +173,16 @@ netbsd32___sigaction_sigtramp(struct lwp
SCARG_P32(uap, osa) ? &osa : 0,
SCARG_P32(uap, tramp), SCARG(uap, vers));
if (error)
- return (error);
+ return error;
if (SCARG_P32(uap, osa)) {
NETBSD32PTR32(sa32.netbsd32_sa_handler, osa.sa_handler);
sa32.netbsd32_sa_mask = osa.sa_mask;
sa32.netbsd32_sa_flags = osa.sa_flags;
error = copyout(&sa32, SCARG_P32(uap, osa), sizeof(sa32));
if (error)
- return (error);
+ return error;
}
- return (0);
+ return 0;
}
void
@@ -435,7 +435,7 @@ setucontext32(struct lwp *l, const ucont
error = cpu_setmcontext32(l, &ucp->uc_mcontext, ucp->uc_flags);
mutex_enter(p->p_lock);
if (error != 0)
- return (error);
+ return error;
l->l_ctxlink = (void *)(intptr_t)ucp->uc_link;
@@ -466,16 +466,16 @@ netbsd32_setcontext(struct lwp *l, const
error = copyin(SCARG_P32(uap, ucp), &uc, sizeof (uc));
if (error)
- return (error);
+ return error;
if (!(uc.uc_flags & _UC_CPU))
- return (EINVAL);
+ return EINVAL;
mutex_enter(p->p_lock);
error = setucontext32(l, &uc);
mutex_exit(p->p_lock);
if (error)
- return (error);
+ return error;
- return (EJUSTRETURN);
+ return EJUSTRETURN;
}
static int
Index: src/sys/compat/netbsd32/netbsd32_socket.c
diff -u src/sys/compat/netbsd32/netbsd32_socket.c:1.54 src/sys/compat/netbsd32/netbsd32_socket.c:1.55
--- src/sys/compat/netbsd32/netbsd32_socket.c:1.54 Mon Jan 18 23:14:22 2021
+++ src/sys/compat/netbsd32/netbsd32_socket.c Tue Jan 19 03:20:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_socket.c,v 1.54 2021/01/18 23:14:22 simonb Exp $ */
+/* $NetBSD: netbsd32_socket.c,v 1.55 2021/01/19 03:20:13 simonb Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_socket.c,v 1.54 2021/01/18 23:14:22 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_socket.c,v 1.55 2021/01/19 03:20:13 simonb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -105,12 +105,12 @@ copyout32_msg_control_mbuf(struct lwp *l
ktrkuser(mbuftypes[MT_CONTROL], cmsg, cmsg->cmsg_len);
error = copyout(&cmsg32, *q, MIN(i, sizeof(cmsg32)));
if (error)
- return (error);
+ return error;
if (i > CMSG32_LEN(0)) {
error = copyout(CMSG_DATA(cmsg), *q + CMSG32_LEN(0),
i - CMSG32_LEN(0));
if (error)
- return (error);
+ return error;
}
j = CMSG32_SPACE(cmsg->cmsg_len - CMSG_LEN(0));
if (*len >= j) {
@@ -233,7 +233,7 @@ netbsd32_recvmsg(struct lwp *l, const st
error = copyin(SCARG_P32(uap, msg), &msg32, sizeof(msg32));
if (error)
- return (error);
+ return error;
if ((error = msg_recv_copyin(l, &msg32, &msg, aiov)) != 0)
return error;
Index: src/sys/compat/netbsd32/netbsd32_sysctl.c
diff -u src/sys/compat/netbsd32/netbsd32_sysctl.c:1.44 src/sys/compat/netbsd32/netbsd32_sysctl.c:1.45
--- src/sys/compat/netbsd32/netbsd32_sysctl.c:1.44 Sat Mar 21 16:17:08 2020
+++ src/sys/compat/netbsd32/netbsd32_sysctl.c Tue Jan 19 03:20:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_sysctl.c,v 1.44 2020/03/21 16:17:08 pgoyette Exp $ */
+/* $NetBSD: netbsd32_sysctl.c,v 1.45 2021/01/19 03:20:13 simonb 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.44 2020/03/21 16:17:08 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysctl.c,v 1.45 2021/01/19 03:20:13 simonb Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ddb.h"
@@ -85,7 +85,7 @@ netbsd32_sysctl_kern_boottime(SYSCTLFN_A
node = *rnode;
node.sysctl_data = &bt32;
- return (sysctl_lookup(SYSCTLFN_CALL(&node)));
+ return sysctl_lookup(SYSCTLFN_CALL(&node));
}
/*
@@ -101,7 +101,7 @@ netbsd32_sysctl_vm_loadavg(SYSCTLFN_ARGS
node = *rnode;
node.sysctl_data = &av32;
- return (sysctl_lookup(SYSCTLFN_CALL(&node)));
+ return sysctl_lookup(SYSCTLFN_CALL(&node));
}
static int
@@ -217,7 +217,7 @@ netbsd32___sysctl(struct lwp *l, const s
error = copyin(oldlenp, &netbsd32_oldlen,
sizeof(netbsd32_oldlen));
if (error)
- return (error);
+ return error;
oldlen = netbsd32_oldlen;
}
savelen = oldlen;
@@ -229,10 +229,10 @@ netbsd32___sysctl(struct lwp *l, const s
* default main tree.
*/
if (SCARG(uap, namelen) > CTL_MAXNAME || SCARG(uap, namelen) < 1)
- return (EINVAL);
+ return EINVAL;
error = copyin(namep, &name[0], SCARG(uap, namelen) * sizeof(int));
if (error)
- return (error);
+ return error;
ktrmib(name, SCARG(uap, namelen));
@@ -264,5 +264,5 @@ netbsd32___sysctl(struct lwp *l, const s
if (error == 0 && oldp != NULL && savelen < oldlen)
error = ENOMEM;
- return (error);
+ return error;
}
Index: src/sys/compat/netbsd32/netbsd32_time.c
diff -u src/sys/compat/netbsd32/netbsd32_time.c:1.53 src/sys/compat/netbsd32/netbsd32_time.c:1.54
--- src/sys/compat/netbsd32/netbsd32_time.c:1.53 Sat Oct 5 14:19:53 2019
+++ src/sys/compat/netbsd32/netbsd32_time.c Tue Jan 19 03:20:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_time.c,v 1.53 2019/10/05 14:19:53 kamil Exp $ */
+/* $NetBSD: netbsd32_time.c,v 1.54 2021/01/19 03:20:13 simonb Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_time.c,v 1.53 2019/10/05 14:19:53 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_time.c,v 1.54 2021/01/19 03:20:13 simonb Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ntp.h"
@@ -83,7 +83,7 @@ netbsd32___ntp_gettime50(struct lwp *l,
*retval = (*vec_ntp_timestatus)();
}
- return (error);
+ return error;
}
int
@@ -101,7 +101,7 @@ netbsd32_ntp_adjtime(struct lwp *l, cons
return EINVAL;
if ((error = copyin(SCARG_P32(uap, tp), &ntv32, sizeof(ntv32))))
- return (error);
+ return error;
netbsd32_to_timex(&ntv32, &ntv);
@@ -114,7 +114,7 @@ netbsd32_ntp_adjtime(struct lwp *l, cons
if (modes != 0 && (error = kauth_authorize_system(l->l_cred,
KAUTH_SYSTEM_TIME, KAUTH_REQ_SYSTEM_TIME_NTPADJTIME, NULL, NULL,
NULL)))
- return (error);
+ return error;
(*vec_ntp_adjtime1)(&ntv);
@@ -143,18 +143,18 @@ netbsd32___setitimer50(struct lwp *l, co
int error;
if ((u_int)which > ITIMER_PROF)
- return (EINVAL);
+ return EINVAL;
itv32 = SCARG_P32(uap, itv);
if (itv32) {
if ((error = copyin(itv32, &s32it, sizeof(s32it))))
- return (error);
+ return error;
netbsd32_to_itimerval(&s32it, &aitv);
}
if (SCARG_P32(uap, oitv) != 0) {
SCARG(&getargs, which) = which;
SCARG(&getargs, itv) = SCARG(uap, oitv);
if ((error = netbsd32___getitimer50(l, &getargs, retval)) != 0)
- return (error);
+ return error;
}
if (itv32 == 0)
return 0;
@@ -199,7 +199,7 @@ netbsd32___gettimeofday50(struct lwp *l,
netbsd32_from_timeval(&atv, &tv32);
error = copyout(&tv32, SCARG_P32(uap, tp), sizeof(tv32));
if (error)
- return (error);
+ return error;
}
if (SCARG_P32(uap, tzp)) {
/*
@@ -210,7 +210,7 @@ netbsd32___gettimeofday50(struct lwp *l,
tzfake.tz_dsttime = 0;
error = copyout(&tzfake, SCARG_P32(uap, tzp), sizeof(tzfake));
}
- return (error);
+ return error;
}
int
@@ -267,7 +267,7 @@ netbsd32___adjtime50(struct lwp *l, cons
if ((error = kauth_authorize_system(l->l_cred,
KAUTH_SYSTEM_TIME, KAUTH_REQ_SYSTEM_TIME_ADJTIME, NULL, NULL,
NULL)) != 0)
- return (error);
+ return error;
if (SCARG_P32(uap, olddelta)) {
atv.tv_sec = time_adjtime / 1000000;
@@ -278,13 +278,13 @@ netbsd32___adjtime50(struct lwp *l, cons
}
error = copyout(&atv, SCARG_P32(uap, olddelta), sizeof(atv));
if (error)
- return (error);
+ return error;
}
if (SCARG_P32(uap, delta)) {
error = copyin(SCARG_P32(uap, delta), &atv, sizeof(atv));
if (error)
- return (error);
+ return error;
time_adjtime = (int64_t)atv.tv_sec * 1000000 + atv.tv_usec;
@@ -293,7 +293,7 @@ netbsd32___adjtime50(struct lwp *l, cons
time_adjusted |= 1;
}
- return (0);
+ return 0;
}
int
@@ -327,7 +327,7 @@ netbsd32___clock_settime50(struct lwp *l
int error;
if ((error = copyin(SCARG_P32(uap, tp), &ts32, sizeof(ts32))) != 0)
- return (error);
+ return error;
netbsd32_to_timespec(&ts32, &ats);
return clock_settime1(l->l_proc, SCARG(uap, clock_id), &ats, true);
@@ -369,7 +369,7 @@ netbsd32___nanosleep50(struct lwp *l, co
error = copyin(SCARG_P32(uap, rqtp), &ts32, sizeof(ts32));
if (error)
- return (error);
+ return error;
netbsd32_to_timespec(&ts32, &rqt);
error = nanosleep1(l, CLOCK_MONOTONIC, 0, &rqt,
@@ -469,7 +469,7 @@ netbsd32___timer_settime50(struct lwp *l
struct netbsd32_itimerspec its32;
if ((error = copyin(SCARG_P32(uap, value), &its32, sizeof(its32))) != 0)
- return (error);
+ return error;
netbsd32_to_timespec(&its32.it_interval, &value.it_interval);
netbsd32_to_timespec(&its32.it_value, &value.it_value);
