[1737] 2008-07-27 Bean <address@hidden>

[Bean]

Revision: 1737
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1737
Author:   bean
Date:     2008-07-27 14:20:49 +0000 (Sun, 27 Jul 2008)

Log Message:
-----------
2008-07-27  Bean  <address@hidden>

        * fs/xfs.c (grub_xfs_dir_header): Change field i8count back to
        smallino, as it's more descriptive, and i8count can be confused with
        the other field count.
        (grub_xfs_iterate_dir): Adjust grub_xfs_dir_entry pointer for small
        inode type.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/fs/xfs.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2008-07-27 13:51:30 UTC (rev 1736)
+++ trunk/grub2/ChangeLog       2008-07-27 14:20:49 UTC (rev 1737)
@@ -1,5 +1,13 @@
 2008-07-27  Bean  <address@hidden>
 
+       * fs/xfs.c (grub_xfs_dir_header): Change field i8count back to
+       smallino, as it's more descriptive, and i8count can be confused with
+       the other field count.
+       (grub_xfs_iterate_dir): Adjust grub_xfs_dir_entry pointer for small
+       inode type.
+
+2008-07-27  Bean  <address@hidden>
+
        * commands/crc.c: New file.
 
        * lib/crc.c: Likewise.

Modified: trunk/grub2/fs/xfs.c
===================================================================
--- trunk/grub2/fs/xfs.c        2008-07-27 13:51:30 UTC (rev 1736)
+++ trunk/grub2/fs/xfs.c        2008-07-27 14:20:49 UTC (rev 1737)
@@ -56,7 +56,7 @@
 struct grub_xfs_dir_header
 {
   grub_uint8_t count;
-  grub_uint8_t i8count;
+  grub_uint8_t smallino;
   union
   {
     grub_uint32_t i4;
@@ -423,7 +423,7 @@
     case XFS_INODE_FORMAT_INO:
       {
        struct grub_xfs_dir_entry *de = &diro->inode.data.dir.direntry[0];
-       int smallino = !diro->inode.data.dir.dirhead.i8count;
+       int smallino = !diro->inode.data.dir.dirhead.smallino;
        int i;
        grub_uint64_t parent;
 
@@ -433,12 +433,12 @@
          {
            parent = grub_be_to_cpu32 (diro->inode.data.dir.dirhead.parent.i4);
            parent = grub_cpu_to_be64 (parent);
+           /* The header is a bit smaller than usual.  */
+           de = (struct grub_xfs_dir_entry *) ((char *) de - 4);
          }
        else
          {
            parent = diro->inode.data.dir.dirhead.parent.i8;
-           /* The header is a bit bigger than usual.  */
-           de = (struct grub_xfs_dir_entry *) ((char *) de + 4);
          }
 
        /* Synthesize the direntries for `.' and `..'.  */