fix code to build for both variants of uuid definitions - straight array and array

embedded in a struct.
Merge of master-melb:xfs-cmds:26504a by kenmcd.

  bump for uuid copy fix for logprint

diff --git a/VERSION b/VERSION
index dcc46e0b785191e6a63d8be7595efcfa99541344..24901a8497681a0ce309242b78ee31c1f73e65c9 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=2
 PKG_MINOR=8
-PKG_REVISION=6
+PKG_REVISION=7
 PKG_BUILD=1

diff --git a/doc/CHANGES b/doc/CHANGES
index 165db255dd8de90d9a65aed37856bbe432e63669..a4158db770efbfbded00d86a73cd7f56fb4dbc73 100644 (file)
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,7 @@
+xfsprogs-2.8.7 (10 July 2006)
+       - Fix build of xfs_logprint for different uuid_t definitions;
+          thanks to Craig Rodrigues.
+
 xfsprogs-2.8.6 (07 July 2006)
        - Fixed xfs_repair handling of duplicate names in a directory.
 

diff --git a/logprint/log_misc.c b/logprint/log_misc.c
index 920c7b2c967b7fcd9250bde6b4fdc8155126af26..5298f2284986317ed703048b32a8c8db2ac02abe 100644 (file)
--- a/logprint/log_misc.c
+++ b/logprint/log_misc.c
@@ -1530,7 +1530,7 @@ xfs_inode_item_format_convert(char *src_buf, uint len, xfs_inode_log_format_t *i
                in_f->ilf_dsize = in_f32->ilf_dsize;
                in_f->ilf_ino = in_f32->ilf_ino;
                /* copy biggest */
-               memcpy(in_f->ilf_u.ilfu_uuid, in_f32->ilf_u.ilfu_uuid, sizeof(uuid_t));
+               memcpy(&in_f->ilf_u.ilfu_uuid, &in_f32->ilf_u.ilfu_uuid, sizeof(uuid_t));
                in_f->ilf_blkno = in_f32->ilf_blkno;
                in_f->ilf_len = in_f32->ilf_len;
                in_f->ilf_boffset = in_f32->ilf_boffset;
@@ -1546,7 +1546,7 @@ xfs_inode_item_format_convert(char *src_buf, uint len, xfs_inode_log_format_t *i
                in_f->ilf_dsize = in_f64->ilf_dsize;
                in_f->ilf_ino = in_f64->ilf_ino;
                /* copy biggest */
-               memcpy(in_f->ilf_u.ilfu_uuid, in_f64->ilf_u.ilfu_uuid, sizeof(uuid_t));
+               memcpy(&in_f->ilf_u.ilfu_uuid, &in_f64->ilf_u.ilfu_uuid, sizeof(uuid_t));
                in_f->ilf_blkno = in_f64->ilf_blkno;
                in_f->ilf_len = in_f64->ilf_len;
                in_f->ilf_boffset = in_f64->ilf_boffset;