From 3a1b0fdc04de9f78e71f43b39584c7c2cf70f052 Mon Sep 17 00:00:00 2001 From: Robert Garrett Date: Sat, 26 Jul 2003 19:27:41 +0000 Subject: [PATCH] Register keyword removal Approved by: Matt Dillon --- sys/dev/disk/fd/fd.c | 6 +++--- sys/dev/misc/ppc/ppc.c | 12 ++++++------ sys/dev/misc/psm/psm.c | 6 +++--- sys/vfs/isofs/cd9660/cd9660_lookup.c | 10 +++++----- sys/vfs/isofs/cd9660/cd9660_node.c | 12 ++++++------ sys/vfs/isofs/cd9660/cd9660_rrip.c | 12 ++++++------ sys/vfs/isofs/cd9660/cd9660_vfsops.c | 22 +++++++++++----------- sys/vfs/isofs/cd9660/cd9660_vnops.c | 20 ++++++++++---------- 8 files changed, 50 insertions(+), 50 deletions(-) diff --git a/sys/dev/disk/fd/fd.c b/sys/dev/disk/fd/fd.c index 472e47bcd5..65f7008878 100644 --- a/sys/dev/disk/fd/fd.c +++ b/sys/dev/disk/fd/fd.c @@ -51,7 +51,7 @@ * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 * $FreeBSD: src/sys/isa/fd.c,v 1.176.2.8 2002/05/15 21:56:14 joerg Exp $ - * $DragonFly: src/sys/dev/disk/fd/fd.c,v 1.8 2003/07/22 17:03:32 dillon Exp $ + * $DragonFly: src/sys/dev/disk/fd/fd.c,v 1.9 2003/07/26 19:25:18 rob Exp $ * */ @@ -1686,7 +1686,7 @@ fdstate(fdc_p fdc) unsigned blknum = 0, b_cylinder = 0; fdu_t fdu = fdc->fdu; fd_p fd; - register struct buf *bp; + struct buf *bp; struct fd_formb *finfo = NULL; size_t fdblk; @@ -2181,7 +2181,7 @@ fdstate(fdc_p fdc) static int retrier(struct fdc_data *fdc) { - register struct buf *bp; + struct buf *bp; struct fd_data *fd; int fdu; diff --git a/sys/dev/misc/ppc/ppc.c b/sys/dev/misc/ppc/ppc.c index 547fa5f637..3c4fdbfb79 100644 --- a/sys/dev/misc/ppc/ppc.c +++ b/sys/dev/misc/ppc/ppc.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/isa/ppc.c,v 1.26.2.5 2001/10/02 05:21:45 nsouch Exp $ - * $DragonFly: src/sys/dev/misc/ppc/ppc.c,v 1.3 2003/07/19 21:14:37 dillon Exp $ + * $DragonFly: src/sys/dev/misc/ppc/ppc.c,v 1.4 2003/07/26 19:25:18 rob Exp $ * */ @@ -308,7 +308,7 @@ ppc_detect_port(struct ppc_data *ppc) static void ppc_reset_epp_timeout(struct ppc_data *ppc) { - register char r; + char r; r = r_str(ppc); w_str(ppc, r | 0x1); @@ -1348,10 +1348,10 @@ ppc_exec_microseq(device_t dev, struct ppb_microseq **p_msq) int i, iter, len; int error; - register int reg; - register char mask; - register int accum = 0; - register char *ptr = 0; + int reg; + char mask; + int accum = 0; + char *ptr = 0; struct ppb_microseq *stack = 0; diff --git a/sys/dev/misc/psm/psm.c b/sys/dev/misc/psm/psm.c index a0aa45fd82..8317e7d5f0 100644 --- a/sys/dev/misc/psm/psm.c +++ b/sys/dev/misc/psm/psm.c @@ -21,7 +21,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/isa/psm.c,v 1.23.2.6 2002/03/27 16:53:35 pb Exp $ - * $DragonFly: src/sys/dev/misc/psm/psm.c,v 1.5 2003/07/21 05:50:42 dillon Exp $ + * $DragonFly: src/sys/dev/misc/psm/psm.c,v 1.6 2003/07/26 19:25:18 rob Exp $ */ /* @@ -1515,7 +1515,7 @@ tame_mouse(struct psm_softc *sc, mousestatus_t *status, unsigned char *buf) static int psmread(dev_t dev, struct uio *uio, int flag) { - register struct psm_softc *sc = PSM_SOFTC(PSM_UNIT(dev)); + struct psm_softc *sc = PSM_SOFTC(PSM_UNIT(dev)); unsigned char buf[PSM_SMALLBUFSIZE]; int error = 0; int s; @@ -1979,7 +1979,7 @@ psmintr(void *arg) MOUSE_BUTTON1DOWN, MOUSE_BUTTON1DOWN | MOUSE_BUTTON3DOWN }; - register struct psm_softc *sc = arg; + struct psm_softc *sc = arg; mousestatus_t ms; struct timeval tv; int x, y, z; diff --git a/sys/vfs/isofs/cd9660/cd9660_lookup.c b/sys/vfs/isofs/cd9660/cd9660_lookup.c index 3f4e720e47..865c0d2a36 100644 --- a/sys/vfs/isofs/cd9660/cd9660_lookup.c +++ b/sys/vfs/isofs/cd9660/cd9660_lookup.c @@ -39,7 +39,7 @@ * * @(#)cd9660_lookup.c 8.2 (Berkeley) 1/23/94 * $FreeBSD: src/sys/isofs/cd9660/cd9660_lookup.c,v 1.23.2.2 2001/11/04 06:19:47 dillon Exp $ - * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_lookup.c,v 1.4 2003/06/26 05:55:13 dillon Exp $ + * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_lookup.c,v 1.5 2003/07/26 19:27:41 rob Exp $ */ #include @@ -94,9 +94,9 @@ cd9660_lookup(ap) struct componentname *a_cnp; } */ *ap; { - register struct vnode *vdp; /* vnode for directory being searched */ - register struct iso_node *dp; /* inode for directory being searched */ - register struct iso_mnt *imp; /* file system that directory is in */ + struct vnode *vdp; /* vnode for directory being searched */ + struct iso_node *dp; /* inode for directory being searched */ + struct iso_mnt *imp; /* file system that directory is in */ struct buf *bp; /* a buffer of directory entries */ struct iso_directory_record *ep = 0;/* the current directory entry */ int entryoffsetinblock; /* offset of ep in bp's buffer */ @@ -407,7 +407,7 @@ cd9660_blkatoff(vp, offset, res, bpp) struct buf **bpp; { struct iso_node *ip; - register struct iso_mnt *imp; + struct iso_mnt *imp; struct buf *bp; daddr_t lbn; int bsize, error; diff --git a/sys/vfs/isofs/cd9660/cd9660_node.c b/sys/vfs/isofs/cd9660/cd9660_node.c index 03277986b6..109d77c94e 100644 --- a/sys/vfs/isofs/cd9660/cd9660_node.c +++ b/sys/vfs/isofs/cd9660/cd9660_node.c @@ -37,7 +37,7 @@ * * @(#)cd9660_node.c 8.2 (Berkeley) 1/23/94 * $FreeBSD: src/sys/isofs/cd9660/cd9660_node.c,v 1.29.2.1 2000/07/08 14:35:56 bp Exp $ - * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_node.c,v 1.4 2003/07/06 21:23:50 dillon Exp $ + * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_node.c,v 1.5 2003/07/26 19:27:41 rob Exp $ */ #include @@ -145,9 +145,9 @@ cd9660_ihashins(struct iso_node *ip) */ static void cd9660_ihashrem(ip) - register struct iso_node *ip; + struct iso_node *ip; { - register struct iso_node *iq; + struct iso_node *iq; lwkt_gettoken(&cd9660_ihash_token); if ((iq = ip->i_next) != NULL) @@ -173,7 +173,7 @@ cd9660_inactive(ap) { struct vnode *vp = ap->a_vp; struct thread *td = ap->a_td; - register struct iso_node *ip = VTOI(vp); + struct iso_node *ip = VTOI(vp); int error = 0; if (prtactive && vp->v_usecount != 0) @@ -200,8 +200,8 @@ cd9660_reclaim(ap) struct proc *a_p; } */ *ap; { - register struct vnode *vp = ap->a_vp; - register struct iso_node *ip = VTOI(vp); + struct vnode *vp = ap->a_vp; + struct iso_node *ip = VTOI(vp); if (prtactive && vp->v_usecount != 0) vprint("cd9660_reclaim: pushing active", vp); diff --git a/sys/vfs/isofs/cd9660/cd9660_rrip.c b/sys/vfs/isofs/cd9660/cd9660_rrip.c index fa736c8fec..6ccd0a4670 100644 --- a/sys/vfs/isofs/cd9660/cd9660_rrip.c +++ b/sys/vfs/isofs/cd9660/cd9660_rrip.c @@ -37,7 +37,7 @@ * * @(#)cd9660_rrip.c 8.6 (Berkeley) 12/5/94 * $FreeBSD: src/sys/isofs/cd9660/cd9660_rrip.c,v 1.17 1999/08/28 00:46:06 peter Exp $ - * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_rrip.c,v 1.3 2003/06/26 05:55:13 dillon Exp $ + * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_rrip.c,v 1.4 2003/07/26 19:27:41 rob Exp $ */ #include @@ -125,8 +125,8 @@ cd9660_rrip_slink(p,ana) ISO_RRIP_SLINK *p; ISO_RRIP_ANALYZE *ana; { - register ISO_RRIP_SLINK_COMPONENT *pcomp; - register ISO_RRIP_SLINK_COMPONENT *pcompe; + ISO_RRIP_SLINK_COMPONENT *pcomp; + ISO_RRIP_SLINK_COMPONENT *pcompe; int len, wlen, cont; char *outbuf, *inbuf; @@ -494,9 +494,9 @@ cd9660_rrip_loop(isodir,ana,table) ISO_RRIP_ANALYZE *ana; RRIP_TABLE *table; { - register RRIP_TABLE *ptable; - register ISO_SUSP_HEADER *phead; - register ISO_SUSP_HEADER *pend; + RRIP_TABLE *ptable; + ISO_SUSP_HEADER *phead; + ISO_SUSP_HEADER *pend; struct buf *bp = NULL; char *pwhead; u_char c; diff --git a/sys/vfs/isofs/cd9660/cd9660_vfsops.c b/sys/vfs/isofs/cd9660/cd9660_vfsops.c index a67f05d5ad..094e40ae1e 100644 --- a/sys/vfs/isofs/cd9660/cd9660_vfsops.c +++ b/sys/vfs/isofs/cd9660/cd9660_vfsops.c @@ -37,7 +37,7 @@ * * @(#)cd9660_vfsops.c 8.18 (Berkeley) 5/22/95 * $FreeBSD: src/sys/isofs/cd9660/cd9660_vfsops.c,v 1.74.2.7 2002/04/08 09:39:29 bde Exp $ - * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_vfsops.c,v 1.7 2003/07/22 17:03:32 dillon Exp $ + * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_vfsops.c,v 1.8 2003/07/26 19:27:41 rob Exp $ */ #include @@ -177,7 +177,7 @@ iso_mountroot(struct mount *mp, struct thread *td) */ static int cd9660_mount(mp, path, data, ndp, td) - register struct mount *mp; + struct mount *mp; char *path; caddr_t data; struct nameidata *ndp; @@ -272,7 +272,7 @@ iso_mountfs( struct thread *td, struct iso_args *argp ) { - register struct iso_mnt *isomp = (struct iso_mnt *)0; + struct iso_mnt *isomp = (struct iso_mnt *)0; struct buf *bp = NULL; struct buf *pribp = NULL, *supbp = NULL; dev_t dev = devvp->v_rdev; @@ -536,7 +536,7 @@ out: static int cd9660_unmount(struct mount *mp, int mntflags, struct thread *td) { - register struct iso_mnt *isomp; + struct iso_mnt *isomp; int error, flags = 0; if (mntflags & MNT_FORCE) @@ -585,7 +585,7 @@ cd9660_root(mp, vpp) * Get file system statistics. */ int -cd9660_statfs(struct mount *mp, register struct statfs *sbp, struct thread *td) +cd9660_statfs(struct mount *mp, struct statfs *sbp, struct thread *td) { struct iso_mnt *isomp; @@ -626,12 +626,12 @@ struct ifid { /* ARGSUSED */ int cd9660_fhtovp(mp, fhp, vpp) - register struct mount *mp; + struct mount *mp; struct fid *fhp; struct vnode **vpp; { struct ifid *ifhp = (struct ifid *)fhp; - register struct iso_node *ip; + struct iso_node *ip; struct vnode *nvp; int error; @@ -661,8 +661,8 @@ cd9660_checkexp(mp, nam, exflagsp, credanonp) int *exflagsp; struct ucred **credanonp; { - register struct netcred *np; - register struct iso_mnt *imp; + struct netcred *np; + struct iso_mnt *imp; imp = VFSTOISOFS(mp); @@ -884,8 +884,8 @@ cd9660_vptofh(vp, fhp) struct vnode *vp; struct fid *fhp; { - register struct iso_node *ip = VTOI(vp); - register struct ifid *ifhp; + struct iso_node *ip = VTOI(vp); + struct ifid *ifhp; ifhp = (struct ifid *)fhp; ifhp->ifid_len = sizeof(struct ifid); diff --git a/sys/vfs/isofs/cd9660/cd9660_vnops.c b/sys/vfs/isofs/cd9660/cd9660_vnops.c index c25d98587d..4dd8090aa4 100644 --- a/sys/vfs/isofs/cd9660/cd9660_vnops.c +++ b/sys/vfs/isofs/cd9660/cd9660_vnops.c @@ -37,7 +37,7 @@ * * @(#)cd9660_vnops.c 8.19 (Berkeley) 5/27/95 * $FreeBSD: src/sys/isofs/cd9660/cd9660_vnops.c,v 1.62 1999/12/15 23:01:51 eivind Exp $ - * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_vnops.c,v 1.4 2003/06/26 05:55:13 dillon Exp $ + * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_vnops.c,v 1.5 2003/07/26 19:27:41 rob Exp $ */ #include @@ -208,8 +208,8 @@ cd9660_getattr(ap) { struct vnode *vp = ap->a_vp; - register struct vattr *vap = ap->a_vap; - register struct iso_node *ip = VTOI(vp); + struct vattr *vap = ap->a_vap; + struct iso_node *ip = VTOI(vp); vap->va_fsid = dev2udev(ip->i_dev); vap->va_fileid = ip->i_number; @@ -296,9 +296,9 @@ cd9660_read(ap) } */ *ap; { struct vnode *vp = ap->a_vp; - register struct uio *uio = ap->a_uio; - register struct iso_node *ip = VTOI(vp); - register struct iso_mnt *imp; + struct uio *uio = ap->a_uio; + struct iso_node *ip = VTOI(vp); + struct iso_mnt *imp; struct buf *bp; daddr_t lbn, rablock; off_t diff; @@ -467,7 +467,7 @@ cd9660_readdir(ap) u_long *a_cookies; } */ *ap; { - register struct uio *uio = ap->a_uio; + struct uio *uio = ap->a_uio; struct isoreaddir *idp; struct vnode *vdp = ap->a_vp; struct iso_node *dp; @@ -747,9 +747,9 @@ cd9660_strategy(ap) struct buf *a_bp; } */ *ap; { - register struct buf *bp = ap->a_bp; - register struct vnode *vp = bp->b_vp; - register struct iso_node *ip; + struct buf *bp = ap->a_bp; + struct vnode *vp = bp->b_vp; + struct iso_node *ip; int error; ip = VTOI(vp); -- 2.41.0