git: f1a14110892e - main - freebsd32: rename fstat argument to match default abi

[Brooks Davis]

The branch main has been updated by brooks:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=f1a14110892eae6a431bb82da55409be82273bad

commit f1a14110892eae6a431bb82da55409be82273bad
Author:     Brooks Davis <bro...@freebsd.org>
AuthorDate: 2021-11-17 20:12:24 +0000
Commit:     Brooks Davis <bro...@freebsd.org>
CommitDate: 2021-11-17 20:12:24 +0000

    freebsd32: rename fstat argument to match default abi
    
    Reviewed by:    kevans
---
 sys/compat/freebsd32/freebsd32_misc.c          | 2 +-
 sys/compat/freebsd32/freebsd32_proto.h         | 2 +-
 sys/compat/freebsd32/freebsd32_systrace_args.c | 2 +-
 sys/compat/freebsd32/syscalls.master           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys/compat/freebsd32/freebsd32_misc.c 
b/sys/compat/freebsd32/freebsd32_misc.c
index da7fd1939324..902543144dd4 100644
--- a/sys/compat/freebsd32/freebsd32_misc.c
+++ b/sys/compat/freebsd32/freebsd32_misc.c
@@ -2231,7 +2231,7 @@ freebsd32_fstat(struct thread *td, struct 
freebsd32_fstat_args *uap)
        if (error)
                return (error);
        copy_stat(&ub, &ub32);
-       error = copyout(&ub32, uap->ub, sizeof(ub32));
+       error = copyout(&ub32, uap->sb, sizeof(ub32));
        return (error);
 }
 
diff --git a/sys/compat/freebsd32/freebsd32_proto.h 
b/sys/compat/freebsd32/freebsd32_proto.h
index f261967fff76..42be42ebc113 100644
--- a/sys/compat/freebsd32/freebsd32_proto.h
+++ b/sys/compat/freebsd32/freebsd32_proto.h
@@ -681,7 +681,7 @@ struct freebsd32_utimensat_args {
 };
 struct freebsd32_fstat_args {
        char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-       char ub_l_[PADL_(struct stat32 *)]; struct stat32 * ub; char 
ub_r_[PADR_(struct stat32 *)];
+       char sb_l_[PADL_(struct stat32 *)]; struct stat32 * sb; char 
sb_r_[PADR_(struct stat32 *)];
 };
 struct freebsd32_fstatat_args {
        char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c 
b/sys/compat/freebsd32/freebsd32_systrace_args.c
index fdac5c495468..26829259cd0e 100644
--- a/sys/compat/freebsd32/freebsd32_systrace_args.c
+++ b/sys/compat/freebsd32/freebsd32_systrace_args.c
@@ -3127,7 +3127,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, 
int *n_args)
        case 551: {
                struct freebsd32_fstat_args *p = params;
                iarg[0] = p->fd; /* int */
-               uarg[1] = (intptr_t)p->ub; /* struct stat32 * */
+               uarg[1] = (intptr_t)p->sb; /* struct stat32 * */
                *n_args = 2;
                break;
        }
diff --git a/sys/compat/freebsd32/syscalls.master 
b/sys/compat/freebsd32/syscalls.master
index 779af9704345..23c34350a67d 100644
--- a/sys/compat/freebsd32/syscalls.master
+++ b/sys/compat/freebsd32/syscalls.master
@@ -1101,7 +1101,7 @@
 549    AUE_NULL        OBSOL   numa_setaffinity
 550    AUE_FSYNC       NOPROTO { int fdatasync(int fd); }
 551    AUE_FSTAT       STD     { int freebsd32_fstat(int fd, \
-                                   struct stat32 *ub); }
+                                   struct stat32 *sb); }
 552    AUE_FSTATAT     STD     { int freebsd32_fstatat(int fd, \
                                    const char *path, struct stat32 *buf, \
                                    int flag); }