From nobody Wed Nov 17 20:22:24 2021 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 40CAF1854DED; Wed, 17 Nov 2021 20:22:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HvZ9H49znz4qpH; Wed, 17 Nov 2021 20:22:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1A953277F8; Wed, 17 Nov 2021 20:22:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AHKMO3b059691; Wed, 17 Nov 2021 20:22:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AHKMOCL059690; Wed, 17 Nov 2021 20:22:24 GMT (envelope-from git) Date: Wed, 17 Nov 2021 20:22:24 GMT Message-Id: <202111172022.1AHKMOCL059690@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 3b0cd7e50346 - main - freebsd32: rename old SysV IPC types List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b0cd7e50346662540811f772c97d370af30c9c9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=3b0cd7e50346662540811f772c97d370af30c9c9 commit 3b0cd7e50346662540811f772c97d370af30c9c9 Author: Brooks Davis AuthorDate: 2021-11-17 20:12:23 +0000 Commit: Brooks Davis CommitDate: 2021-11-17 20:12:23 +0000 freebsd32: rename old SysV IPC types Move the 32 from ...32_old to ..._old32 to aid automatic generation. Reviewed by: kevans --- sys/compat/freebsd32/freebsd32_ipc.h | 18 +++++++++--------- sys/compat/freebsd32/freebsd32_proto.h | 4 ++-- sys/compat/freebsd32/syscalls.master | 4 ++-- sys/kern/sysv_ipc.c | 4 ++-- sys/kern/sysv_msg.c | 2 +- sys/kern/sysv_sem.c | 2 +- sys/kern/sysv_shm.c | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_ipc.h b/sys/compat/freebsd32/freebsd32_ipc.h index d1fa7f1cf8ca..6c34445e363b 100644 --- a/sys/compat/freebsd32/freebsd32_ipc.h +++ b/sys/compat/freebsd32/freebsd32_ipc.h @@ -130,7 +130,7 @@ struct shminfo32 { #if defined(COMPAT_FREEBSD4) || defined(COMPAT_FREEBSD5) || \ defined(COMPAT_FREEBSD6) || defined(COMPAT_FREEBSD7) -struct ipc_perm32_old { +struct ipc_perm_old32 { uint16_t cuid; uint16_t cgid; uint16_t uid; @@ -140,8 +140,8 @@ struct ipc_perm32_old { uint32_t key; }; -struct semid_ds32_old { - struct ipc_perm32_old sem_perm; +struct semid_ds_old32 { + struct ipc_perm_old32 sem_perm; uint32_t __sem_base; unsigned short sem_nsems; int32_t sem_otime; @@ -151,8 +151,8 @@ struct semid_ds32_old { int32_t sem_pad3[4]; }; -struct msqid_ds32_old { - struct ipc_perm32_old msg_perm; +struct msqid_ds_old32 { + struct ipc_perm_old32 msg_perm; uint32_t __msg_first; uint32_t __msg_last; uint32_t msg_cbytes; @@ -169,8 +169,8 @@ struct msqid_ds32_old { int32_t msg_pad4[4]; }; -struct shmid_ds32_old { - struct ipc_perm32_old shm_perm; +struct shmid_ds_old32 { + struct ipc_perm_old32 shm_perm; int32_t shm_segsz; pid_t shm_lpid; pid_t shm_cpid; @@ -187,10 +187,10 @@ union semun_old32 { uint32_t array; }; -void freebsd32_ipcperm_old_in(struct ipc_perm32_old *ip32, +void freebsd32_ipcperm_old_in(struct ipc_perm_old32 *ip32, struct ipc_perm *ip); void freebsd32_ipcperm_old_out(struct ipc_perm *ip, - struct ipc_perm32_old *ip32); + struct ipc_perm_old32 *ip32); #endif void freebsd32_ipcperm_in(struct ipc_perm32 *ip32, struct ipc_perm *ip); diff --git a/sys/compat/freebsd32/freebsd32_proto.h b/sys/compat/freebsd32/freebsd32_proto.h index a2682289407b..f261967fff76 100644 --- a/sys/compat/freebsd32/freebsd32_proto.h +++ b/sys/compat/freebsd32/freebsd32_proto.h @@ -1176,12 +1176,12 @@ struct freebsd7_freebsd32_semctl_args { struct freebsd7_freebsd32_msgctl_args { char msqid_l_[PADL_(int)]; int msqid; char msqid_r_[PADR_(int)]; char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)]; - char buf_l_[PADL_(struct msqid_ds32_old *)]; struct msqid_ds32_old * buf; char buf_r_[PADR_(struct msqid_ds32_old *)]; + char buf_l_[PADL_(struct msqid_ds_old32 *)]; struct msqid_ds_old32 * buf; char buf_r_[PADR_(struct msqid_ds_old32 *)]; }; struct freebsd7_freebsd32_shmctl_args { char shmid_l_[PADL_(int)]; int shmid; char shmid_r_[PADR_(int)]; char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)]; - char buf_l_[PADL_(struct shmid_ds32_old *)]; struct shmid_ds32_old * buf; char buf_r_[PADR_(struct shmid_ds32_old *)]; + char buf_l_[PADL_(struct shmid_ds_old32 *)]; struct shmid_ds_old32 * buf; char buf_r_[PADR_(struct shmid_ds_old32 *)]; }; #ifdef PAD64_REQUIRED #else diff --git a/sys/compat/freebsd32/syscalls.master b/sys/compat/freebsd32/syscalls.master index 1a4bf7b30e7b..779af9704345 100644 --- a/sys/compat/freebsd32/syscalls.master +++ b/sys/compat/freebsd32/syscalls.master @@ -428,7 +428,7 @@ 223 AUE_NULL OBSOL semconfig 224 AUE_MSGCTL COMPAT7|NOSTD { int freebsd32_msgctl( \ int msqid, int cmd, \ - struct msqid_ds32_old *buf); } + struct msqid_ds_old32 *buf); } 225 AUE_MSGGET NOSTD|NOPROTO { int msgget(key_t key, int msgflg); } 226 AUE_MSGSND NOSTD { int freebsd32_msgsnd(int msqid, const void *msgp, \ size_t msgsz, int msgflg); } @@ -438,7 +438,7 @@ int shmflg); } 229 AUE_SHMCTL COMPAT7|NOSTD { int freebsd32_shmctl( \ int shmid, int cmd, \ - struct shmid_ds32_old *buf); } + struct shmid_ds_old32 *buf); } 230 AUE_SHMDT NOSTD|NOPROTO { int shmdt(const void *shmaddr); } 231 AUE_SHMGET NOSTD|NOPROTO { int shmget(key_t key, size_t size, \ int shmflg); } diff --git a/sys/kern/sysv_ipc.c b/sys/kern/sysv_ipc.c index 884ea9a7111f..4a7d79ad23b3 100644 --- a/sys/kern/sysv_ipc.c +++ b/sys/kern/sysv_ipc.c @@ -196,7 +196,7 @@ ipcperm_new2old(struct ipc_perm *new, struct ipc_perm_old *old) #if defined(COMPAT_FREEBSD4) || defined(COMPAT_FREEBSD5) || \ defined(COMPAT_FREEBSD6) || defined(COMPAT_FREEBSD7) void -freebsd32_ipcperm_old_in(struct ipc_perm32_old *ip32, struct ipc_perm *ip) +freebsd32_ipcperm_old_in(struct ipc_perm_old32 *ip32, struct ipc_perm *ip) { CP(*ip32, *ip, cuid); @@ -209,7 +209,7 @@ freebsd32_ipcperm_old_in(struct ipc_perm32_old *ip32, struct ipc_perm *ip) } void -freebsd32_ipcperm_old_out(struct ipc_perm *ip, struct ipc_perm32_old *ip32) +freebsd32_ipcperm_old_out(struct ipc_perm *ip, struct ipc_perm_old32 *ip32) { CP(*ip, *ip32, cuid); diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c index 435235f0384d..917c89315401 100644 --- a/sys/kern/sysv_msg.c +++ b/sys/kern/sysv_msg.c @@ -1704,7 +1704,7 @@ freebsd7_freebsd32_msgctl(struct thread *td, struct freebsd7_freebsd32_msgctl_args *uap) { struct msqid_ds msqbuf; - struct msqid_ds32_old msqbuf32; + struct msqid_ds_old32 msqbuf32; int error; if (uap->cmd == IPC_SET) { diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c index 274226481fa7..5c8b2b069d35 100644 --- a/sys/kern/sysv_sem.c +++ b/sys/kern/sysv_sem.c @@ -1867,7 +1867,7 @@ int freebsd7_freebsd32_semctl(struct thread *td, struct freebsd7_freebsd32_semctl_args *uap) { - struct semid_ds32_old dsbuf32; + struct semid_ds_old32 dsbuf32; struct semid_ds dsbuf; union semun semun; union semun_old32 arg; diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c index 2e7ae927dcc3..7ba6c1187bc7 100644 --- a/sys/kern/sysv_shm.c +++ b/sys/kern/sysv_shm.c @@ -1431,7 +1431,7 @@ freebsd7_freebsd32_shmctl(struct thread *td, struct shminfo shminfo; } u; union { - struct shmid_ds32_old shmid_ds32; + struct shmid_ds_old32 shmid_ds32; struct shm_info32 shm_info32; struct shminfo32 shminfo32; } u32;