diff options
| author | Theodore Ts'o <tytso@mit.edu> | 1997-12-01 18:24:10 +0000 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 1997-12-01 18:24:10 +0000 |
| commit | 5be8dc2143c7b3b21a9b8fb56797dd855ee87560 (patch) | |
| tree | c05a66556a187b90c0bd8cab1429f04cd3587967 /lib/ext2fs/unix_io.c | |
| parent | 134ea28aaf76a3497361c99e115ff666b0c000b8 (diff) | |
| download | e2fsprogs-5be8dc2143c7b3b21a9b8fb56797dd855ee87560.tar.gz | |
Many files:
dblist.c (ext2fs_get_num_dirs): Make ext2fs_get_num_dirs more paranoid
about validating the directory counts from the block group
information.
all files: Don't include stdlib.h anymore; include it in ext2_fs.h,
since that file requires stdlib.h
ChangeLog, Makefile.in, dirinfo.c:
dirinfo.c (e2fsck_add_dir_info): Use ext2fs_get_num_dirs instead of
e2fsck_get_num_dirs, which has been removed.
Makefile.in (PROGS): Remove @EXTRA_PROGS@, since we don't want to
compile and install flushb.
ChangeLog, configure.in:
Remove @EXTRA_PROGS@, since we aren't using it in 2fsck/Makefile.in anymore
ChangeLog, Makefile.in:
Install debugfs in /sbin, instead of /usr/sbin.
libext2fs.texinfo:
Update version string to be 1.12
Makefile.in:
Fix bug in find script which made the exclusion list, where a '-' was
missing from an -name option.
Diffstat (limited to 'lib/ext2fs/unix_io.c')
| -rw-r--r-- | lib/ext2fs/unix_io.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/ext2fs/unix_io.c b/lib/ext2fs/unix_io.c index 53bedb9a..2c1d3c90 100644 --- a/lib/ext2fs/unix_io.c +++ b/lib/ext2fs/unix_io.c @@ -16,7 +16,6 @@ #if HAVE_UNISTD_H #include <unistd.h> #endif -#include <stdlib.h> #include <fcntl.h> #include <time.h> #if HAVE_SYS_STAT_H @@ -195,7 +194,7 @@ static errcode_t unix_read_blk(io_channel channel, unsigned long block, size = (count < 0) ? -count : count * channel->block_size; location = (ext2_loff_t) block * channel->block_size; if (ext2fs_llseek(data->dev, location, SEEK_SET) != location) { - retval = errno ? errno : EXT2_IO_LLSEEK_FAILED; + retval = errno ? errno : EXT2_ET_LLSEEK_FAILED; goto error_out; } actual = read(data->dev, buf, size); @@ -244,7 +243,7 @@ static errcode_t unix_write_blk(io_channel channel, unsigned long block, location = (ext2_loff_t) block * channel->block_size; if (ext2fs_llseek(data->dev, location, SEEK_SET) != location) { - retval = errno ? errno : EXT2_IO_LLSEEK_FAILED; + retval = errno ? errno : EXT2_ET_LLSEEK_FAILED; goto error_out; } |