freebsd32: rename old SysV IPC types
Move the 32 from ...32_old to ..._old32 to aid automatic generation. Reviewed by: kevans
This commit is contained in:
parent
5d0d686940
commit
3b0cd7e503
@ -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);
|
||||
|
@ -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
|
||||
|
@ -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); }
|
||||
|
@ -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);
|
||||
|
@ -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) {
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user