From d163b0948731e6d84bd3efe75075a2d0a8009272 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Fri, 3 Oct 1997 17:42:28 +0000 Subject: [PATCH] ChangeLog, bmove.c, icount.c, inode.c, llseek.c: llseek.c (ext2fs_llseek): Fix type error for ext2fs_llseek() icount.c (ext2fs_icount_validate): bmove.c (process_block): Fix lint error in type for fprintf(). inode.c (ext2fs_check_directory): Add support for the callback to return the error code EXT2_ET_CALLBACK_NOTHANDLED. ChangeLog, mke2fs.c: Make parse_raid_opts return a void, to fix a -Wall warning. --- lib/ext2fs/ChangeLog | 12 ++++++++++++ lib/ext2fs/bmove.c | 2 +- lib/ext2fs/icount.c | 2 +- lib/ext2fs/inode.c | 9 ++++++--- lib/ext2fs/llseek.c | 3 +-- misc/ChangeLog | 5 +++++ misc/mke2fs.c | 2 +- 7 files changed, 27 insertions(+), 8 deletions(-) diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog index 300ecf1..59c7092 100644 --- a/lib/ext2fs/ChangeLog +++ b/lib/ext2fs/ChangeLog @@ -1,3 +1,15 @@ +Fri Oct 3 13:35:59 1997 Theodore Ts'o + + * llseek.c (ext2fs_llseek): Fix type error for ext2fs_llseek() + + * icount.c (ext2fs_icount_validate): + * bmove.c (process_block): Fix lint error in type for fprintf(). + +Mon Sep 15 11:45:09 1997 Theodore Ts'o + + * inode.c (ext2fs_check_directory): Add support for the callback + to return the error code EXT2_ET_CALLBACK_NOTHANDLED. + Thu Sep 4 12:28:22 1997 Theodore Ts'o * bitmaps.c (ext2fs_set_bitmap_padding): New function which sets the diff --git a/lib/ext2fs/bmove.c b/lib/ext2fs/bmove.c index d246aa4..ae9ac25 100644 --- a/lib/ext2fs/bmove.c +++ b/lib/ext2fs/bmove.c @@ -72,7 +72,7 @@ static int process_block(ext2_filsys fs, blk_t *block_nr, ext2fs_mark_block_bitmap(pb->alloc_map, block); ret = BLOCK_CHANGED; if (pb->flags & EXT2_BMOVE_DEBUG) - printf("ino=%ld, blockcnt=%d, %ld->%ld\n", pb->ino, + printf("ino=%ld, blockcnt=%d, %d->%d\n", pb->ino, blockcnt, orig, block); } if (pb->add_dir) { diff --git a/lib/ext2fs/icount.c b/lib/ext2fs/icount.c index a91496a..4e074c0 100644 --- a/lib/ext2fs/icount.c +++ b/lib/ext2fs/icount.c @@ -286,7 +286,7 @@ errcode_t ext2fs_icount_validate(ext2_icount_t icount, FILE *out) } for (i=1; i < icount->count; i++) { if (icount->list[i-1].ino >= icount->list[i].ino) { - fprintf(out, "%s: list[%d].ino=%u, list[%d].ino=%u\n", + fprintf(out, "%s: list[%d].ino=%ld, list[%d].ino=%ld\n", bad, i-1, icount->list[i-1].ino, i, icount->list[i].ino); ret = EINVAL; diff --git a/lib/ext2fs/inode.c b/lib/ext2fs/inode.c index 37c47c4..86aa01e 100644 --- a/lib/ext2fs/inode.c +++ b/lib/ext2fs/inode.c @@ -84,7 +84,7 @@ errcode_t ext2fs_open_inode_scan(ext2_filsys fs, int buffer_blocks, { ext2_inode_scan scan; errcode_t retval; - errcode_t (*save_get_blocks)(ext2_filsys fs, ino_t ino, blk_t *blocks); + errcode_t (*save_get_blocks)(ext2_filsys f, ino_t ino, blk_t *blocks); EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS); @@ -629,8 +629,11 @@ errcode_t ext2fs_check_directory(ext2_filsys fs, ino_t ino) if (ino > fs->super->s_inodes_count) return EXT2_ET_BAD_INODE_NUM; - if (fs->check_directory) - return (fs->check_directory)(fs, ino); + if (fs->check_directory) { + retval = (fs->check_directory)(fs, ino); + if (retval != EXT2_ET_CALLBACK_NOTHANDLED) + return retval; + } retval = ext2fs_read_inode(fs, ino, &inode); if (retval) return retval; diff --git a/lib/ext2fs/llseek.c b/lib/ext2fs/llseek.c index 7afd002..b06590a 100644 --- a/lib/ext2fs/llseek.c +++ b/lib/ext2fs/llseek.c @@ -106,8 +106,7 @@ ext2_loff_t ext2fs_llseek (int fd, ext2_loff_t offset, int origin) #else /* !linux */ -ext2_loff_t ext2fs_llseek (unsigned int fd, ext2_loff_t offset, - unsigned int origin) +ext2_loff_t ext2fs_llseek (int fd, ext2_loff_t offset, int origin) { if ((sizeof(off_t) < sizeof(ext2_loff_t)) && (offset >= ((ext2_loff_t) 1 << ((sizeof(off_t)*8) -1)))) { diff --git a/misc/ChangeLog b/misc/ChangeLog index 18a0e7c..05f8102 100644 --- a/misc/ChangeLog +++ b/misc/ChangeLog @@ -1,3 +1,8 @@ +Fri Oct 3 13:38:45 1997 Theodore Ts'o + + * mke2fs.c (parse_raid_opts): Make parse_raid_opts return a void, + to fix a -Wall warning. + Mon Sep 15 22:07:12 1997 Theodore Ts'o * tune2fs.c (main): diff --git a/misc/mke2fs.c b/misc/mke2fs.c index 96ce51e..0b5e070 100644 --- a/misc/mke2fs.c +++ b/misc/mke2fs.c @@ -538,7 +538,7 @@ static int set_os(struct ext2_super_block *sb, char *os) #define PATH_SET "PATH=/sbin" -static parse_raid_opts(const char *opts) +static void parse_raid_opts(const char *opts) { char *buf, *token, *next, *p, *arg; int len; -- 1.8.3.1