Add missing return values in error return cases in the ext2fs library.

(Otherwise we return garbage instead of the error code.)

diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog
index a90dcbaf4eb64eff8535fb0dbf075d70d815d784..7b1677013db7e100e69f8d11abe91c8e08741982 100644 (file)
--- a/lib/ext2fs/ChangeLog
+++ b/lib/ext2fs/ChangeLog
@@ -1,3 +1,10 @@
+2005-04-09  Theodore Ts'o  <tytso@mit.edu>
+
+       * inode.c (ext2fs_write_new_inode), 
+               ind_block.c (ext2fs_read_ind_block): Add missing return
+               value in error return case.  (Otherwise we return garbage
+               instead of the error code.)
+
 2005-03-31  Theodore Ts'o  <tytso@mit.edu>
 
        * test_io.c (test_open): If called by a setuid/setgid or an

diff --git a/lib/ext2fs/ind_block.c b/lib/ext2fs/ind_block.c
index 9f77a079de5ded172d58e73f6ad2869677b28841..3519048311221f59c7946ac26fb88dc21f1521eb 100644 (file)
--- a/lib/ext2fs/ind_block.c
+++ b/lib/ext2fs/ind_block.c
@@ -32,7 +32,7 @@ errcode_t ext2fs_read_ind_block(ext2_filsys fs, blk_t blk, void *buf)
        else {
                retval = io_channel_read_blk(fs->io, blk, 1, buf);
                if (retval)
-                       retval;
+                       return retval;
        }
 #ifdef EXT2FS_ENABLE_SWAPFS
        if (fs->flags & (EXT2_FLAG_SWAP_BYTES | EXT2_FLAG_SWAP_BYTES_READ)) {

diff --git a/lib/ext2fs/inode.c b/lib/ext2fs/inode.c
index 99bd5d58d8211185104896b6064c4e84407ba589..222568ebe74850fa402e191a425a767b8a9fa4a3 100644 (file)
--- a/lib/ext2fs/inode.c
+++ b/lib/ext2fs/inode.c
@@ -724,7 +724,6 @@ errcode_t ext2fs_write_new_inode(ext2_filsys fs, ext2_ino_t ino,
                                 struct ext2_inode *inode)
 {
        struct ext2_inode       *buf;
-       errcode_t               retval;
        int                     size = EXT2_INODE_SIZE(fs->super);
        struct ext2_inode_large *large_inode;
 
@@ -743,7 +742,7 @@ errcode_t ext2fs_write_new_inode(ext2_filsys fs, ext2_ino_t ino,
        large_inode->i_extra_isize = sizeof(struct ext2_inode_large) - 
                EXT2_GOOD_OLD_INODE_SIZE;
 
-       retval = ext2fs_write_inode_full(fs, ino, buf, size);
+       return ext2fs_write_inode_full(fs, ino, buf, size);
 }