Page MenuHomeFreeBSD

D15816.id43792.diff
No OneTemporary

D15816.id43792.diff

Index: sys/kern/kern_xxx.c
===================================================================
--- sys/kern/kern_xxx.c
+++ sys/kern/kern_xxx.c
@@ -51,14 +51,14 @@
#if defined(COMPAT_43)
#ifndef _SYS_SYSPROTO_H_
-struct gethostname_args {
+struct ogethostname_args {
char *hostname;
u_int len;
};
#endif
/* ARGSUSED */
int
-ogethostname(struct thread *td, struct gethostname_args *uap)
+ogethostname(struct thread *td, struct ogethostname_args *uap)
{
int name[2];
size_t len = uap->len;
@@ -70,14 +70,14 @@
}
#ifndef _SYS_SYSPROTO_H_
-struct sethostname_args {
+struct osethostname_args {
char *hostname;
u_int len;
};
#endif
/* ARGSUSED */
int
-osethostname(struct thread *td, struct sethostname_args *uap)
+osethostname(struct thread *td, struct osethostname_args *uap)
{
int name[2];
@@ -188,7 +188,7 @@
static char bsdi_strings[80]; /* It had better be less than this! */
#ifndef _SYS_SYSPROTO_H_
-struct getkerninfo_args {
+struct ogetkerninfo_args {
int op;
char *where;
size_t *size;
@@ -196,7 +196,7 @@
};
#endif
int
-ogetkerninfo(struct thread *td, struct getkerninfo_args *uap)
+ogetkerninfo(struct thread *td, struct ogetkerninfo_args *uap)
{
int error, name[6];
size_t size;
Index: sys/kern/syscalls.master
===================================================================
--- sys/kern/syscalls.master
+++ sys/kern/syscalls.master
@@ -216,9 +216,8 @@
63 AUE_NULL COMPAT { int getkerninfo(int op, \
_Out_writes_bytes_opt(*size) char *where, \
_Inout_opt_ size_t *size, \
- int arg); } getkerninfo getkerninfo_args int
-64 AUE_NULL COMPAT { int getpagesize(void); } getpagesize \
- getpagesize_args int
+ int arg); }
+64 AUE_NULL COMPAT { int getpagesize(void); }
65 AUE_MSYNC STD { int msync(_In_ void *addr, size_t len, \
int flags); }
66 AUE_VFORK STD { int vfork(void); }
@@ -257,12 +256,10 @@
_Out_ struct itimerval *itv); }
87 AUE_SYSCTL COMPAT { int gethostname( \
_Out_writes_z_(len) char *hostname, \
- u_int len); } gethostname \
- gethostname_args int
+ u_int len); }
88 AUE_SYSCTL COMPAT { int sethostname( \
_In_reads_z_(len) char *hostname, \
- u_int len); } sethostname \
- sethostname_args int
+ u_int len); }
89 AUE_GETDTABLESIZE STD { int getdtablesize(void); }
90 AUE_DUP2 STD { int dup2(u_int from, u_int to); }
91 AUE_NULL UNIMPL getdopt
@@ -283,10 +280,10 @@
98 AUE_CONNECT STD { int connect(int s, \
_In_reads_bytes_(namelen) caddr_t name, \
int namelen); }
-99 AUE_ACCEPT COMPAT|NOARGS { int accept(int s, \
+99 AUE_ACCEPT COMPAT { int accept(int s, \
_Out_writes_bytes_opt_(*anamelen) \
- caddr_t name, int *anamelen); } \
- accept accept_args int
+ struct sockaddr * __restrict name, \
+ int *anamelen); }
100 AUE_GETPRIORITY STD { int getpriority(int which, int who); }
101 AUE_SEND COMPAT { int send(int s, \
_In_reads_bytes_(len) caddr_t buf, \
Index: sys/kern/uipc_syscalls.c
===================================================================
--- sys/kern/uipc_syscalls.c
+++ sys/kern/uipc_syscalls.c
@@ -453,9 +453,7 @@
#ifdef COMPAT_OLDSOCK
int
-oaccept(td, uap)
- struct thread *td;
- struct accept_args *uap;
+oaccept(struct thread *td, struct oaccept_args *uap)
{
return (accept1(td, uap->s, uap->name, uap->anamelen,
Index: sys/vm/vm_mmap.c
===================================================================
--- sys/vm/vm_mmap.c
+++ sys/vm/vm_mmap.c
@@ -129,14 +129,8 @@
}
#if defined(COMPAT_43)
-#ifndef _SYS_SYSPROTO_H_
-struct getpagesize_args {
- int dummy;
-};
-#endif
-
int
-ogetpagesize(struct thread *td, struct getpagesize_args *uap)
+ogetpagesize(struct thread *td, struct ogetpagesize_args *uap)
{
td->td_retval[0] = PAGE_SIZE;

File Metadata

Mime Type
text/plain
Expires
Tue, Nov 26, 10:55 AM (4 h, 27 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14859895
Default Alt Text
D15816.id43792.diff (3 KB)

Event Timeline