rearrange some comments

3 files changed, 20 insertions, 56 deletions

diff --git a/sys/isofs/udf/udf.h b/sys/isofs/udf/udf.h
index 071fd7a37ff..5e0e41538c5 100644
--- a/sys/isofs/udf/udf.h
+++ b/sys/isofs/udf/udf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: udf.h,v 1.2 2006/01/14 19:04:17 miod Exp $	*/
+/*	$OpenBSD: udf.h,v 1.3 2006/06/24 15:09:17 pedro Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org>
@@ -88,7 +88,7 @@ struct udf_dirstream {
 /*
  * The block layer refers to things in terms of 512 byte blocks by default.
  * btodb() is expensive, so speed things up.
- * XXX Can the block layer be forced to use a different block size?
+ * Can the block layer be forced to use a different block size?
  */
 #define	RDSECTOR(devvp, sector, size, bp) \
 	bread(devvp, sector << (udfmp->bshift - DEV_BSHIFT), size, NOCRED, bp)
@@ -119,8 +119,8 @@ udf_readalblks(struct udf_mnt *udfmp, int lsector, int size, struct buf **bp)
  * Produce a suitable file number from an ICB.  The passed in ICB is expected
  * to be in little endian (meaning that it hasn't been swapped for big
  * endian machines yet).
- * XXX If the fileno resolves to 0, we might be in big trouble.
- * XXX Assumes the ICB is a long_ad.  This struct is compatible with short_ad,
+ * If the fileno resolves to 0, we might be in big trouble.
+ * Assumes the ICB is a long_ad.  This struct is compatible with short_ad,
  *     but not ext_ad.
  */
 static __inline ino_t
diff --git a/sys/isofs/udf/udf_vfsops.c b/sys/isofs/udf/udf_vfsops.c
index 6d189b18e64..5fa0b211cae 100644
--- a/sys/isofs/udf/udf_vfsops.c
+++ b/sys/isofs/udf/udf_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: udf_vfsops.c,v 1.10 2006/06/23 11:21:29 pedro Exp $	*/
+/*	$OpenBSD: udf_vfsops.c,v 1.11 2006/06/24 15:09:17 pedro Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org>
@@ -44,34 +44,6 @@
  * One caveat is unclosed CD media.  For that, sector 256 cannot be written,
  * so the Anchor Volume Descriptor Pointer can exist at sector 512 until the
  * media is closed.
- *
- *  Sector:
- *     256:
- *       n: Anchor Volume Descriptor Pointer
- * n - 256:	|
- *		|
- *		|-->Main Volume Descriptor Sequence
- *			|	|
- *			|	|
- *			|	|-->Logical Volume Descriptor
- *			|			  |
- *			|-->Partition Descriptor  |
- *				|		  |
- *				|		  |
- *				|-->Fileset Descriptor
- *					|
- *					|
- *					|-->Root Dir File Entry
- *						|
- *						|
- *						|-->File data:
- *						    File Id Descriptor
- *							|
- *							|
- *							|-->File Entry
- *								|
- *								|
- *								|-->File data
  */
 
 #include <sys/types.h>
@@ -289,11 +261,11 @@ udf_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p)
 	udfmp->im_dev = devvp->v_rdev;
 	udfmp->im_devvp = devvp;
 
-	bsize = 2048;	/* XXX Should probe the media for its size. */
+	bsize = 2048;	/* Should probe the media for its size. */
 
 	/* 
 	 * Get the Anchor Volume Descriptor Pointer from sector 256.
-	 * XXX Should also check sector n - 256, n, and 512.
+	 * Should also check sector n - 256, n, and 512.
 	 */
 	sector = 256;
 	if ((error = bread(devvp, sector * btodb(bsize), bsize, NOCRED,
@@ -309,8 +281,8 @@ udf_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p)
 	/*
 	 * Extract the Partition Descriptor and Logical Volume Descriptor
 	 * from the Volume Descriptor Sequence.
-	 * XXX Should we care about the partition type right now?
-	 * XXX What about multiple partitions?
+	 * Should we care about the partition type right now?
+	 * What about multiple partitions?
 	 */
 	mvds_start = letoh32(avdp.main_vds_ex.loc);
 	mvds_end = mvds_start + (letoh32(avdp.main_vds_ex.len) - 1) / bsize;
diff --git a/sys/isofs/udf/udf_vnops.c b/sys/isofs/udf/udf_vnops.c
index f02c7e309ab..4d3936e16ec 100644
--- a/sys/isofs/udf/udf_vnops.c
+++ b/sys/isofs/udf/udf_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: udf_vnops.c,v 1.12 2006/06/14 16:48:10 pat Exp $	*/
+/*	$OpenBSD: udf_vnops.c,v 1.13 2006/06/24 15:09:17 pedro Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org>
@@ -251,7 +251,7 @@ udf_isaleapyear(int year)
 }
 
 /*
- * XXX This is just a rough hack.  Daylight savings isn't calculated and tv_nsec
+ * This is just a rough hack.  Daylight savings isn't calculated and tv_nsec
  * is ignored.
  * Timezone calculation compliments of Julian Elischer <julian@elischer.org>.
  */
@@ -337,15 +337,15 @@ udf_getattr(void *v)
 	vap->va_mode = udf_permtomode(node);
 	vap->va_nlink = letoh16(fentry->link_cnt);
 	/*
-	 * XXX The spec says that -1 is valid for uid/gid and indicates an
+	 * The spec says that -1 is valid for uid/gid and indicates an
 	 * invalid uid/gid.  How should this be represented?
 	 */
 	vap->va_uid = (letoh32(fentry->uid) == -1) ? 0 : letoh32(fentry->uid);
 	vap->va_gid = (letoh32(fentry->gid) == -1) ? 0 : letoh32(fentry->gid);
 	udf_timetotimespec(&fentry->atime, &vap->va_atime);
 	udf_timetotimespec(&fentry->mtime, &vap->va_mtime);
-	vap->va_ctime = vap->va_mtime; /* XXX Stored as an Extended Attribute */
-	vap->va_rdev = 0; /* XXX */
+	vap->va_ctime = vap->va_mtime; /* Stored as an Extended Attribute */
+	vap->va_rdev = 0;
 	if (vp->v_type & VDIR) {
 		vap->va_nlink++; /* Count a reference to ourselves */
 		/*
@@ -368,7 +368,7 @@ udf_getattr(void *v)
 	vap->va_blocksize = node->udfmp->bsize;
 	vap->va_bytes = letoh64(fentry->inf_len);
 	vap->va_type = vp->v_type;
-	vap->va_filerev = 0; /* XXX */
+	vap->va_filerev = 0;
 
 	return (0);
 }
@@ -376,21 +376,13 @@ udf_getattr(void *v)
 int
 udf_open(void *v)
 {
-	/*
-	 * Dummy. Nothing to be done at this point.
-	 */
-
-	return (0);
+	return (0); /* Nothing to be done at this point */
 }
 
 int
 udf_close(void *v)
 {
-	/*
-	 * Dummy. Nothing to be done at this point.
-	 */
-
-	return (0);
+	return (0); /* Nothing to be done at this point */
 }
 
 /*
@@ -527,7 +519,7 @@ udf_cmpname(char *cs0string, char *cmpname, int cs0len, int cmplen, struct udf_m
 	char *transname;
 	int error = 0;
 
-	/* This is overkill, but not worth creating a new zone */
+	/* This is overkill, but not worth creating a new pool */
 	transname = pool_get(&udf_trans_pool, PR_WAITOK);
 
 	cs0len = udf_transname(cs0string, transname, cs0len, udfmp);
@@ -613,7 +605,7 @@ udf_getfid(struct udf_dirstream *ds)
 
 	/*
 	 * Clean up from a previous fragmented FID.
-	 * XXX Is this the right place for this?
+	 * Is this the right place for this?
 	 */
 	if (ds->fid_fragment && ds->buf != NULL) {
 		ds->fid_fragment = 0;
@@ -774,7 +766,7 @@ udf_readdir(void *v)
 
 	while ((fid = udf_getfid(ds)) != NULL) {
 
-		/* XXX Should we return an error on a bad fid? */
+		/* Should we return an error on a bad fid? */
 		if (udf_checktag(&fid->tag, TAGID_FID)) {
 			printf("Invalid FID tag\n");
 			error = EIO;