diff options
| author | Theodore Ts'o <tytso@mit.edu> | 1998-03-30 01:27:25 +0000 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 1998-03-30 01:27:25 +0000 |
| commit | 4a31c48b827f378f386b28461fd14b41d709e4eb (patch) | |
| tree | 9eaae601bd53360b6e46387edbc3cf8c6439b379 /debugfs | |
| parent | a789d8406070224503c9ab78040acc7ea80c65ae (diff) | |
| download | e2fsprogs-4a31c48b827f378f386b28461fd14b41d709e4eb.tar.gz | |
ChangeLog, Makefile.in, bmap.c, bmove.c, ext2fs.h, jump.funcs:
ext2fs.h: If __STRICT_ANSI__ is defined and we're on a platform with
32 bit longs, then we need to manually define __s64 and __u64, since
the current kernel header files don't define these if __STRICT_ANSI__
is defined. This is a problem if we are compiling with full GCC
warnings, since we do need 64 bit support.
Makefile.in (OBJS): Remove bmove.o from files to be built, since we're
not using ext2fs_move_blocks() and there is some question as to its
usefulness in its current form.
bmap.c (block_bmap): Remove unused function.
bmove.c (process_block): Fix -Wall warning.
ChangeLog, debugfs.c, debugfs.h, dump.c:
debugfs.h: Add declaration for do_dirty_filsys() to prevent -Wall
warnings.
debugfs.c (copy_file):
dump.c (dump_file): Fix -Wall warning caused by signed/unsigned mismatch.
Diffstat (limited to 'debugfs')
| -rw-r--r-- | debugfs/ChangeLog | 9 | ||||
| -rw-r--r-- | debugfs/debugfs.c | 4 | ||||
| -rw-r--r-- | debugfs/debugfs.h | 2 | ||||
| -rw-r--r-- | debugfs/dump.c | 3 |
4 files changed, 14 insertions, 4 deletions
diff --git a/debugfs/ChangeLog b/debugfs/ChangeLog index 834f8e19..fa3d50ec 100644 --- a/debugfs/ChangeLog +++ b/debugfs/ChangeLog @@ -1,3 +1,12 @@ +1998-03-29 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * debugfs.h: Add declaration for do_dirty_filsys() to prevent + -Wall warnings. + + * debugfs.c (copy_file): + * dump.c (dump_file): Fix -Wall warning caused by + signed/unsigned mismatch. + 1998-03-23 Theodore Ts'o <tytso@rsts-11.mit.edu> * debugfs.c, ls.c, lsdel.c: Add support for large files. (The diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c index 232d0bef..3c667955 100644 --- a/debugfs/debugfs.c +++ b/debugfs/debugfs.c @@ -248,7 +248,7 @@ void do_show_super_stats(int argc, char *argv[]) close_pager(out); } -void do_dirty_filesys(int argc, char *argv[]) +void do_dirty_filesys(int argc, char **argv) { if (check_fs_open(argv[0])) return; @@ -961,7 +961,7 @@ static errcode_t copy_file(int fd, ino_t newfile) { ext2_file_t e2_file; errcode_t retval; - int got, written; + unsigned int got, written; char buf[8192]; char *ptr; diff --git a/debugfs/debugfs.h b/debugfs/debugfs.h index 0ac71cf2..6ac13f9f 100644 --- a/debugfs/debugfs.h +++ b/debugfs/debugfs.h @@ -39,7 +39,7 @@ extern void do_icheck(int argc, char **argv); extern void do_ncheck(int argc, char **argv); /* debugfs.c */ - +extern void do_dirty_filesys(int argc, char **argv); extern void do_open_filesys(int argc, char **argv); extern void do_close_filesys(int argc, char **argv); extern void do_init_filesys(int argc, char **argv); diff --git a/debugfs/dump.c b/debugfs/dump.c index 6fcb140b..d3919dd1 100644 --- a/debugfs/dump.c +++ b/debugfs/dump.c @@ -69,7 +69,8 @@ static void dump_file(char *cmdname, ino_t ino, int fd, int preserve, struct utimbuf ut; char buf[8192]; ext2_file_t e2_file; - int nbytes, got; + int nbytes; + unsigned int got; retval = ext2fs_read_inode(current_fs, ino, &inode); if (retval) { |