From 9094f28440b6c504a80d97aeea2dab543f97978b Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Tue, 26 Oct 1999 16:42:50 +0000 Subject: [PATCH] ChangeLog, mke2fs.c: mke2fs.c (set_fs_defaults): Changed parameter name to avoid gcc warnings. Makefile.in: Update dependency information. --- debugfs/Makefile.in | 2 +- misc/ChangeLog | 4 +++- misc/mke2fs.c | 8 ++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/debugfs/Makefile.in b/debugfs/Makefile.in index 5890a29..8898735 100644 --- a/debugfs/Makefile.in +++ b/debugfs/Makefile.in @@ -79,7 +79,7 @@ debugfs.o: $(srcdir)/debugfs.c $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/debugfs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/bitops.h $(top_srcdir)/lib/uuid/uuid.h \ - $(srcdir)/../version.h + $(top_srcdir)/lib/e2p/e2p.h $(srcdir)/../version.h util.o: $(srcdir)/util.c $(srcdir)/debugfs.h \ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/et/com_err.h \ $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ diff --git a/misc/ChangeLog b/misc/ChangeLog index 6133fb3..1c8dc56 100644 --- a/misc/ChangeLog +++ b/misc/ChangeLog @@ -6,7 +6,9 @@ typed variables. Eliminated non-portable use of u_char. * mke2fs.c (PRS): Fix gcc warnings; add const to some char * - variables, including in struct mke2fs_defaults. + variables, including in struct mke2fs_defaults. + (set_fs_defaults): Changed parameter name to avoid + gcc warnings. * fsck.c (wait_one): Fix gcc warnings; add #include for ctype.h, add const to char * variables, and use NOARGS to declare diff --git a/misc/mke2fs.c b/misc/mke2fs.c index e06c5f7..44c40b8 100644 --- a/misc/mke2fs.c +++ b/misc/mke2fs.c @@ -213,14 +213,14 @@ struct mke2fs_defaults { { 0, 0, 0, 0}, }; -static void set_fs_defaults(char *fs_type, struct ext2fs_sb *param, +static void set_fs_defaults(char *fs_type, struct ext2fs_sb *super, int blocksize, int *inode_ratio) { int megs; int ratio = 0; struct mke2fs_defaults *p; - megs = (param->s_blocks_count * (EXT2_BLOCK_SIZE(param) / 1024) / + megs = (super->s_blocks_count * (EXT2_BLOCK_SIZE(super) / 1024) / 1024); if (inode_ratio) ratio = *inode_ratio; @@ -236,12 +236,12 @@ static void set_fs_defaults(char *fs_type, struct ext2fs_sb *param, if (ratio == 0) *inode_ratio = p->inode_ratio; if (blocksize == 0) { - param->s_log_frag_size = param->s_log_block_size = + super->s_log_frag_size = super->s_log_block_size = log2(p->blocksize >> EXT2_MIN_BLOCK_LOG_SIZE); } } if (blocksize == 0) - param->s_blocks_count /= EXT2_BLOCK_SIZE(param) / 1024; + super->s_blocks_count /= EXT2_BLOCK_SIZE(super) / 1024; } /* -- 1.8.3.1