The branch main has been updated by brooks:
URL:
https://cgit.FreeBSD.org/src/commit/?id=aef154d3f24f167b834d2f9d135b3d4ff8f7d812
commit aef154d3f24f167b834d2f9d135b3d4ff8f7d812
Author: Brooks Davis <bro...@freebsd.org>
AuthorDate: 2021-11-17 20:12:26 +0000
Commit: Brooks Davis <bro...@freebsd.org>
CommitDate: 2021-11-17 20:12:26 +0000
freebsd32: use __socklen_t consistently
Reviewed by: kevans
---
sys/compat/freebsd32/freebsd32_systrace_args.c | 40 +++++++++++++-------------
sys/compat/freebsd32/syscalls.master | 20 ++++++-------
2 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c
b/sys/compat/freebsd32/freebsd32_systrace_args.c
index 611a59f1328e..1d39fc026802 100644
--- a/sys/compat/freebsd32/freebsd32_systrace_args.c
+++ b/sys/compat/freebsd32/freebsd32_systrace_args.c
@@ -213,7 +213,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int
*n_args)
struct accept_args *p = params;
iarg[0] = p->s; /* int */
uarg[1] = (intptr_t)p->name; /* struct sockaddr * */
- uarg[2] = (intptr_t)p->anamelen; /* int * */
+ uarg[2] = (intptr_t)p->anamelen; /* __socklen_t * */
*n_args = 3;
break;
}
@@ -222,7 +222,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int
*n_args)
struct getpeername_args *p = params;
iarg[0] = p->fdes; /* int */
uarg[1] = (intptr_t)p->asa; /* struct sockaddr * */
- uarg[2] = (intptr_t)p->alen; /* int * */
+ uarg[2] = (intptr_t)p->alen; /* __socklen_t * */
*n_args = 3;
break;
}
@@ -231,7 +231,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int
*n_args)
struct getsockname_args *p = params;
iarg[0] = p->fdes; /* int */
uarg[1] = (intptr_t)p->asa; /* struct sockaddr * */
- uarg[2] = (intptr_t)p->alen; /* int * */
+ uarg[2] = (intptr_t)p->alen; /* __socklen_t * */
*n_args = 3;
break;
}
@@ -586,7 +586,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int
*n_args)
struct connect_args *p = params;
iarg[0] = p->s; /* int */
uarg[1] = (intptr_t)p->name; /* const struct sockaddr * */
- iarg[2] = p->namelen; /* int */
+ iarg[2] = p->namelen; /* __socklen_t */
*n_args = 3;
break;
}
@@ -603,7 +603,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int
*n_args)
struct bind_args *p = params;
iarg[0] = p->s; /* int */
uarg[1] = (intptr_t)p->name; /* const struct sockaddr * */
- iarg[2] = p->namelen; /* int */
+ iarg[2] = p->namelen; /* __socklen_t */
*n_args = 3;
break;
}
@@ -614,7 +614,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int
*n_args)
iarg[1] = p->level; /* int */
iarg[2] = p->name; /* int */
uarg[3] = (intptr_t)p->val; /* const void * */
- iarg[4] = p->valsize; /* int */
+ iarg[4] = p->valsize; /* __socklen_t */
*n_args = 5;
break;
}
@@ -649,7 +649,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int
*n_args)
iarg[1] = p->level; /* int */
iarg[2] = p->name; /* int */
uarg[3] = (intptr_t)p->val; /* void * */
- uarg[4] = (intptr_t)p->avalsize; /* int * */
+ uarg[4] = (intptr_t)p->avalsize; /* __socklen_t * */
*n_args = 5;
break;
}
@@ -744,7 +744,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int
*n_args)
uarg[2] = p->len; /* size_t */
iarg[3] = p->flags; /* int */
uarg[4] = (intptr_t)p->to; /* const struct sockaddr * */
- iarg[5] = p->tolen; /* int */
+ iarg[5] = p->tolen; /* __socklen_t */
*n_args = 6;
break;
}
@@ -3045,7 +3045,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg,
int *n_args)
iarg[0] = p->fd; /* int */
iarg[1] = p->s; /* int */
uarg[2] = (intptr_t)p->name; /* const struct sockaddr * */
- iarg[3] = p->namelen; /* int */
+ iarg[3] = p->namelen; /* __socklen_t */
*n_args = 4;
break;
}
@@ -3055,7 +3055,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg,
int *n_args)
iarg[0] = p->fd; /* int */
iarg[1] = p->s; /* int */
uarg[2] = (intptr_t)p->name; /* const struct sockaddr * */
- iarg[3] = p->namelen; /* int */
+ iarg[3] = p->namelen; /* __socklen_t */
*n_args = 4;
break;
}
@@ -3787,7 +3787,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
p = "userland struct sockaddr *";
break;
case 2:
- p = "userland int *";
+ p = "userland __socklen_t *";
break;
default:
break;
@@ -3803,7 +3803,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
p = "userland struct sockaddr *";
break;
case 2:
- p = "userland int *";
+ p = "userland __socklen_t *";
break;
default:
break;
@@ -3819,7 +3819,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
p = "userland struct sockaddr *";
break;
case 2:
- p = "userland int *";
+ p = "userland __socklen_t *";
break;
default:
break;
@@ -4371,7 +4371,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
p = "userland const struct sockaddr *";
break;
case 2:
- p = "int";
+ p = "__socklen_t";
break;
default:
break;
@@ -4400,7 +4400,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
p = "userland const struct sockaddr *";
break;
case 2:
- p = "int";
+ p = "__socklen_t";
break;
default:
break;
@@ -4422,7 +4422,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
p = "userland const void *";
break;
case 4:
- p = "int";
+ p = "__socklen_t";
break;
default:
break;
@@ -4483,7 +4483,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
p = "userland void *";
break;
case 4:
- p = "userland int *";
+ p = "userland __socklen_t *";
break;
default:
break;
@@ -4647,7 +4647,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
p = "userland const struct sockaddr *";
break;
case 5:
- p = "int";
+ p = "__socklen_t";
break;
default:
break;
@@ -8571,7 +8571,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
p = "userland const struct sockaddr *";
break;
case 3:
- p = "int";
+ p = "__socklen_t";
break;
default:
break;
@@ -8590,7 +8590,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
p = "userland const struct sockaddr *";
break;
case 3:
- p = "int";
+ p = "__socklen_t";
break;
default:
break;
diff --git a/sys/compat/freebsd32/syscalls.master
b/sys/compat/freebsd32/syscalls.master
index 517c0aa6ebbd..5167cdfb5574 100644
--- a/sys/compat/freebsd32/syscalls.master
+++ b/sys/compat/freebsd32/syscalls.master
@@ -115,13 +115,13 @@
struct sockaddr *from, \
__socklen_t *fromlenaddr); }
30 AUE_ACCEPT NOPROTO { int accept(int s, struct sockaddr *name, \
- int *anamelen); }
+ __socklen_t *anamelen); }
31 AUE_GETPEERNAME NOPROTO { int getpeername(int fdes, \
struct sockaddr *asa, \
- int *alen); }
+ __socklen_t *alen); }
32 AUE_GETSOCKNAME NOPROTO { int getsockname(int fdes, \
struct sockaddr *asa, \
- int *alen); }
+ __socklen_t *alen); }
33 AUE_ACCESS NOPROTO { int access(const char *path, int amode); }
34 AUE_CHFLAGS NOPROTO { int chflags(const char *path, u_long flags); }
35 AUE_FCHFLAGS NOPROTO { int fchflags(int fd, u_long flags); }
@@ -221,7 +221,7 @@
int protocol); }
98 AUE_CONNECT NOPROTO { int connect(int s, \
const struct sockaddr *name, \
- int namelen); }
+ __socklen_t namelen); }
99 AUE_NULL COMPAT|NOPROTO { int accept(int s, \
struct sockaddr *name, \
__socklen_t *anamelen); }
@@ -233,9 +233,9 @@
103 AUE_SIGRETURN COMPAT { int freebsd32_sigreturn( \
struct ia32_sigcontext3 *sigcntxp); }
104 AUE_BIND NOPROTO { int bind(int s, const struct sockaddr *name, \
- int namelen); }
+ __socklen_t namelen); }
105 AUE_SETSOCKOPT NOPROTO { int setsockopt(int s, int level, \
- int name, const void *val, int valsize); }
+ int name, const void *val, __socklen_t
valsize); }
106 AUE_LISTEN NOPROTO { int listen(int s, int backlog); }
107 AUE_NULL OBSOL vtimes
108 AUE_O_SIGVEC COMPAT { int freebsd32_sigvec(int signum, \
@@ -258,7 +258,7 @@
117 AUE_GETRUSAGE STD { int freebsd32_getrusage(int who, \
struct rusage32 *rusage); }
118 AUE_GETSOCKOPT NOPROTO { int getsockopt(int s, int level, \
- int name, void *val, int *avalsize); }
+ int name, void *val, __socklen_t
*avalsize); }
119 AUE_NULL RESERVED
120 AUE_READV STD { int freebsd32_readv(int fd, \
struct iovec32 *iovp, u_int iovcnt); }
@@ -283,7 +283,7 @@
133 AUE_SENDTO NOPROTO { int sendto(int s, const void *buf, \
size_t len, int flags, \
const struct sockaddr *to, \
- int tolen); }
+ __socklen_t tolen); }
134 AUE_SHUTDOWN NOPROTO { int shutdown(int s, int how); }
135 AUE_SOCKETPAIR NOPROTO { int socketpair(int domain, int type, \
int protocol, int *rsv); }
@@ -1088,10 +1088,10 @@
uint32_t *fcntlrightsp); }
538 AUE_BINDAT NOPROTO { int bindat(int fd, int s, \
const struct sockaddr *name, \
- int namelen); }
+ __socklen_t namelen); }
539 AUE_CONNECTAT NOPROTO { int connectat(int fd, int s, \
const struct sockaddr *name, \
- int namelen); }
+ __socklen_t namelen); }
540 AUE_CHFLAGSAT NOPROTO { int chflagsat(int fd, const char *path, \
u_long flags, int atflag); }
541 AUE_ACCEPT NOPROTO { int accept4(int s, \
