patch-2.1.61 linux/fs/isofs/inode.c

• Lines: 48
• Date: Wed Oct 29 15:51:04 1997
• Orig file: v2.1.60/linux/fs/isofs/inode.c
• Orig date: Sat Oct 25 02:44:17 1997

diff -u --recursive --new-file v2.1.60/linux/fs/isofs/inode.c linux/fs/isofs/inode.c
@@ -89,8 +89,7 @@
 
 static int parse_options(char *options, struct iso9660_options * popt)
 {
-	char *this_char,*value,*p;
-	int len;
+	char *this_char,*value;
 
 	popt->map = 'n';
 	popt->rock = 'y';
@@ -135,6 +134,9 @@
 
 #ifdef CONFIG_JOLIET
 		if (!strcmp(this_char,"iocharset")) {
+			char *p;
+			int len;
+
 			p = value;
 			while (*value && *value != ',') value++;
 			len = value - p;
@@ -275,7 +277,6 @@
 	int				joliet_level = 0;
 	struct iso9660_options		opt;
 	int				orig_zonesize;
-	char			      * p;
 	struct iso_primary_descriptor * pri = NULL;
 	struct iso_directory_record   * rootp;
 	struct iso_supplementary_descriptor *sec = NULL;
@@ -413,8 +414,10 @@
 	    MOD_DEC_USE_COUNT;
 	    return NULL;
 	}
-#ifdef CONFIG_JOLIET
+
 	s->u.isofs_sb.s_joliet_level = joliet_level;
+
+#ifdef CONFIG_JOLIET
 	if (joliet_level) {
 	    /* Note: In theory, it is possible to have Rock Ridge
 	     * extensions mixed with Joliet. All character strings
@@ -549,6 +552,7 @@
 			opt.iocharset = NULL;
 		}
 	} else if (opt.utf8 == 0) {
+		char * p;
 		p = opt.iocharset ? opt.iocharset : "iso8859-1";
 		s->u.isofs_sb.s_nls_iocharset = load_nls(p);
 		if (! s->u.isofs_sb.s_nls_iocharset) {