ACK: [PATCH 1/2] lib: fwts_acpi_tables: rename fwts_acpi_subtable_length_check

ivanhu ivan.hu at canonical.com
Wed Mar 6 02:33:30 UTC 2019


On 2/27/19 1:18 AM, Alex Hung wrote:
> ACPI spec uses the term "structure" instead "sub table", and therefore
> rename the function name to fwts_acpi_structure_length_check.
>
> This also modifies the terms inside the function.
>
> Signed-off-by: Alex Hung <alex.hung at canonical.com>
> ---
>  src/acpi/sdev/sdev.c               |  2 +-
>  src/lib/include/fwts_acpi_tables.h |  2 +-
>  src/lib/src/fwts_acpi_tables.c     | 18 +++++++++---------
>  3 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/src/acpi/sdev/sdev.c b/src/acpi/sdev/sdev.c
> index 22c75da9..8f04039f 100644
> --- a/src/acpi/sdev/sdev.c
> +++ b/src/acpi/sdev/sdev.c
> @@ -106,7 +106,7 @@ static int sdev_test1(fwts_framework *fw)
>  			break;
>  		}
>  
> -		if (!fwts_acpi_subtable_length_check(fw, "SDEV", entry->type, entry->length, type_length)) {
> +		if (!fwts_acpi_structure_length_check(fw, "SDEV", entry->type, entry->length, type_length)) {
>  			passed = false;
>  			break;
>  		}
> diff --git a/src/lib/include/fwts_acpi_tables.h b/src/lib/include/fwts_acpi_tables.h
> index f88e7a03..8151f76d 100644
> --- a/src/lib/include/fwts_acpi_tables.h
> +++ b/src/lib/include/fwts_acpi_tables.h
> @@ -57,7 +57,7 @@ void fwts_acpi_reserved_zero_check(fwts_framework *fw, const char *table, const
>  void fwts_acpi_reserved_zero_array_check(fwts_framework *fw, const char *table, const char *field, uint8_t* data, uint8_t length, bool *passed);
>  void fwts_acpi_reserved_bits_check(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_check(fwts_framework *fw, const char *table, uint8_t value, uint8_t min, uint8_t reserved, bool *passed);
> -bool fwts_acpi_subtable_length_check(fwts_framework *fw, const char *table, uint8_t subtable_type, uint32_t subtable_length, uint32_t size);
> +bool fwts_acpi_structure_length_check(fwts_framework *fw, const char *table, uint8_t subtable_type, uint32_t subtable_length, uint32_t size);
>  
>  uint32_t fwts_get_acpi_version(fwts_framework *fw);
>  
> diff --git a/src/lib/src/fwts_acpi_tables.c b/src/lib/src/fwts_acpi_tables.c
> index 1332e228..4ee7c783 100644
> --- a/src/lib/src/fwts_acpi_tables.c
> +++ b/src/lib/src/fwts_acpi_tables.c
> @@ -1547,24 +1547,24 @@ void fwts_acpi_reserved_type_check(
>  }
>  
>  /*
> - *  fwts_acpi_subtable_length_check()
> - *  verify whether sub-table length is sane
> + *  fwts_acpi_structure_length_check()
> + *  verify whether sub structure length is sane
>   */
> -bool fwts_acpi_subtable_length_check(
> +bool fwts_acpi_structure_length_check(
>  	fwts_framework *fw,
>  	const char *table,
> -	uint8_t subtable_type,
> -	uint32_t subtable_length,
> +	uint8_t type,
> +	uint32_t length,
>  	uint32_t size)
>  {
> -	if (subtable_length != size) {
> +	if (length != size) {
>  		char label[30];
>  		strncpy(label, table, 4);	/* ACPI name is 4 char long */
> -		strncpy(label + 4, "BadSubTableLength", sizeof(label) - 4);
> +		strncpy(label + 4, "BadStructureLength", sizeof(label) - 4);
>  		fwts_failed(fw, LOG_LEVEL_CRITICAL, label,
> -			"%4.4s subtable Type 0x%2.2" PRIx8 " should have "
> +			"%4.4s structure Type 0x%2.2" PRIx8 " should have "
>  			"length 0x%2.2" PRIx8 ", got 0x%2.2" PRIx8,
> -			table, subtable_type, subtable_length, size);
> +			table, type, length, size);
>  		return false;
>  	}
>  	return true;


Acked-by: Ivan Hu <ivan.hu at canonical.com>


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/fwts-devel/attachments/20190306/e6126057/attachment.sig>


More information about the fwts-devel mailing list