diff --git a/source/components/utilities/utcopy.c b/source/components/utilities/utcopy.c index c5780efec..d064ae968 100644 --- a/source/components/utilities/utcopy.c +++ b/source/components/utilities/utcopy.c @@ -588,7 +588,8 @@ AcpiUtCopyEsimpleToIsimple ( default: /* All other types are not supported */ - ACPI_ERROR ((AE_INFO, "Unsupported object type, cannot convert to internal object: %s", + ACPI_ERROR ((AE_INFO, + "Unsupported object type, cannot convert to internal object: %s", AcpiUtGetTypeName (ExternalObject->Type))); return_ACPI_STATUS (AE_SUPPORT); @@ -602,7 +603,9 @@ AcpiUtCopyEsimpleToIsimple ( case ACPI_TYPE_STRING: InternalObject->String.Pointer = - ACPI_ALLOCATE_ZEROED ((ACPI_SIZE) ExternalObject->String.Length + 1); + ACPI_ALLOCATE_ZEROED ((ACPI_SIZE) + ExternalObject->String.Length + 1); + if (!InternalObject->String.Pointer) { goto ErrorExit; diff --git a/source/components/utilities/uteval.c b/source/components/utilities/uteval.c index 45d1b985d..fde7f3918 100644 --- a/source/components/utilities/uteval.c +++ b/source/components/utilities/uteval.c @@ -216,7 +216,8 @@ AcpiUtOsiImplementation ( for (i = 0; i < ACPI_ARRAY_LENGTH (AcpiInterfacesSupported); i++) { - if (!ACPI_STRCMP (StringDesc->String.Pointer, AcpiInterfacesSupported[i])) + if (!ACPI_STRCMP (StringDesc->String.Pointer, + AcpiInterfacesSupported[i])) { /* The interface is supported */ diff --git a/source/components/utilities/utglobal.c b/source/components/utilities/utglobal.c index 54e704cf9..5448f1719 100644 --- a/source/components/utilities/utglobal.c +++ b/source/components/utilities/utglobal.c @@ -865,7 +865,10 @@ AcpiUtInitGlobals ( { AcpiGbl_OwnerIdMask[i] = 0; } - AcpiGbl_OwnerIdMask[ACPI_NUM_OWNERID_MASKS - 1] = 0x80000000; /* Last ID is never valid */ + + /* Last OwnerID is never valid */ + + AcpiGbl_OwnerIdMask[ACPI_NUM_OWNERID_MASKS - 1] = 0x80000000; /* Event counters */