[PATCH 6/6] lib: acpi: fix incorrect actual vs. struct length outputs

[Alex Hung]

Also changes the arg names for better readability.

Signed-off-by: Alex Hung <alex.hung at canonical.com>
---
 src/lib/include/fwts_acpi_tables.h | 2 +-
 src/lib/src/fwts_acpi_tables.c     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/lib/include/fwts_acpi_tables.h b/src/lib/include/fwts_acpi_tables.h
index fa641f04..8ed65841 100644
--- a/src/lib/include/fwts_acpi_tables.h
+++ b/src/lib/include/fwts_acpi_tables.h
@@ -75,7 +75,7 @@ void fwts_acpi_reserved_zero_array(fwts_framework *fw, const char *table, const
 void fwts_acpi_reserved_bits_(fwts_framework *fw, const char *table, const char *field, uint64_t value, uint8_t size, uint8_t min, uint8_t max, bool *passed);
 void fwts_acpi_reserved_type(fwts_framework *fw, const char *table, uint8_t value, uint8_t min, uint8_t reserved, bool *passed);
 bool fwts_acpi_table_length(fwts_framework *fw, const char *table, uint32_t length, uint32_t size);
-bool fwts_acpi_structure_length(fwts_framework *fw, const char *table, uint8_t subtable_type, uint32_t subtable_length, uint32_t size);
+bool fwts_acpi_structure_length(fwts_framework *fw, const char *table, uint8_t type, uint32_t actual_length, uint32_t struct_length);
 bool fwts_acpi_structure_length_zero(fwts_framework *fw, const char *table, uint16_t length, uint32_t offset);
 bool fwts_acpi_structure_range(fwts_framework *fw, const char *table, uint32_t table_length, uint32_t offset);
 void fwts_acpi_fixed_value(fwts_framework *fw, fwts_log_level level, const char *table, const char *field, uint8_t actual, uint8_t must_be, bool *passed);
diff --git a/src/lib/src/fwts_acpi_tables.c b/src/lib/src/fwts_acpi_tables.c
index 18c1e123..e69dc04e 100644
--- a/src/lib/src/fwts_acpi_tables.c
+++ b/src/lib/src/fwts_acpi_tables.c
@@ -1730,10 +1730,10 @@ bool fwts_acpi_structure_length(
 	fwts_framework *fw,
 	const char *table,
 	uint8_t type,
-	uint32_t length,
-	uint32_t size)
+	uint32_t actual_length,
+	uint32_t struct_length)
 {
-	if (length != size) {
+	if (actual_length != struct_length) {
 		char label[30];
 
 		strncpy(label, table, 4);	/* ACPI name is 4 char long */
@@ -1741,7 +1741,7 @@ bool fwts_acpi_structure_length(
 		fwts_failed(fw, LOG_LEVEL_CRITICAL, label,
 			"%4.4s structure Type 0x%2.2" PRIx8 " should have "
 			"length 0x%2.2" PRIx8 ", got 0x%2.2" PRIx8,
-			table, type, length, size);
+			table, type, struct_length, actual_length);
 		return false;
 	}
 	return true;
-- 
2.31.1