mirrors/acpica
1
0
Fork 0
mirror of https://github.com/acpica/acpica/ synced 2025-01-16 14:29:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Removed all vestiges of the CheckTrash macro

Browse Source 
date	99.07.01.23.28.00;	author rmoore1;	state Exp;
This commit is contained in:
aystarik 2005-06-29 18:29:20 +00:00
parent 8d4493620e
commit 8a87621721
3 changed files with 23 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/components/namespace/nsnames.c
View File

@ -152,7 +152,7 @@ NsNameOfScope (
Temp->ParentScope;
Temp = Temp->ParentScope)
{
Size += 4;
Size += ACPI_NAME_SIZE;
}
@ -168,9 +168,9 @@ NsNameOfScope (
/* Store terminator byte, then build name backwards */
NameBuffer[Size] = '\0';
while ((Size > 4) && EntryToSearch->ParentScope)
while ((Size > ACPI_NAME_SIZE) && EntryToSearch->ParentScope)
{
Size -= 4;
Size -= ACPI_NAME_SIZE;
*(UINT32 *) (NameBuffer + Size) =
*(UINT32 *) NsFindParentName (EntryToSearch, 0);
EntryToSearch = EntryToSearch->ParentScope;
@ -555,10 +555,7 @@ NsFindNames (
/* Pass 1. Get required buffer size, don't try to build list */
Count = 0;
CheckTrash ("NsFindNames before count");
NsLowFindNames (StartHandle, SearchFor, &Count, NULL, MaxDepth);
CheckTrash ("NsFindNames after count");
if (0 == Count)
{
@ -578,10 +575,7 @@ NsFindNames (
/* Pass 2. Fill buffer */
Count = 0;
CheckTrash ("NsFindNames before list");
NsLowFindNames (StartHandle, SearchFor, &Count, List, MaxDepth);
CheckTrash ("NsFindNames after list");
FUNCTION_EXIT;
return List;

32
source/components/namespace/nssearch.c
View File

@ -142,12 +142,12 @@ NsSearchOnly (
/* Debug only */
ScopeName = NsNameOfScope (NameTable);
DEBUG_PRINT (TRACE_NAMES,
("NsSearchOnly: search %s [%p] for %4.4s (type %d)\n",
ScopeName, NameTable, EntryName, Type));
OsdFree (ScopeName);
DEBUG_EXEC (ScopeName = NsNameOfScope (NameTable));
DEBUG_PRINT (TRACE_NAMES, ("NsSearchOnly: Searching %s [%p]\n",
ScopeName, NameTable));
DEBUG_PRINT (TRACE_NAMES, ("NsSearchOnly: For %4.4s (type %d)\n",
EntryName, Type));
DEBUG_EXEC (OsdFree (ScopeName));
/*
* Name tables are built (and subsequently dumped) in the
@ -179,10 +179,8 @@ NsSearchOnly (
for (Tries = NS_TABLE_SIZE; Tries && 0 != NameTable[Position].Name; Tries--)
{
/* search for name in table */
/* Search for name in table */
CheckTrash ("top of NsSearchTable loop");
if (NameTable[Position].Name == *(UINT32 *) EntryName)
{
/*
@ -218,7 +216,6 @@ NsSearchOnly (
DEBUG_PRINT (TRACE_NAMES, ("NsSearchOnly: Name %4.4s (actual type %d) found at %p\n",
EntryName, NameTable[Position].Type, &NameTable[Position]));
CheckTrash ("leave NsSearchTable FOUND");
*RetEntry = &NameTable[Position];
FUNCTION_STATUS_EXIT (AE_OK);
return AE_OK;
@ -338,7 +335,6 @@ NsSearchParentTree (
Status = NsSearchOnly (EntryName, ParentScope, TYPE_Any, RetEntry, NULL);
if (Status == AE_OK)
{
CheckTrash ("leave NsSearchTable FOUND in parent");
FUNCTION_STATUS_EXIT (Status);
return Status;
}
@ -518,8 +514,6 @@ NsInitializeEntry (
/* first or second pass load mode, NameTable valid */
CheckTrash ("NsSearchTable about to add");
NewEntry->Name = *(UINT32 *) EntryName;
NewEntry->ParentScope = NameTable[0].ParentScope;
NewEntry->ParentEntry = NameTable[0].ParentEntry;
@ -538,8 +532,6 @@ NsInitializeEntry (
NewEntry->PrevEntry = PreviousEntry;
NewEntry->NextEntry = NULL;
CheckTrash ("NsInitializeEntry added name");
/*
* If adding a name with unknown type, or having to add the region in
* order to define fields in it, we have a forward reference.
@ -582,14 +574,10 @@ NsInitializeEntry (
(Type != TYPE_IndexFieldDefn))
{
NewEntry->Type = Type;
CheckTrashA ("NsInitializeEntry added type",
&NewEntry->Name, NewEntry->Name, Hash,
&NewEntry->Type, NewEntry->Type, Type, (void *) NameTable);
}
DEBUG_PRINT (TRACE_NAMES, ("NsInitializeEntry: %.4s added to %p at %p\n",
EntryName, NameTable, NewEntry));
CheckTrash ("leave NsInitializeEntry ADDED");
FUNCTION_EXIT;
}
@ -633,7 +621,6 @@ NsSearchAndEnter (
FUNCTION_TRACE ("NsSearchAndEnter");
CheckTrash ("enter NsSearchAndEnter");
/* Parameter validation */
@ -655,7 +642,7 @@ NsSearchAndEnter (
{
DEBUG_PRINT (ACPI_ERROR, ("NsSearchAndEnter: *** bad name %08lx *** \n",
*(UINT32 *) EntryName));
CheckTrash ("leave NsSearchTable BADNAME");
FUNCTION_STATUS_EXIT (AE_BAD_CHARACTER);
return AE_BAD_CHARACTER;
}
@ -702,9 +689,8 @@ NsSearchAndEnter (
if (LoadMode == MODE_Exec)
{
DEBUG_PRINT (TRACE_NAMES, ("NsSearchAndEnter: Name %.4s Not found in %p (not adding)\n",
DEBUG_PRINT (TRACE_NAMES, ("NsSearchAndEnter: %.4s Not found in %p [Not adding]\n",
EntryName, NameTable));
CheckTrash ("leave NsSearchTable NOTFOUND");
FUNCTION_STATUS_EXIT (AE_NOT_FOUND);
return AE_NOT_FOUND;

13
source/components/namespace/nsutils.c
View File

@ -408,8 +408,17 @@ NsInternalizeName (
*ConvertedName = InternalName;
DEBUG_PRINT (TRACE_EXEC,("NsInternalizeName: returning [%p] \"%s\"\n",
InternalName, InternalName));
if (FullyQualified)
{
DEBUG_PRINT (TRACE_EXEC,("NsInternalizeName: returning [%p] (abs) \"\\%s\"\n",
InternalName, &InternalName[3]));
}
else
{
DEBUG_PRINT (TRACE_EXEC,("NsInternalizeName: returning [%p] (rel) \"%s\"\n",
InternalName, &InternalName[2]));
}
FUNCTION_STATUS_EXIT (AE_OK);
return AE_OK;
}