Patchwork e2fsprogs: remove leftover retval check

login
register
mail settings
Submitter Lukas Czerner
Date March 15, 2011, 11:58 a.m.
Message ID <1300190318-23164-1-git-send-email-lczerner@redhat.com>
Download mbox | patch
Permalink /patch/86967/
State Not Applicable
Headers show

Comments

Lukas Czerner - March 15, 2011, 11:58 a.m.
Remove leftover retval check from the read_bitmaps(). It is not
necessary as it is not previously set by any function, moreover the
retval value is not initialized in definition which may cause errors
when garbage data appears in it.

Also initialize retval to zero in definition.

Signed-off-by: Lukas Czerner <lczerner@redhat.com>
---
 lib/ext2fs/rw_bitmaps.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)
Lukas Czerner - March 15, 2011, 12:02 p.m.
On Tue, 15 Mar 2011, Lukas Czerner wrote:

> Remove leftover retval check from the read_bitmaps(). It is not
> necessary as it is not previously set by any function, moreover the
> retval value is not initialized in definition which may cause errors
> when garbage data appears in it.
> 
> Also initialize retval to zero in definition.
> 
> Signed-off-by: Lukas Czerner <lczerner@redhat.com>

Once again I was too hasty. Please ignore it, this is not present in
master branch. Sorry for the noise!

-Lukas

> ---
>  lib/ext2fs/rw_bitmaps.c |    4 +---
>  1 files changed, 1 insertions(+), 3 deletions(-)
> 
> diff --git a/lib/ext2fs/rw_bitmaps.c b/lib/ext2fs/rw_bitmaps.c
> index d6f35fd..086d4b7 100644
> --- a/lib/ext2fs/rw_bitmaps.c
> +++ b/lib/ext2fs/rw_bitmaps.c
> @@ -33,7 +33,7 @@ static errcode_t write_bitmaps(ext2_filsys fs, int do_inode, int do_block)
>  	unsigned int	j;
>  	int		block_nbytes, inode_nbytes;
>  	unsigned int	nbits;
> -	errcode_t	retval;
> +	errcode_t	retval = 0;
>  	char 		*block_buf, *inode_buf;
>  	int		csum_flag = 0;
>  	blk64_t		blk;
> @@ -159,8 +159,6 @@ static errcode_t read_bitmaps(ext2_filsys fs, int do_inode, int do_block)
>  				       EXT4_FEATURE_RO_COMPAT_GDT_CSUM))
>  		csum_flag = 1;
>  
> -	if (retval)
> -		return retval;
>  	if (do_block) {
>  		if (fs->block_map)
>  			ext2fs_free_block_bitmap(fs->block_map);
>

Patch

diff --git a/lib/ext2fs/rw_bitmaps.c b/lib/ext2fs/rw_bitmaps.c
index d6f35fd..086d4b7 100644
--- a/lib/ext2fs/rw_bitmaps.c
+++ b/lib/ext2fs/rw_bitmaps.c
@@ -33,7 +33,7 @@  static errcode_t write_bitmaps(ext2_filsys fs, int do_inode, int do_block)
 	unsigned int	j;
 	int		block_nbytes, inode_nbytes;
 	unsigned int	nbits;
-	errcode_t	retval;
+	errcode_t	retval = 0;
 	char 		*block_buf, *inode_buf;
 	int		csum_flag = 0;
 	blk64_t		blk;
@@ -159,8 +159,6 @@  static errcode_t read_bitmaps(ext2_filsys fs, int do_inode, int do_block)
 				       EXT4_FEATURE_RO_COMPAT_GDT_CSUM))
 		csum_flag = 1;
 
-	if (retval)
-		return retval;
 	if (do_block) {
 		if (fs->block_map)
 			ext2fs_free_block_bitmap(fs->block_map);