* grub-core/commands/acpi.c: Use sizeof rather than hardcoding the size.

diff --git a/ChangeLog b/ChangeLog
index 7e2a62feb4588d9c6072df29c7fa590658ac4739..f90fab400a9e09a4c368b7d2e3158c64f02331dd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-05  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/commands/acpi.c: Use sizeof rather than hardcoding the size.
+
 2013-04-05  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Replace 8 with GRUB_CHAR_BIT in several places when appropriate.

diff --git a/grub-core/commands/acpi.c b/grub-core/commands/acpi.c
index 4ca8cf71830b6c0b79f7551f08f52c89b33e2ac9..14f639c6dd0750c3a01bd3c56cb2fd139ed5b48e 100644 (file)
--- a/grub-core/commands/acpi.c
+++ b/grub-core/commands/acpi.c
@@ -365,13 +365,13 @@ setup_common_tables (void)
     numoftables++;
 
   rsdt_addr = rsdt = (struct grub_acpi_table_header *) playground_ptr;
-  playground_ptr += sizeof (struct grub_acpi_table_header) + 4 * numoftables;
+  playground_ptr += sizeof (struct grub_acpi_table_header) + sizeof (grub_uint32_t) * numoftables;
 
   rsdt_entry = (grub_uint32_t *) (rsdt + 1);
 
   /* Fill RSDT header. */
   grub_memcpy (&(rsdt->signature), "RSDT", 4);
-  rsdt->length = sizeof (struct grub_acpi_table_header) + 4 * numoftables;
+  rsdt->length = sizeof (struct grub_acpi_table_header) + sizeof (grub_uint32_t) * numoftables;
   rsdt->revision = 1;
   grub_memcpy (&(rsdt->oemid), root_oemid, sizeof (rsdt->oemid));
   grub_memcpy (&(rsdt->oemtable), root_oemtable, sizeof (rsdt->oemtable));
@@ -419,13 +419,13 @@ setv2table (void)
 
   /* Create XSDT. */
   xsdt = (struct grub_acpi_table_header *) playground_ptr;
-  playground_ptr += sizeof (struct grub_acpi_table_header) + 8 * numoftables;
+  playground_ptr += sizeof (struct grub_acpi_table_header) + sizeof (grub_uint64_t) * numoftables;
 
   xsdt_entry = (grub_uint64_t *)(xsdt + 1);
   for (cur = acpi_tables; cur; cur = cur->next)
     *(xsdt_entry++) = (grub_addr_t) cur->addr;
   grub_memcpy (&(xsdt->signature), "XSDT", 4);
-  xsdt->length = sizeof (struct grub_acpi_table_header) + 8 * numoftables;
+  xsdt->length = sizeof (struct grub_acpi_table_header) + sizeof (grub_uint64_t) * numoftables;
   xsdt->revision = 1;
   grub_memcpy (&(xsdt->oemid), root_oemid, sizeof (xsdt->oemid));
   grub_memcpy (&(xsdt->oemtable), root_oemtable, sizeof (xsdt->oemtable));
@@ -708,11 +708,11 @@ grub_cmd_acpi (struct grub_extcmd_context *ctxt, int argc, char **args)
   /* DSDT. */
   playground_size += dsdt_size;
   /* RSDT. */
-  playground_size += sizeof (struct grub_acpi_table_header) + 4 * numoftables;
+  playground_size += sizeof (struct grub_acpi_table_header) + sizeof (grub_uint32_t) * numoftables;
   /* RSDPv1. */
   playground_size += sizeof (struct grub_acpi_rsdp_v10);
   /* XSDT. */
-  playground_size += sizeof (struct grub_acpi_table_header) + 8 * numoftables;
+  playground_size += sizeof (struct grub_acpi_table_header) + sizeof (grub_uint64_t) * numoftables;
   /* RSDPv2. */
   playground_size += sizeof (struct grub_acpi_rsdp_v20);