[prev in list] [next in list] [prev in thread] [next in thread] 

List:       fwts-devel
Subject:    [PATCH] acpi: acpidump: fix shadowing of variable table
From:       Colin King <colin.king () canonical ! com>
Date:       2014-06-12 16:50:27
Message-ID: 1402591827-27508-1-git-send-email-colin.king () canonical ! com
[Download RAW message or body]

From: Colin Ian King <colin.king@canonical.com>

Just to ensure we're not causing confusion, rename the inner
nested variable table to table_info to avoid shadowing the
function argument table.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 src/acpi/acpidump/acpidump.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/acpi/acpidump/acpidump.c b/src/acpi/acpidump/acpidump.c
index 8264cec..63cfccc 100644
--- a/src/acpi/acpidump/acpidump.c
+++ b/src/acpi/acpidump/acpidump.c
@@ -714,10 +714,10 @@ static void acpidump_rsdt(fwts_framework *fw, const fwts_acpi_table_info *table)
 
 	for (i = 0; i < n; i++)  {
 		char label[80];
-		fwts_acpi_table_info *table;
+		fwts_acpi_table_info *table_info;
 
-		if (fwts_acpi_find_table_by_addr(fw, (uint64_t)rsdt->entries[i], &table) == FWTS_OK) {
-			char *name = table == NULL ? "unknown" : table->name;
+		if (fwts_acpi_find_table_by_addr(fw, (uint64_t)rsdt->entries[i], &table_info) == FWTS_OK) {
+			char *name = table_info == NULL ? "unknown" : table_info->name;
 			snprintf(label, sizeof(label), "Entry %2.2zu %s", i, name);
 			fwts_log_info_verbatum(fw, "%s 0x%8.8x",
 				acpi_dump_field_info(label, sizeof(rsdt->entries[i]), offsetof(fwts_acpi_table_rsdt, entries[i])),
@@ -745,10 +745,10 @@ static void acpidump_xsdt(fwts_framework *fw, const fwts_acpi_table_info *table)
 
 	for (i = 0; i < n; i++)  {
 		char label[80];
-		fwts_acpi_table_info *table;
+		fwts_acpi_table_info *table_info;
 
-		if (fwts_acpi_find_table_by_addr(fw, xsdt->entries[i], &table) == FWTS_OK) {
-			char *name = table == NULL ? "unknown" : table->name;
+		if (fwts_acpi_find_table_by_addr(fw, xsdt->entries[i], &table_info) == FWTS_OK) {
+			char *name = table_info == NULL ? "unknown" : table_info->name;
 			snprintf(label, sizeof(label), "Entry %2.2zu %s", i, name);
 			fwts_log_info_verbatum(fw, "%s 0x%16.16" PRIx64,
 				acpi_dump_field_info(label, sizeof(xsdt->entries[i]), offsetof(fwts_acpi_table_xsdt, entries[i])),
-- 
2.0.0


-- 
fwts-devel mailing list
fwts-devel@lists.ubuntu.com
Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/fwts-devel
[prev in list] [next in list] [prev in thread] [next in thread]