From: jsg <jsg@openbsd.org>
Date: Fri, 5 Mar 2021 07:10:06 +0000 (+0000)
Subject: deregister
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=b2acc58773955268dabc4a16bdaf9566762cc317;p=openbsd

deregister
---

diff --git a/sys/isofs/cd9660/cd9660_lookup.c b/sys/isofs/cd9660/cd9660_lookup.c
index 757e6203aa0..3b56a930349 100644
--- a/sys/isofs/cd9660/cd9660_lookup.c
+++ b/sys/isofs/cd9660/cd9660_lookup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660_lookup.c,v 1.28 2021/03/05 07:01:36 jsg Exp $	*/
+/*	$OpenBSD: cd9660_lookup.c,v 1.29 2021/03/05 07:10:06 jsg Exp $	*/
 /*	$NetBSD: cd9660_lookup.c,v 1.18 1997/05/08 16:19:59 mycroft Exp $	*/
 
 /*-
@@ -94,9 +94,9 @@ int
 cd9660_lookup(void *v)
 {
 	struct vop_lookup_args *ap = v;
-	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 = NULL;
 					/* the current directory entry */
diff --git a/sys/isofs/cd9660/cd9660_node.c b/sys/isofs/cd9660/cd9660_node.c
index 321deacf9c3..38ca5b3e196 100644
--- a/sys/isofs/cd9660/cd9660_node.c
+++ b/sys/isofs/cd9660/cd9660_node.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660_node.c,v 1.36 2021/03/05 07:01:36 jsg Exp $	*/
+/*	$OpenBSD: cd9660_node.c,v 1.37 2021/03/05 07:10:06 jsg Exp $	*/
 /*	$NetBSD: cd9660_node.c,v 1.17 1997/05/05 07:13:57 mycroft Exp $	*/
 
 /*-
@@ -151,7 +151,7 @@ cd9660_ihashins(struct iso_node *ip)
 void
 cd9660_ihashrem(struct iso_node *ip)
 {
-	register struct iso_node *iq;
+	struct iso_node *iq;
 
 	if (ip->i_prev == NULL)
 		return;
@@ -176,7 +176,7 @@ cd9660_inactive(void *v)
 {
 	struct vop_inactive_args *ap = v;
 	struct vnode *vp = ap->a_vp;
-	register struct iso_node *ip = VTOI(vp);
+	struct iso_node *ip = VTOI(vp);
 	int error = 0;
 
 #ifdef DIAGNOSTIC
@@ -203,8 +203,8 @@ int
 cd9660_reclaim(void *v)
 {
 	struct vop_reclaim_args *ap = v;
-	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);
 
 #ifdef DIAGNOSTIC
 	if (prtactive && vp->v_usecount != 0)
diff --git a/sys/isofs/cd9660/cd9660_rrip.c b/sys/isofs/cd9660/cd9660_rrip.c
index 88cd51a3354..583dac1d18f 100644
--- a/sys/isofs/cd9660/cd9660_rrip.c
+++ b/sys/isofs/cd9660/cd9660_rrip.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660_rrip.c,v 1.15 2021/03/05 07:01:36 jsg Exp $	*/
+/*	$OpenBSD: cd9660_rrip.c,v 1.16 2021/03/05 07:10:06 jsg Exp $	*/
 /*	$NetBSD: cd9660_rrip.c,v 1.17 1997/01/24 00:27:32 cgd Exp $	*/
 
 /*-
@@ -110,8 +110,8 @@ static int
 cd9660_rrip_slink(void *v, ISO_RRIP_ANALYZE *ana)
 {
 	ISO_RRIP_SLINK  *p = v;
-	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;
 	
@@ -490,9 +490,9 @@ static int
 cd9660_rrip_loop(struct iso_directory_record *isodir, 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/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c
index 78641999f8a..0bcfbd0270d 100644
--- a/sys/isofs/cd9660/cd9660_vfsops.c
+++ b/sys/isofs/cd9660/cd9660_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660_vfsops.c,v 1.94 2021/03/05 07:01:36 jsg Exp $	*/
+/*	$OpenBSD: cd9660_vfsops.c,v 1.95 2021/03/05 07:10:06 jsg Exp $	*/
 /*	$NetBSD: cd9660_vfsops.c,v 1.26 1997/06/13 15:38:58 pk Exp $	*/
 
 /*-
@@ -204,7 +204,7 @@ static int
 iso_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p,
     struct iso_args *argp)
 {
-	register struct iso_mnt *isomp = NULL;
+	struct iso_mnt *isomp = NULL;
 	struct buf *bp = NULL;
 	struct buf *pribp = NULL, *supbp = NULL;
 	dev_t dev = devvp->v_rdev;
@@ -537,7 +537,7 @@ cd9660_start(struct mount *mp, int flags, struct proc *p)
 int
 cd9660_unmount(struct mount *mp, int mntflags, struct proc *p)
 {
-	register struct iso_mnt *isomp;
+	struct iso_mnt *isomp;
 	int error, flags = 0;
 
 	if (mntflags & MNT_FORCE)
@@ -599,7 +599,7 @@ cd9660_quotactl(struct mount *mp, int cmd, uid_t uid, caddr_t arg,
 int
 cd9660_statfs(struct mount *mp, struct statfs *sbp, struct proc *p)
 {
-	register struct iso_mnt *isomp;
+	struct iso_mnt *isomp;
 
 	isomp = VFSTOISOFS(mp);
 
@@ -646,7 +646,7 @@ int
 cd9660_fhtovp(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;
 
@@ -696,7 +696,7 @@ int
 cd9660_vget_internal(struct mount *mp, cdino_t ino, struct vnode **vpp,
     int relocated, struct iso_directory_record *isodir)
 {
-	register struct iso_mnt *imp;
+	struct iso_mnt *imp;
 	struct iso_node *ip;
 	struct buf *bp;
 	struct vnode *vp, *nvp;
@@ -910,8 +910,8 @@ retry:
 int
 cd9660_vptofh(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);
@@ -934,8 +934,8 @@ int
 cd9660_check_export(struct mount *mp, struct mbuf *nam, int *exflagsp,
     struct ucred **credanonp)
 {
-	register struct netcred *np;
-	register struct iso_mnt *imp = VFSTOISOFS(mp);
+	struct netcred *np;
+	struct iso_mnt *imp = VFSTOISOFS(mp);
 
 	/*
 	 * Get the export permission structure for this <mp, client> tuple.
diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c
index d5c94d584da..b7cc93f86c5 100644
--- a/sys/isofs/cd9660/cd9660_vnops.c
+++ b/sys/isofs/cd9660/cd9660_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660_vnops.c,v 1.87 2021/03/05 07:01:36 jsg Exp $	*/
+/*	$OpenBSD: cd9660_vnops.c,v 1.88 2021/03/05 07:10:06 jsg Exp $	*/
 /*	$NetBSD: cd9660_vnops.c,v 1.42 1997/10/16 23:56:57 christos Exp $	*/
 
 /*-
@@ -165,8 +165,8 @@ cd9660_getattr(void *v)
 {
 	struct vop_getattr_args *ap = v;
 	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	= ip->i_dev;
 	vap->va_fileid	= ip->i_number;
@@ -220,9 +220,9 @@ cd9660_read(void *v)
 {
 	struct vop_read_args *ap = v;
 	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;
@@ -407,7 +407,7 @@ int
 cd9660_readdir(void *v)
 {
 	struct vop_readdir_args *ap = v;
-	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;