diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2019-03-29 16:40:11 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2019-03-29 16:40:11 +0000 |
| commit | 222d1f49264d00972299c6ff23de8100be561897 (patch) | |
| tree | e2a1cfd1ec138c9cc64abc609558682be382674f /source/components/namespace/nsutils.c | |
| parent | 805e3b079cfb4a9e01aa35dc378a35f922979517 (diff) | |
Notes
Diffstat (limited to 'source/components/namespace/nsutils.c')
| -rw-r--r-- | source/components/namespace/nsutils.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/components/namespace/nsutils.c b/source/components/namespace/nsutils.c index 4a9f0313dda0..85732ff8b7bd 100644 --- a/source/components/namespace/nsutils.c +++ b/source/components/namespace/nsutils.c @@ -351,7 +351,7 @@ AcpiNsGetInternalNameLength ( } } - Info->Length = (ACPI_NAME_SIZE * Info->NumSegments) + + Info->Length = (ACPI_NAMESEG_SIZE * Info->NumSegments) + 4 + Info->NumCarats; Info->NextExternalChar = NextExternalChar; @@ -443,7 +443,7 @@ AcpiNsBuildInternalName ( for (; NumSegments; NumSegments--) { - for (i = 0; i < ACPI_NAME_SIZE; i++) + for (i = 0; i < ACPI_NAMESEG_SIZE; i++) { if (ACPI_IS_PATH_SEPARATOR (*ExternalName) || (*ExternalName == 0)) @@ -472,7 +472,7 @@ AcpiNsBuildInternalName ( /* Move on the next segment */ ExternalName++; - Result += ACPI_NAME_SIZE; + Result += ACPI_NAMESEG_SIZE; } /* Terminate the string */ @@ -721,12 +721,12 @@ AcpiNsExternalizeName ( /* Copy and validate the 4-char name segment */ - ACPI_MOVE_NAME (&(*ConvertedName)[j], + ACPI_COPY_NAMESEG (&(*ConvertedName)[j], &InternalName[NamesIndex]); AcpiUtRepairName (&(*ConvertedName)[j]); - j += ACPI_NAME_SIZE; - NamesIndex += ACPI_NAME_SIZE; + j += ACPI_NAMESEG_SIZE; + NamesIndex += ACPI_NAMESEG_SIZE; } } |