commit 4a6005666e1f62442cb55fabd946f454605e340e
author Theodore Ts'o <tytso@mit.edu> Tue Oct 26 14:35:51 1999 +0000
committer Theodore Ts'o <tytso@mit.edu> Tue Oct 26 14:35:51 1999 +0000
tree 40bdc29e33eba6b5db0055746bfb9b84ddf1b1c8
parent b5135717e72626334f929ca2ddf75cecbb1f9c99

ChangeLog, mke2fs.c:
  mke2fs.c (PRS): Fix gcc warnings; add const to some char * variables,
  	including in struct mke2fs_defaults.

misc/mke2fs.c

diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index 5ab30eb..e06c5f7 100644
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -201,10 +201,10 @@
  */
 static char default_str[] = "default";
 struct mke2fs_defaults {
-	char	*type;
-	int	size;
-	int	blocksize;
-	int	inode_ratio;
+	const char	*type;
+	int		size;
+	int		blocksize;
+	int		inode_ratio;
 } settings[] = {
 	{ default_str, 0, 4096, 8192 },
 	{ default_str, 512, 1024, 4096 },
@@ -710,24 +710,24 @@
 
 static void PRS(int argc, char *argv[])
 {
-	int	c;
-	int	size;
-	char	* tmp;
-	blk_t	max = 8192;
-	int	blocksize = 0;
-	int	inode_ratio = 0;
-	int	reserved_ratio = 5;
-	ino_t	num_inodes = 0;
+	int		c;
+	int		size;
+	char *		tmp;
+	blk_t		max = 8192;
+	int		blocksize = 0;
+	int		inode_ratio = 0;
+	int		reserved_ratio = 5;
+	ino_t		num_inodes = 0;
 	errcode_t	retval;
-	int	sparse_option = 0;
-	char	*oldpath = getenv("PATH");
+	int		sparse_option = 0;
+	char *		oldpath = getenv("PATH");
 	struct ext2fs_sb *param_ext2 = (struct ext2fs_sb *) &param;
-	char	*raid_opts = 0;
-	char	*fs_type = 0;
-	char	*feature_set = "filetype,sparse_super";
-	blk_t	dev_size;
+	char *		raid_opts = 0;
+	char *		fs_type = 0;
+	const char *	feature_set = "filetype,sparse_super";
+	blk_t		dev_size;
 #ifdef linux
-	struct utsname ut;
+	struct 		utsname ut;
 
 	if (uname(&ut)) {
 		perror("uname");