Be explicit in order of evaluation in the reiserfs code

GCC Has helpfully pointed out that we're doing some strange things:

second/fs_reiserfs.c: In function ‘block_read’:
second/fs_reiserfs.c:219: warning: operation on ‘journal_table’ may be undefined
second/fs_reiserfs.c:219: warning: operation on ‘journal_table’ may be undefined
second/fs_reiserfs.c:219: warning: operation on ‘journal_table’ may be undefined
second/fs_reiserfs.c: In function ‘next_key’:
second/fs_reiserfs.c:619: warning: operation on ‘depth’ may be undefined

Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>

diff --git a/second/fs_reiserfs.c b/second/fs_reiserfs.c
index b0c3ac00ee6743c3c6a21c8173462921446be0c9..a312ced0d9efff213ea18a391e7d812c94690022 100644 (file)
--- a/second/fs_reiserfs.c
+++ b/second/fs_reiserfs.c
@@ -218,7 +218,7 @@ block_read( __u32 blockNr, __u32 start, __u32 len, char *buffer )
          if ( *journal_table != 0xffffffff )
          {
               /* Search for the blockNr in cached journal */
          if ( *journal_table != 0xffffffff )
          {
               /* Search for the blockNr in cached journal */

-              j_len = le32_to_cpu(*journal_table++);
+              j_len = le32_to_cpu((*journal_table)++);

               while ( i++ < j_len )
               {
                    if ( le32_to_cpu(*journal_table++) == blockNr )
               while ( i++ < j_len )
               {
                    if ( le32_to_cpu(*journal_table++) == blockNr )


@@ -618,7 +618,10 @@ next_key( void )
               cache = CACHE( depth );
          else
          {
               cache = CACHE( depth );
          else
          {

-              cache = read_tree_node( INFO->blocks[depth], --depth );
+              /* Save depth as using it twice as args to read_tree_node()
+               * has undefined behaviour */
+              __u16 d = depth;
+              cache = read_tree_node( INFO->blocks[d], --depth );

               if ( !cache )
                    return 0;
          }
               if ( !cache )
                    return 0;
          }