* grub-core/io/lzopio.c: Use GRUB_PROPERLY_ALIGNED_ARRAY.

	* grub-core/loader/i386/bsd.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 8b4206eaffcbe7350df9ab37570e03bc6824dc86..835895b66626481a73e7913c974abe8673d01cf9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-28  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/io/lzopio.c: Use GRUB_PROPERLY_ALIGNED_ARRAY.
+       * grub-core/loader/i386/bsd.c: Likewise.
+
 2013-04-28  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/disk/ahci.c: Fix compilation for amd64 (format warnings).

diff --git a/grub-core/io/lzopio.c b/grub-core/io/lzopio.c
index 63bfbadc8a7df3675b08270eea12f8b51a608ca1..451d237afa7849ed5d3340bf22afe881ece20622 100644 (file)
--- a/grub-core/io/lzopio.c
+++ b/grub-core/io/lzopio.c
@@ -166,7 +166,7 @@ read_block_data (struct grub_lzopio *lzopio)
 
   if (lzopio->ccheck_fun)
     {
-      grub_uint64_t context[(lzopio->ccheck_fun->contextsize + 7) / 8];
+      GRUB_PROPERLY_ALIGNED_ARRAY (context, lzopio->ccheck_fun->contextsize);
 
       lzopio->ccheck_fun->init (context);
       lzopio->ccheck_fun->write (context, lzopio->block.cdata,
@@ -212,7 +212,7 @@ uncompress_block (struct grub_lzopio *lzopio)
 
       if (lzopio->ucheck_fun)
        {
-         grub_uint64_t context[(lzopio->ucheck_fun->contextsize + 7) / 8];
+         GRUB_PROPERLY_ALIGNED_ARRAY (context, lzopio->ucheck_fun->contextsize);
 
          lzopio->ucheck_fun->init (context);
          lzopio->ucheck_fun->write (context, lzopio->block.udata,

diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c
index 5fe586fd12a296811dfec45d5c13d36b660f38cc..014b51c85b45e7a7767583bce25adba8f0f0ae35 100644 (file)
--- a/grub-core/loader/i386/bsd.c
+++ b/grub-core/loader/i386/bsd.c
@@ -1045,7 +1045,7 @@ grub_netbsd_add_boot_disk_and_wedge (void)
     struct grub_partition_bsd_disk_label label;
   } buf;
   grub_uint8_t *hash;
-  grub_uint64_t ctx[(GRUB_MD_MD5->contextsize + 7) / 8];
+  GRUB_PROPERLY_ALIGNED_ARRAY (ctx, GRUB_MD_MD5->contextsize);
 
   dev = grub_device_open (0);
   if (! (dev && dev->disk && dev->disk->partition))