1 files changed, 19 insertions, 31 deletions

diff --git a/usr/src/cmd/fs.d/udfs/fsck/pass1.c b/usr/src/cmd/fs.d/udfs/fsck/pass1.c
index e0c736ec2f..a7b1b2985c 100644
--- a/usr/src/cmd/fs.d/udfs/fsck/pass1.c
+++ b/usr/src/cmd/fs.d/udfs/fsck/pass1.c
@@ -92,11 +92,11 @@ static uint32_t baseblock;
 static uint8_t fidbuf[MAXFIDSIZE];
 
 void
-pass1()
+pass1(void)
 {
-	register struct file_entry *fp;
-	register struct fileinfo *fip;
-	register struct bufarea *bp;
+	struct file_entry *fp;
+	struct fileinfo *fip;
+	struct bufarea *bp;
 	struct file_id *fidp;
 	struct bufarea *fbp;
 	int err;
@@ -115,7 +115,6 @@ pass1()
 				fip->fe_block);
 			goto next;
 		}
-		/* LINTED */
 		fp = (struct file_entry *)bp->b_un.b_buf;
 		fip->fe_lcount = fp->fe_lcount;
 		fip->fe_type = fp->fe_icb_tag.itag_ftype;
@@ -258,7 +257,6 @@ getallocext(struct file_entry *fp, uint32_t loc, uint32_t len)
 			gettext("Can't read allocation extent\n"));
 		return (1);
 	}
-	/* LINTED */
 	aep = (struct alloc_ext_desc *)extbuf;
 	err = verifytag(&aep->aed_tag, loc, &aep->aed_tag, UD_ALLOC_EXT_DESC);
 	if (err) {
@@ -274,10 +272,8 @@ getallocext(struct file_entry *fp, uint32_t loc, uint32_t len)
 	/* Swap the descriptors */
 	for (i = 0, ap = dir_adrlist; i < dir_naddrs; i++, ap += dir_adrsize) {
 		if (dir_adrsize == sizeof (short_ad_t)) {
-			/* LINTED */
 			ud_swap_short_ad((short_ad_t *)ap);
 		} else if (dir_adrsize == sizeof (long_ad_t)) {
-			/* LINTED */
 			ud_swap_long_ad((long_ad_t *)ap);
 		}
 	}
@@ -302,14 +298,13 @@ static int32_t
 getdir(struct file_entry *fp, struct bufarea **fbp,
 	u_offset_t *poffset, struct file_id **fidpp)
 {
-	/* LINTED */
-	register struct file_id *fidp = (struct file_id *)fidbuf;
-	register struct short_ad *sap;
-	register struct long_ad *lap;
-	register int i, newoff, xoff = 0;
-	uint32_t block = 0, nb, len, left;
+	struct file_id *fidp = (struct file_id *)fidbuf;
+	struct short_ad *sap;
+	struct long_ad *lap;
+	int i, newoff, xoff = 0;
+	uint32_t block = 0, nb, len = 0, left;
 	u_offset_t offset;
-	int err, type;
+	int err, type = 0;
 
 
 again:
@@ -332,7 +327,6 @@ again2:
 again3:
 	switch (fp->fe_icb_tag.itag_flags & 0x3) {
 	case ICB_FLAG_SHORT_AD:
-		/* LINTED */
 		sap = &((short_ad_t *)dir_adrlist)[dir_adrindx];
 		for (i = dir_adrindx; i < dir_naddrs; i++, sap++) {
 			len = EXTLEN(sap->sad_ext_len);
@@ -381,7 +375,6 @@ again3:
 		dir_fidp = dirbuf;
 		break;
 	case ICB_FLAG_LONG_AD:
-		/* LINTED */
 		lap = &((long_ad_t *)dir_adrlist)[dir_adrindx];
 		for (i = dir_adrindx; i < dir_naddrs; i++, lap++) {
 			len = EXTLEN(lap->lad_ext_len);
@@ -472,15 +465,14 @@ nextone:
 static void
 ckinode(struct file_entry *fp)
 {
-	register struct short_ad *sap;
-	register struct long_ad *lap;
-	register int i, type, len;
+	struct short_ad *sap = NULL;
+	struct long_ad *lap;
+	int i, type, len;
 
 	switch (fp->fe_icb_tag.itag_flags & 0x3) {
 	case ICB_FLAG_SHORT_AD:
 		dir_adrsize = sizeof (short_ad_t);
 		dir_naddrs = fp->fe_len_adesc / sizeof (short_ad_t);
-		/* LINTED */
 		sap = (short_ad_t *)(fp->fe_spec + fp->fe_len_ear);
 again1:
 		for (i = 0; i < dir_naddrs; i++, sap++) {
@@ -497,7 +489,6 @@ again1:
 				/* This changes dir_naddrs and dir_adrlist */
 				if (getallocext(fp, sap->sad_ext_loc, len))
 					break;
-				/* LINTED */
 				sap = (short_ad_t *)dir_adrlist;
 				goto again1;
 			}
@@ -506,7 +497,6 @@ again1:
 	case ICB_FLAG_LONG_AD:
 		dir_adrsize = sizeof (long_ad_t);
 		dir_naddrs = fp->fe_len_adesc / sizeof (long_ad_t);
-		/* LINTED */
 		lap = (long_ad_t *)(fp->fe_spec + fp->fe_len_ear);
 again2:
 		for (i = 0; i < dir_naddrs; i++, lap++) {
@@ -523,7 +513,6 @@ again2:
 				/* This changes dir_naddrs and dir_adrlist */
 				if (getallocext(fp, lap->lad_ext_loc, len))
 					break;
-				/* LINTED */
 				lap = (long_ad_t *)dir_adrlist;
 				goto again2;
 			}
@@ -539,14 +528,13 @@ again2:
 static void
 adjust(struct fileinfo *fip)
 {
-	register struct file_entry *fp;
-	register struct bufarea *bp;
+	struct file_entry *fp;
+	struct bufarea *bp;
 
 	bp = getfilentry(fip->fe_block, fip->fe_len);
 	if (bp == NULL)
 		errexit(gettext("Unable to read file entry at %x\n"),
 			fip->fe_block);
-	/* LINTED */
 	fp = (struct file_entry *)bp->b_un.b_buf;
 	pwarn(gettext("LINK COUNT %s I=%x"),
 		fip->fe_type == FTYPE_DIRECTORY ? "DIR" :
@@ -571,10 +559,10 @@ adjust(struct fileinfo *fip)
 }
 
 void
-dofreemap()
+dofreemap(void)
 {
-	register int i;
-	register char *bp, *fp;
+	int i;
+	char *bp, *fp;
 	struct inodesc idesc;
 
 	if (freemap == NULL)
@@ -602,7 +590,7 @@ dofreemap()
 }
 
 void
-dolvint()
+dolvint(void)
 {
 	struct lvid_iu *lviup;
 	struct inodesc idesc;