diff options
author | msmith <msmith@FreeBSD.org> | 2001-05-29 19:52:40 +0000 |
---|---|---|
committer | msmith <msmith@FreeBSD.org> | 2001-05-29 19:52:40 +0000 |
commit | 96a626e3c30fd1a1c51f65324efe1eef0da987c8 (patch) | |
tree | 613098a56e447c6040b8a859eee253beaf749bc0 /sys/contrib/dev/acpica/nsnames.c | |
parent | 7bec4652bbd74dbd86d79e3f9c52cf70f6fa1fcd (diff) | |
parent | bc4d4229dc8150c1877e8673fb6be5be18487b6d (diff) | |
download | FreeBSD-src-96a626e3c30fd1a1c51f65324efe1eef0da987c8.zip FreeBSD-src-96a626e3c30fd1a1c51f65324efe1eef0da987c8.tar.gz |
This commit was generated by cvs2svn to compensate for changes in r77424,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'sys/contrib/dev/acpica/nsnames.c')
-rw-r--r-- | sys/contrib/dev/acpica/nsnames.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/sys/contrib/dev/acpica/nsnames.c b/sys/contrib/dev/acpica/nsnames.c index b7cc321..8fb0d3c 100644 --- a/sys/contrib/dev/acpica/nsnames.c +++ b/sys/contrib/dev/acpica/nsnames.c @@ -1,7 +1,7 @@ /******************************************************************************* * * Module Name: nsnames - Name manipulation and search - * $Revision: 54 $ + * $Revision: 59 $ * ******************************************************************************/ @@ -122,7 +122,7 @@ #include "acnamesp.h" -#define _COMPONENT NAMESPACE +#define _COMPONENT ACPI_NAMESPACE MODULE_NAME ("nsnames") @@ -182,7 +182,7 @@ AcpiNsGetTablePathname ( /* Allocate a buffer to be returned to caller */ - NameBuffer = AcpiCmCallocate (Size + 1); + NameBuffer = AcpiUtCallocate (Size + 1); if (!NameBuffer) { REPORT_ERROR (("NsGetTablePathname: allocation failure\n")); @@ -209,8 +209,7 @@ AcpiNsGetTablePathname ( if (Size != 0) { - DEBUG_PRINT (ACPI_ERROR, - ("NsGetTablePathname: Bad pointer returned; size=%X\n", Size)); + DEBUG_PRINTP (ACPI_ERROR, ("Bad pointer returned; size=%X\n", Size)); } return_PTR (NameBuffer); @@ -258,7 +257,6 @@ AcpiNsGetPathnameLength ( } - /******************************************************************************* * * FUNCTION: AcpiNsHandleToPathname @@ -292,7 +290,7 @@ AcpiNsHandleToPathname ( FUNCTION_TRACE_PTR ("NsHandleToPathname", TargetHandle); - if (!AcpiGbl_RootNode || !TargetHandle) + if (!AcpiGbl_RootNode) { /* * If the name space has not been initialized, @@ -356,9 +354,7 @@ AcpiNsHandleToPathname ( UserBuffer[Size] = '\\'; - DEBUG_PRINT (TRACE_EXEC, - ("NsHandleToPathname: Len=%X, %s \n", - PathLength, UserBuffer)); + DEBUG_PRINTP (TRACE_EXEC, ("Len=%X, %s \n", PathLength, UserBuffer)); Exit: return_ACPI_STATUS (Status); |