From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Sat, 24 Jan 2015 19:41:43 +0000 (+0100)
Subject: commands/acpi: Use ALIGN_UP rather than manual expression.
X-Git-Tag: 2.02-beta3~540
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e902163e484523698f1cc4f06b64830f30909153;p=thirdparty%2Fgrub.git

commands/acpi: Use ALIGN_UP rather than manual expression.

Improves readability and hopefully automatic scanning.

Found by: Coverity Scan.
---

diff --git a/grub-core/commands/acpi.c b/grub-core/commands/acpi.c
index 97c2cf282..f66fa2db3 100644
--- a/grub-core/commands/acpi.c
+++ b/grub-core/commands/acpi.c
@@ -227,7 +227,7 @@ grub_acpi_create_ebda (void)
 	    grub_dprintf ("acpi", "Copying rsdpv2 to %p\n", target);
 	    v2inebda = target;
 	    target += v2->length;
-	    target = (grub_uint8_t *) ((((grub_addr_t) target - 1) | 0xf) + 1);
+	    target = (grub_uint8_t *) ALIGN_UP((grub_addr_t) target, 16);
 	    v2 = 0;
 	    break;
 	  }
@@ -246,7 +246,7 @@ grub_acpi_create_ebda (void)
 	    grub_dprintf ("acpi", "Copying rsdpv1 to %p\n", target);
 	    v1inebda = target;
 	    target += sizeof (struct grub_acpi_rsdp_v10);
-	    target = (grub_uint8_t *) ((((grub_addr_t) target - 1) | 0xf) + 1);
+	    target = (grub_uint8_t *) ALIGN_UP((grub_addr_t) target, 16);
 	    v1 = 0;
 	    break;
 	  }