d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove caddr_t.

Browse Source
This commit is contained in:
Alfred Perlstein 2002-07-22 16:12:55 +00:00
parent 190c185e22
commit 2cc593fd8e
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=100511
4 changed files with 38 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/kern/sysv_msg.c
View File

@ -410,7 +410,7 @@ msgctl(td, uap)
msqptr->msg_qbytes = 0; /* Mark it as free */
wakeup((caddr_t)msqptr);
wakeup(msqptr);
}
break;
@ -454,8 +454,7 @@ msgctl(td, uap)
#endif
goto done2;
}
error = copyout((caddr_t)msqptr, user_msqptr,
sizeof(struct msqid_ds));
error = copyout(msqptr, user_msqptr, sizeof(struct msqid_ds));
break;
default:
@ -733,7 +732,7 @@ msgsnd(td, uap)
#ifdef MSG_DEBUG_OK
printf("goodnight\n");
#endif
error = tsleep((caddr_t)msqptr, (PZERO - 4) | PCATCH,
error = tsleep(msqptr, (PZERO - 4) | PCATCH,
"msgwait", 0);
#ifdef MSG_DEBUG_OK
printf("good morning, error=%d\n", error);
@ -835,7 +834,7 @@ msgsnd(td, uap)
#endif
msg_freehdr(msghdr);
msqptr->msg_perm.mode &= ~MSG_LOCKED;
wakeup((caddr_t)msqptr);
wakeup(msqptr);
goto done2;
}
user_msgp = (char *)user_msgp + sizeof(msghdr->msg_type);
@ -847,7 +846,7 @@ msgsnd(td, uap)
if (msghdr->msg_type < 1) {
msg_freehdr(msghdr);
msqptr->msg_perm.mode &= ~MSG_LOCKED;
wakeup((caddr_t)msqptr);
wakeup(msqptr);
#ifdef MSG_DEBUG_OK
printf("mtype (%d) < 1\n", msghdr->msg_type);
#endif
@ -877,7 +876,7 @@ msgsnd(td, uap)
#endif
msg_freehdr(msghdr);
msqptr->msg_perm.mode &= ~MSG_LOCKED;
wakeup((caddr_t)msqptr);
wakeup(msqptr);
goto done2;
}
msgsz -= tlen;
@ -899,7 +898,7 @@ msgsnd(td, uap)
if (msqptr->msg_qbytes == 0) {
msg_freehdr(msghdr);
wakeup((caddr_t)msqptr);
wakeup(msqptr);
error = EIDRM;
goto done2;
}
@ -922,7 +921,7 @@ msgsnd(td, uap)
msqptr->msg_lspid = td->td_proc->p_pid;
msqptr->msg_stime = time_second;
wakeup((caddr_t)msqptr);
wakeup(msqptr);
td->td_retval[0] = 0;
done2:
mtx_unlock(&Giant);
@ -1110,8 +1109,7 @@ msgrcv(td, uap)
#ifdef MSG_DEBUG_OK
printf("msgrcv: goodnight\n");
#endif
error = tsleep((caddr_t)msqptr, (PZERO - 4) | PCATCH, "msgwait",
0);
error = tsleep(msqptr, (PZERO - 4) | PCATCH, "msgwait", 0);
#ifdef MSG_DEBUG_OK
printf("msgrcv: good morning (error=%d)\n", error);
#endif
@ -1166,14 +1164,14 @@ msgrcv(td, uap)
* Return the type to the user.
*/
error = copyout((caddr_t)&(msghdr->msg_type), user_msgp,
error = copyout(&(msghdr->msg_type), user_msgp,
sizeof(msghdr->msg_type));
if (error != 0) {
#ifdef MSG_DEBUG_OK
printf("error (%d) copying out message type\n", error);
#endif
msg_freehdr(msghdr);
wakeup((caddr_t)msqptr);
wakeup(msqptr);
goto done2;
}
user_msgp = (char *)user_msgp + sizeof(msghdr->msg_type);
@ -1194,7 +1192,7 @@ msgrcv(td, uap)
panic("next too low #3");
if (next >= msginfo.msgseg)
panic("next out of range #3");
error = copyout((caddr_t)&msgpool[next * msginfo.msgssz],
error = copyout(&msgpool[next * msginfo.msgssz],
user_msgp, tlen);
if (error != 0) {
#ifdef MSG_DEBUG_OK
@ -1202,7 +1200,7 @@ msgrcv(td, uap)
error);
#endif
msg_freehdr(msghdr);
wakeup((caddr_t)msqptr);
wakeup(msqptr);
goto done2;
}
user_msgp = (char *)user_msgp + tlen;
@ -1214,7 +1212,7 @@ msgrcv(td, uap)
*/
msg_freehdr(msghdr);
wakeup((caddr_t)msqptr);
wakeup(msqptr);
td->td_retval[0] = msgsz;
done2:
mtx_unlock(&Giant);

25
sys/kern/sysv_sem.c
View File

@ -495,8 +495,7 @@ __semctl(td, uap)
UGAR(error);
if ((error = copyin(arg, &real_arg, sizeof(real_arg))) != 0)
UGAR(error);
error = copyout((caddr_t)semaptr, real_arg.buf,
sizeof(struct semid_ds));
error = copyout(semaptr, real_arg.buf, sizeof(struct semid_ds));
rval = IXSEQ_TO_IPCID(semid,semaptr->sem_perm);
if (error == 0)
td->td_retval[0] = rval;
@ -535,7 +534,7 @@ __semctl(td, uap)
}
semaptr->sem_perm.mode = 0;
semundo_clear(semid, -1);
wakeup((caddr_t)semaptr);
wakeup(semaptr);
break;
case IPC_SET:
@ -543,8 +542,7 @@ __semctl(td, uap)
goto done2;
if ((error = copyin(arg, &real_arg, sizeof(real_arg))) != 0)
goto done2;
if ((error = copyin(real_arg.buf, (caddr_t)&sbuf,
sizeof(sbuf))) != 0) {
if ((error = copyin(real_arg.buf, &sbuf, sizeof(sbuf))) != 0) {
goto done2;
}
semaptr->sem_perm.uid = sbuf.sem_perm.uid;
@ -559,7 +557,7 @@ __semctl(td, uap)
goto done2;
if ((error = copyin(arg, &real_arg, sizeof(real_arg))) != 0)
goto done2;
error = copyout((caddr_t)semaptr, real_arg.buf,
error = copyout(semaptr, real_arg.buf,
sizeof(struct semid_ds));
break;
@ -599,7 +597,7 @@ __semctl(td, uap)
if ((error = copyin(arg, &real_arg, sizeof(real_arg))) != 0)
goto done2;
for (i = 0; i < semaptr->sem_nsems; i++) {
error = copyout((caddr_t)&semaptr->sem_base[i].semval,
error = copyout(&semaptr->sem_base[i].semval,
&real_arg.array[i], sizeof(real_arg.array[0]));
if (error != 0)
break;
@ -631,7 +629,7 @@ __semctl(td, uap)
}
semaptr->sem_base[semnum].semval = real_arg.val;
semundo_clear(semid, semnum);
wakeup((caddr_t)semaptr);
wakeup(semaptr);
break;
case SETALL:
@ -641,7 +639,7 @@ __semctl(td, uap)
goto done2;
for (i = 0; i < semaptr->sem_nsems; i++) {
error = copyin(&real_arg.array[i],
(caddr_t)&usval, sizeof(real_arg.array[0]));
&usval, sizeof(real_arg.array[0]));
if (error != 0)
break;
if (usval > seminfo.semvmx) {
@ -651,7 +649,7 @@ __semctl(td, uap)
semaptr->sem_base[i].semval = usval;
}
semundo_clear(semid, -1);
wakeup((caddr_t)semaptr);
wakeup(semaptr);
break;
default:
@ -983,8 +981,7 @@ semop(td, uap)
#ifdef SEM_DEBUG
printf("semop: good night!\n");
#endif
error = tsleep((caddr_t)semaptr, (PZERO - 4) | PCATCH,
"semwait", 0);
error = tsleep(semaptr, (PZERO - 4) | PCATCH, "semwait", 0);
#ifdef SEM_DEBUG
printf("semop: good morning (error=%d)!\n", error);
#endif
@ -1086,7 +1083,7 @@ semop(td, uap)
#ifdef SEM_DEBUG
printf("semop: doing wakeup\n");
#endif
wakeup((caddr_t)semaptr);
wakeup(semaptr);
#ifdef SEM_DEBUG
printf("semop: back from wakeup\n");
#endif
@ -1167,7 +1164,7 @@ semexit_myhook(p)
} else
semaptr->sem_base[semnum].semval += adjval;
wakeup((caddr_t)semaptr);
wakeup(semaptr);
#ifdef SEM_DEBUG
printf("semexit: back from wakeup\n");
#endif

24
sys/kern/sysv_shm.c
View File

@ -205,7 +205,7 @@ shm_deallocate_segment(shmseg)
shm_handle = shmseg->shm_internal;
vm_object_deallocate(shm_handle->shm_object);
free((caddr_t)shm_handle, M_SHM);
free(shm_handle, M_SHM);
shmseg->shm_internal = NULL;
size = round_page(shmseg->shm_segsz);
shm_committed -= btoc(size);
@ -320,7 +320,7 @@ shmat(td, uap)
shmmap_s = malloc(size, M_SHM, M_WAITOK);
for (i = 0; i < shminfo.shmseg; i++)
shmmap_s[i].shmid = -1;
p->p_vmspace->vm_shm = (caddr_t)shmmap_s;
p->p_vmspace->vm_shm = shmmap_s;
}
shmseg = shm_find_segment_by_shmid(uap->shmid);
if (shmseg == NULL) {
@ -443,7 +443,7 @@ oshmctl(td, uap)
outbuf.shm_dtime = shmseg->shm_dtime;
outbuf.shm_ctime = shmseg->shm_ctime;
outbuf.shm_handle = shmseg->shm_internal;
error = copyout((caddr_t)&outbuf, uap->ubuf, sizeof(outbuf));
error = copyout(&outbuf, uap->ubuf, sizeof(outbuf));
if (error)
goto done2;
break;
@ -485,7 +485,7 @@ shmctl(td, uap)
mtx_lock(&Giant);
switch (uap->cmd) {
case IPC_INFO:
error = copyout( (caddr_t)&shminfo, uap->buf, sizeof( shminfo ) );
error = copyout(&shminfo, uap->buf, sizeof(shminfo));
if (error)
goto done2;
td->td_retval[0] = shmalloced;
@ -498,7 +498,7 @@ shmctl(td, uap)
shm_info.shm_swp = 0; /*XXX where to get from ? */
shm_info.swap_attempts = 0; /*XXX where to get from ? */
shm_info.swap_successes = 0; /*XXX where to get from ? */
error = copyout( (caddr_t)&shm_info, uap->buf, sizeof( shm_info ) );
error = copyout(&shm_info, uap->buf, sizeof(shm_info));
if (error)
goto done2;
td->td_retval[0] = shmalloced;
@ -519,7 +519,7 @@ shmctl(td, uap)
error = ipcperm(td, &shmseg->shm_perm, IPC_R);
if (error)
goto done2;
error = copyout((caddr_t)shmseg, uap->buf, sizeof(inbuf));
error = copyout(shmseg, uap->buf, sizeof(inbuf));
if (error)
goto done2;
else if( (uap->cmd) == SHM_STAT )
@ -529,7 +529,7 @@ shmctl(td, uap)
error = ipcperm(td, &shmseg->shm_perm, IPC_M);
if (error)
goto done2;
error = copyin(uap->buf, (caddr_t)&inbuf, sizeof(inbuf));
error = copyin(uap->buf, &inbuf, sizeof(inbuf));
if (error)
goto done2;
shmseg->shm_perm.uid = inbuf.shm_perm.uid;
@ -589,7 +589,7 @@ shmget_existing(td, uap, mode, segnum)
* allocation failed or it was freed).
*/
shmseg->shm_perm.mode |= SHMSEG_WANTED;
error = tsleep((caddr_t)shmseg, PLOCK | PCATCH, "shmget", 0);
error = tsleep(shmseg, PLOCK | PCATCH, "shmget", 0);
if (error)
return error;
return EAGAIN;
@ -681,7 +681,7 @@ shmget_allocate_segment(td, uap, mode)
* them up now.
*/
shmseg->shm_perm.mode &= ~SHMSEG_WANTED;
wakeup((caddr_t)shmseg);
wakeup(shmseg);
}
td->td_retval[0] = shmid;
return 0;
@ -758,8 +758,8 @@ shmfork_myhook(p1, p2)
size = shminfo.shmseg * sizeof(struct shmmap_state);
shmmap_s = malloc(size, M_SHM, M_WAITOK);
bcopy((caddr_t)p1->p_vmspace->vm_shm, (caddr_t)shmmap_s, size);
p2->p_vmspace->vm_shm = (caddr_t)shmmap_s;
bcopy(p1->p_vmspace->vm_shm, shmmap_s, size);
p2->p_vmspace->vm_shm = shmmap_s;
for (i = 0; i < shminfo.shmseg; i++, shmmap_s++)
if (shmmap_s->shmid != -1)
shmsegs[IPCID_TO_IX(shmmap_s->shmid)].shm_nattch++;
@ -778,7 +778,7 @@ shmexit_myhook(p)
for (i = 0; i < shminfo.shmseg; i++, shmmap_s++)
if (shmmap_s->shmid != -1)
shm_delete_mapping(p, shmmap_s);
free((caddr_t)p->p_vmspace->vm_shm, M_SHM);
free(p->p_vmspace->vm_shm, M_SHM);
p->p_vmspace->vm_shm = NULL;
}

2
sys/vm/vm_map.h
View File

@ -205,7 +205,7 @@ struct vmspace {
struct vm_map vm_map; /* VM address map */
struct pmap vm_pmap; /* private physical map */
int vm_refcnt; /* number of references */
caddr_t vm_shm; /* SYS5 shared memory private data XXX */
void *vm_shm; /* SYS5 shared memory private data XXX */
/* we copy from vm_startcopy to the end of the structure on fork */
#define vm_startcopy vm_rssize
segsz_t vm_rssize; /* current resident set size in pages */