Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys caddr_t -> void * and removal of some more casts.
details: https://anonhg.NetBSD.org/src/rev/7e75dcc88159
branches: trunk
changeset: 566538:7e75dcc88159
user: jrf <jrf%NetBSD.org@localhost>
date: Wed May 12 02:07:37 2004 +0000
description:
caddr_t -> void * and removal of some more casts.
diffstat:
sys/fs/filecorefs/filecore_vnops.c | 6 +++---
sys/fs/msdosfs/msdosfs_vnops.c | 6 +++---
sys/fs/ntfs/ntfs_subr.c | 6 +++---
sys/fs/smbfs/smbfs_vnops.c | 6 +++---
sys/fs/union/union_subr.c | 6 +++---
sys/fs/union/union_vfsops.c | 6 +++---
sys/miscfs/fifofs/fifo_vnops.c | 14 +++++++-------
sys/miscfs/kernfs/kernfs_vnops.c | 6 +++---
sys/miscfs/specfs/spec_vnops.c | 8 ++++----
9 files changed, 32 insertions(+), 32 deletions(-)
diffs (283 lines):
diff -r 433ff4ac7acc -r 7e75dcc88159 sys/fs/filecorefs/filecore_vnops.c
--- a/sys/fs/filecorefs/filecore_vnops.c Wed May 12 00:45:04 2004 +0000
+++ b/sys/fs/filecorefs/filecore_vnops.c Wed May 12 02:07:37 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: filecore_vnops.c,v 1.8 2004/01/26 10:39:30 hannken Exp $ */
+/* $NetBSD: filecore_vnops.c,v 1.9 2004/05/12 02:07:38 jrf Exp $ */
/*-
* Copyright (c) 1994 The Regents of the University of California.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: filecore_vnops.c,v 1.8 2004/01/26 10:39:30 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: filecore_vnops.c,v 1.9 2004/05/12 02:07:38 jrf Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -350,7 +350,7 @@
de.d_reclen = DIRENT_SIZE(&de);
if (uio->uio_resid < de.d_reclen)
goto out;
- error = uiomove((caddr_t) &de, de.d_reclen, uio);
+ error = uiomove(&de, de.d_reclen, uio);
if (error)
goto out;
uiooff += FILECORE_DIRENT_SIZE;
diff -r 433ff4ac7acc -r 7e75dcc88159 sys/fs/msdosfs/msdosfs_vnops.c
--- a/sys/fs/msdosfs/msdosfs_vnops.c Wed May 12 00:45:04 2004 +0000
+++ b/sys/fs/msdosfs/msdosfs_vnops.c Wed May 12 02:07:37 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_vnops.c,v 1.10 2004/05/04 13:26:58 jrf Exp $ */
+/* $NetBSD: msdosfs_vnops.c,v 1.11 2004/05/12 02:07:38 jrf Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_vnops.c,v 1.10 2004/05/04 13:26:58 jrf Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_vnops.c,v 1.11 2004/05/12 02:07:38 jrf Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1798,7 +1798,7 @@
{
struct vop_advlock_args /* {
struct vnode *a_vp;
- caddr_t a_id;
+ void *a_id;
int a_op;
struct flock *a_fl;
int a_flags;
diff -r 433ff4ac7acc -r 7e75dcc88159 sys/fs/ntfs/ntfs_subr.c
--- a/sys/fs/ntfs/ntfs_subr.c Wed May 12 00:45:04 2004 +0000
+++ b/sys/fs/ntfs/ntfs_subr.c Wed May 12 02:07:37 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ntfs_subr.c,v 1.8 2004/03/22 16:39:30 jdolecek Exp $ */
+/* $NetBSD: ntfs_subr.c,v 1.9 2004/05/12 02:07:38 jrf Exp $ */
/*-
* Copyright (c) 1998, 1999 Semen Ustimenko (semenu%FreeBSD.org@localhost)
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ntfs_subr.c,v 1.8 2004/03/22 16:39:30 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ntfs_subr.c,v 1.9 2004/05/12 02:07:38 jrf Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -410,7 +410,7 @@
MALLOC(ip, struct ntnode *, sizeof(struct ntnode),
M_NTFSNTNODE, M_WAITOK);
ddprintf(("ntfs_ntlookup: allocating ntnode: %d: %p\n", ino, ip));
- bzero((caddr_t) ip, sizeof(struct ntnode));
+ bzero(ip, sizeof(struct ntnode));
/* Generic initialization */
ip->i_devvp = ntmp->ntm_devvp;
diff -r 433ff4ac7acc -r 7e75dcc88159 sys/fs/smbfs/smbfs_vnops.c
--- a/sys/fs/smbfs/smbfs_vnops.c Wed May 12 00:45:04 2004 +0000
+++ b/sys/fs/smbfs/smbfs_vnops.c Wed May 12 02:07:37 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: smbfs_vnops.c,v 1.42 2004/03/22 16:40:48 jdolecek Exp $ */
+/* $NetBSD: smbfs_vnops.c,v 1.43 2004/05/12 02:07:38 jrf Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smbfs_vnops.c,v 1.42 2004/03/22 16:40:48 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smbfs_vnops.c,v 1.43 2004/05/12 02:07:38 jrf Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1017,7 +1017,7 @@
{
struct vop_advlock_args /* {
struct vnode *a_vp;
- caddr_t a_id;
+ void *a_id;
int a_op;
struct flock *a_fl;
int a_flags;
diff -r 433ff4ac7acc -r 7e75dcc88159 sys/fs/union/union_subr.c
--- a/sys/fs/union/union_subr.c Wed May 12 00:45:04 2004 +0000
+++ b/sys/fs/union/union_subr.c Wed May 12 02:07:37 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: union_subr.c,v 1.9 2004/04/27 17:37:30 jrf Exp $ */
+/* $NetBSD: union_subr.c,v 1.10 2004/05/12 02:07:39 jrf Exp $ */
/*
* Copyright (c) 1994
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: union_subr.c,v 1.9 2004/04/27 17:37:30 jrf Exp $");
+__KERNEL_RCSID(0, "$NetBSD: union_subr.c,v 1.10 2004/05/12 02:07:39 jrf Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1240,7 +1240,7 @@
return (error);
}
VOP_UNLOCK(lvp, 0);
- fp->f_data = (caddr_t) lvp;
+ fp->f_data = lvp;
fp->f_offset = 0;
error = vn_close(vp, FREAD, fp->f_cred, p);
if (error)
diff -r 433ff4ac7acc -r 7e75dcc88159 sys/fs/union/union_vfsops.c
--- a/sys/fs/union/union_vfsops.c Wed May 12 00:45:04 2004 +0000
+++ b/sys/fs/union/union_vfsops.c Wed May 12 02:07:37 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: union_vfsops.c,v 1.13 2004/04/27 17:37:31 jrf Exp $ */
+/* $NetBSD: union_vfsops.c,v 1.14 2004/05/12 02:07:39 jrf Exp $ */
/*
* Copyright (c) 1994 The Regents of the University of California.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: union_vfsops.c,v 1.13 2004/04/27 17:37:31 jrf Exp $");
+__KERNEL_RCSID(0, "$NetBSD: union_vfsops.c,v 1.14 2004/05/12 02:07:39 jrf Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -157,7 +157,7 @@
/*
* Get argument
*/
- error = copyin(data, (caddr_t)&args, sizeof(struct union_args));
+ error = copyin(data, &args, sizeof(struct union_args));
if (error)
goto bad;
diff -r 433ff4ac7acc -r 7e75dcc88159 sys/miscfs/fifofs/fifo_vnops.c
--- a/sys/miscfs/fifofs/fifo_vnops.c Wed May 12 00:45:04 2004 +0000
+++ b/sys/miscfs/fifofs/fifo_vnops.c Wed May 12 02:07:37 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fifo_vnops.c,v 1.47 2004/04/29 16:10:54 jrf Exp $ */
+/* $NetBSD: fifo_vnops.c,v 1.48 2004/05/12 02:07:37 jrf Exp $ */
/*
* Copyright (c) 1990, 1993, 1995
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fifo_vnops.c,v 1.47 2004/04/29 16:10:54 jrf Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fifo_vnops.c,v 1.48 2004/05/12 02:07:37 jrf Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -327,7 +327,7 @@
struct vop_ioctl_args /* {
struct vnode *a_vp;
u_long a_command;
- caddr_t a_data;
+ void *a_data;
int a_fflag;
struct ucred *a_cred;
struct proc *a_p;
@@ -338,13 +338,13 @@
if (ap->a_command == FIONBIO)
return (0);
if (ap->a_fflag & FREAD) {
- filetmp.f_data = (caddr_t)ap->a_vp->v_fifoinfo->fi_readsock;
+ filetmp.f_data = ap->a_vp->v_fifoinfo->fi_readsock;
error = soo_ioctl(&filetmp, ap->a_command, ap->a_data, ap->a_p);
if (error)
return (error);
}
if (ap->a_fflag & FWRITE) {
- filetmp.f_data = (caddr_t)ap->a_vp->v_fifoinfo->fi_writesock;
+ filetmp.f_data = ap->a_vp->v_fifoinfo->fi_writesock;
error = soo_ioctl(&filetmp, ap->a_command, ap->a_data, ap->a_p);
if (error)
return (error);
@@ -366,12 +366,12 @@
revents = 0;
if (ap->a_events & (POLLIN | POLLPRI | POLLRDNORM | POLLRDBAND)) {
- filetmp.f_data = (caddr_t)ap->a_vp->v_fifoinfo->fi_readsock;
+ filetmp.f_data = ap->a_vp->v_fifoinfo->fi_readsock;
if (filetmp.f_data)
revents |= soo_poll(&filetmp, ap->a_events, ap->a_p);
}
if (ap->a_events & (POLLOUT | POLLWRNORM | POLLWRBAND)) {
- filetmp.f_data = (caddr_t)ap->a_vp->v_fifoinfo->fi_writesock;
+ filetmp.f_data = ap->a_vp->v_fifoinfo->fi_writesock;
if (filetmp.f_data)
revents |= soo_poll(&filetmp, ap->a_events, ap->a_p);
}
diff -r 433ff4ac7acc -r 7e75dcc88159 sys/miscfs/kernfs/kernfs_vnops.c
--- a/sys/miscfs/kernfs/kernfs_vnops.c Wed May 12 00:45:04 2004 +0000
+++ b/sys/miscfs/kernfs/kernfs_vnops.c Wed May 12 02:07:37 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: kernfs_vnops.c,v 1.102 2004/05/07 15:33:17 cl Exp $ */
+/* $NetBSD: kernfs_vnops.c,v 1.103 2004/05/12 02:07:37 jrf Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kernfs_vnops.c,v 1.102 2004/05/07 15:33:17 cl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kernfs_vnops.c,v 1.103 2004/05/12 02:07:37 jrf Exp $");
#ifdef _KERNEL_OPT
#include "opt_ipsec.h"
@@ -1240,7 +1240,7 @@
break;
memcpy(d.d_name, kt->kt_name, kt->kt_namlen + 1);
d.d_type = kt->kt_type;
- if ((error = uiomove((caddr_t)&d, UIO_MX, uio)) != 0)
+ if ((error = uiomove(&d, UIO_MX, uio)) != 0)
break;
if (cookies)
*cookies++ = i + 1;
diff -r 433ff4ac7acc -r 7e75dcc88159 sys/miscfs/specfs/spec_vnops.c
--- a/sys/miscfs/specfs/spec_vnops.c Wed May 12 00:45:04 2004 +0000
+++ b/sys/miscfs/specfs/spec_vnops.c Wed May 12 02:07:37 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: spec_vnops.c,v 1.77 2004/02/14 00:00:56 hannken Exp $ */
+/* $NetBSD: spec_vnops.c,v 1.78 2004/05/12 02:07:38 jrf Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spec_vnops.c,v 1.77 2004/02/14 00:00:56 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spec_vnops.c,v 1.78 2004/05/12 02:07:38 jrf Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -453,7 +453,7 @@
struct vop_ioctl_args /* {
struct vnode *a_vp;
u_long a_command;
- caddr_t a_data;
+ void *a_data;
int a_fflag;
struct ucred *a_cred;
struct proc *a_p;
@@ -845,7 +845,7 @@
{
struct vop_advlock_args /* {
struct vnode *a_vp;
- caddr_t a_id;
+ void *a_id;
int a_op;
struct flock *a_fl;
int a_flags;
Home |
Main Index |
Thread Index |
Old Index