]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
ext2fs: fix warning: 'blocknxt' may be used uninitialized
authorKim Phillips <kim.phillips@freescale.com>
Tue, 3 Jul 2012 22:41:56 +0000 (17:41 -0500)
committerWolfgang Denk <wd@denx.de>
Sun, 8 Jul 2012 20:55:04 +0000 (22:55 +0200)
This warning was introduced in 436da3c "ext2load: increase read
speed":

ext2fs.c: In function 'ext2fs_read_file':
ext2fs.c:458:19: warning: 'blocknxt' may be used uninitialized in this function [-Wuninitialized]

this change makes it go away.

Cc: Eric Nelson <eric.nelson@boundarydevices.com>
Cc: Thierry Reding <thierry.reding@avionic-design.de>
Cc: Jason Cooper <u-boot@lakedaemon.net>
Cc: Andreas Bießmann <andreas.devel@googlemail.com>
Cc: Reinhard Arlt <reinhard.arlt@esd-electronics.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
fs/ext2/ext2fs.c

index f1fce48a3920d3ed1220005911ac2092a441f248..182f0acacaeda50e106d6161706503a413f5c63a 100644 (file)
@@ -438,7 +438,7 @@ int ext2fs_read_file
                }
 
                /* grab middle blocks in one go */
-               if (i != pos / blocksize && i != blockcnt - 1 && blockcnt > 3) {
+               if (i != pos / blocksize && i < blockcnt - 1 && blockcnt > 3) {
                        int oldblk = blknr;
                        int blocknxt;
                        while (i < blockcnt - 1) {