Index: sys/isofs/cd9660/cd9660_rrip.c
===================================================================
RCS file: /home/ncvs/src/sys/isofs/cd9660/cd9660_rrip.c,v
retrieving revision 1.28
diff -u -r1.28 cd9660_rrip.c
--- sys/isofs/cd9660/cd9660_rrip.c	3 Jul 2004 16:56:45 -0000	1.28
+++ sys/isofs/cd9660/cd9660_rrip.c	30 Jul 2005 00:01:30 -0000
@@ -488,7 +488,7 @@
 	ISO_SUSP_HEADER *pend;
 	struct buf *bp = NULL;
 	char *pwhead;
-	u_short c;
+	uint32_t c;
 	int result;
 
 	/*
@@ -625,7 +625,7 @@
 {
 	ISO_RRIP_ANALYZE analyze;
 	RRIP_TABLE *tab;
-	u_short c;
+	uint32_t c;
 
 	analyze.outbuf = outbuf;
 	analyze.outlen = outlen;
Index: sys/isofs/cd9660/cd9660_util.c
===================================================================
RCS file: /home/ncvs/src/sys/isofs/cd9660/cd9660_util.c,v
retrieving revision 1.22
diff -u -r1.22 cd9660_util.c
--- sys/isofs/cd9660/cd9660_util.c	7 Apr 2004 20:46:09 -0000	1.22
+++ sys/isofs/cd9660/cd9660_util.c	30 Jul 2005 00:01:30 -0000
@@ -44,8 +44,8 @@
 #include <sys/vnode.h>
 #include <sys/iconv.h>
 
-#include <isofs/cd9660/iso.h>
 #include <isofs/cd9660/cd9660_mount.h>
+#include <isofs/cd9660/iso.h>
 
 extern struct iconv_functions *cd9660_iconv;
 
@@ -59,7 +59,7 @@
       u_char *isofn;
       u_char *isoend;
       int joliet_level;
-      u_short *c;
+      uint32_t *c;
       int *clen;
       int flags;
       void *handle;
@@ -74,7 +74,8 @@
               return 1;
 
       if (flags & ISOFSMNT_KICONV && cd9660_iconv) {
-              i = j = len = 2;
+              i = 2;
+              j = len = sizeof(*c);
               inbuf[0]=(char)*(isofn - 1);
               inbuf[1]=(char)*isofn;
               inbuf[2]='\0';
@@ -117,7 +118,7 @@
 	void *lhandle;
 {
 	int i, j;
-	u_short c, d;
+	uint32_t c, d;
 	u_char *fnend = fn + fnlen, *isoend = isofn + isolen;
 
 	for (; fn < fnend; ) {
@@ -186,7 +187,7 @@
 	int flags;
 	void *handle;
 {
-	u_short c, d = '\0';
+	uint32_t c, d = '\0';
 	u_char *outp = outfn, *infnend = infn + infnlen;
 	int clen;
 
@@ -212,7 +213,7 @@
 /*
  * same as sgetrune(3)
  */
-u_short
+uint32_t
 sgetrune(string, n, result, flags, handle)
 	const char *string;
 	size_t n;
@@ -222,9 +223,9 @@
 {
 	size_t i, j, len;
 	char outbuf[3], *outp;
-	u_short c = '\0';
+	uint32_t c = '\0';
 
-	len = i = (n < 2) ? n : 2;
+	len = i = (n < sizeof(c)) ? n : sizeof(c);
 	j = 2;
 	outp = outbuf;
 
Index: sys/isofs/cd9660/iso.h
===================================================================
RCS file: /home/ncvs/src/sys/isofs/cd9660/iso.h,v
retrieving revision 1.30
diff -u -r1.30 iso.h
--- sys/isofs/cd9660/iso.h	14 Mar 2005 13:22:41 -0000	1.30
+++ sys/isofs/cd9660/iso.h	30 Jul 2005 00:01:30 -0000
@@ -264,11 +264,11 @@
 extern struct vop_vector cd9660_vnodeops;
 extern struct vop_vector cd9660_fifoops;
 
-int isochar(u_char *, u_char *, int, u_short *, int *, int, void *);
+int isochar(u_char *, u_char *, int, uint32_t *, int *, int, void *);
 int isofncmp(u_char *, int, u_char *, int, int, int, void *, void *);
 void isofntrans(u_char *, int, u_char *, u_short *, int, int, int, int, void *);
 ino_t isodirino(struct iso_directory_record *, struct iso_mnt *);
-u_short sgetrune(const char *, size_t, char const **, int, void *);
+uint32_t sgetrune(const char *, size_t, char const **, int, void *);
 
 #endif /* _KERNEL */