diff options
| author | Tom Rini <[email protected]> | 2012-08-07 09:58:34 -0700 |
|---|---|---|
| committer | Wolfgang Denk <[email protected]> | 2012-08-07 20:52:42 +0200 |
| commit | 94c1a20fe78c0d3ba44ee8674b91163dddad0d80 (patch) | |
| tree | d110db075f8ab89403f7c7b06ec74e91a91b764c | |
| parent | 56249fea3d5e32cddcd9160e51ec93a9c4327c6b (diff) | |
ext2fs: fix warning: 'blocknxt' may be used uninitialized with gcc 4.2
The above warning was introduced originally in 436da3c "ext2load:
increase read speed" and fixed for newer toolchains in b803273 "ext2fs:
fix warning: 'blocknxt' may be used uninitialized". This change did not
fix the warning with gcc 4.2, as found in ELDK 4.2.
If we rework the while loop to initalize blocknxt before entering the
warning really goes away. Tested on am335x with an approx 7mb file and
crc32 in U-Boot befor and after this change.
Cc: Wolfgang Denk <[email protected]>
Cc: Eric Nelson <[email protected]>
Cc: Thierry Reding <[email protected]>
Cc: Jason Cooper <[email protected]>
Cc: Andreas Bießmann <[email protected]>
Cc: Reinhard Arlt <[email protected]>
Cc: Kim Phillips <[email protected]>
Signed-off-by: Tom Rini <[email protected]>
| -rw-r--r-- | fs/ext2/ext2fs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext2/ext2fs.c b/fs/ext2/ext2fs.c index 182f0acacae..418404e6062 100644 --- a/fs/ext2/ext2fs.c +++ b/fs/ext2/ext2fs.c @@ -440,9 +440,8 @@ int ext2fs_read_file /* grab middle blocks in one go */ if (i != pos / blocksize && i < blockcnt - 1 && blockcnt > 3) { int oldblk = blknr; - int blocknxt; + int blocknxt = ext2fs_read_block(node, i + 1); while (i < blockcnt - 1) { - blocknxt = ext2fs_read_block(node, i + 1); if (blocknxt == (oldblk + 1)) { oldblk = blocknxt; i++; @@ -450,6 +449,7 @@ int ext2fs_read_file blocknxt = ext2fs_read_block(node, i); break; } + blocknxt = ext2fs_read_block(node, i); } if (oldblk == blknr) |