155a156
> UINT32 Index = 0;
158c159,162
< /* Search upwards in the parse tree until we reach a namespace node */
---
> if (!Op)
> {
> return (NULL);
> }
159a164,166
> /* Search upwards in the parse tree until we reach the next namespace node */
>
> Op = Op->Common.Parent;
207a215,221
>
> /* For External() statements, we do not want a leading '\' */
>
> if (*ParentPath == AML_ROOT_PREFIX)
> {
> Index = 1;
> }
222c236
< ACPI_STRCAT (Fullpath, ParentPath);
---
> ACPI_STRCPY (Fullpath, &ParentPath[Index]);
369c383,396
< /* Externalize the ACPI path */
---
> /*
> * We don't want External() statements to contain a leading '\'.
> * This prevents duplicate external statements of the form:
> *
> * External (\ABCD)
> * External (ABCD)
> *
> * This would cause a compile time error when the disassembled
> * output file is recompiled.
> */
> if ((*Path == AML_ROOT_PREFIX) && (Path[1]))
> {
> Path++;
> }
370a398,399
> /* Externalize the ACPI pathname */
>
378,379c407,410
< /* Get the full pathname from root if "Path" has a parent prefix */
<
---
> /*
> * Get the full pathname from the root if "Path" has one or more
> * parent prefixes (^). Note: path will not contain a leading '\'.
> */