diff options
Diffstat (limited to 'source/components/utilities/utclib.c')
-rw-r--r-- | source/components/utilities/utclib.c | 146 |
1 files changed, 2 insertions, 144 deletions
diff --git a/source/components/utilities/utclib.c b/source/components/utilities/utclib.c index 2f4f4ffdb..26fbaf958 100644 --- a/source/components/utilities/utclib.c +++ b/source/components/utilities/utclib.c @@ -163,7 +163,7 @@ ACPI_MODULE_NAME ("utclib") -#if defined(ACPI_USE_SYSTEM_CLIBRARY) && !defined(ACPI_USE_STANDARD_HEADERS) +#ifndef ACPI_USE_SYSTEM_CLIBRARY /* Entire module */ /******************************************************************************* @@ -201,61 +201,6 @@ memcmp ( /******************************************************************************* * - * FUNCTION: memmove - * - * PARAMETERS: Dest - Target of the copy - * Src - Source buffer to copy - * Count - Number of bytes to copy - * - * RETURN: Dest - * - * DESCRIPTION: Copy arbitrary bytes of memory with respect to the overlapping - * - ******************************************************************************/ - -void * -memmove ( - void *Dest, - const void *Src, - ACPI_SIZE Count) -{ - char *New = (char *) Dest; - char *Old = (char *) Src; - - - if (Old > New) - { - /* Copy from the beginning */ - - while (Count) - { - *New = *Old; - New++; - Old++; - Count--; - } - } - else if (Old < New) - { - /* Copy from the end */ - - New = New + Count - 1; - Old = Old + Count - 1; - while (Count) - { - *New = *Old; - New--; - Old--; - Count--; - } - } - - return (Dest); -} - - -/******************************************************************************* - * * FUNCTION: memcpy * * PARAMETERS: Dest - Target of the copy @@ -358,93 +303,6 @@ strlen ( /******************************************************************************* * - * FUNCTION: strpbrk - * - * PARAMETERS: String - Null terminated string - * Delimiters - Delimiters to match - * - * RETURN: The first occurance in the string of any of the bytes in the - * delimiters - * - * DESCRIPTION: Search a string for any of a set of the delimiters - * - ******************************************************************************/ - -char * -strpbrk ( - const char *String, - const char *Delimiters) -{ - const char *Delimiter; - - - for ( ; *String != '\0'; ++String) - { - for (Delimiter = Delimiters; *Delimiter != '\0'; Delimiter++) - { - if (*String == *Delimiter) - { - return (ACPI_CAST_PTR (char, String)); - } - } - } - - return (NULL); -} - - -/******************************************************************************* - * - * FUNCTION: strtok - * - * PARAMETERS: String - Null terminated string - * Delimiters - Delimiters to match - * - * RETURN: Pointer to the next token - * - * DESCRIPTION: Split string into tokens - * - ******************************************************************************/ - -char* -strtok ( - char *String, - const char *Delimiters) -{ - char *Begin = String; - static char *SavedPtr; - - - if (Begin == NULL) - { - if (SavedPtr == NULL) - { - return (NULL); - } - Begin = SavedPtr; - } - - SavedPtr = strpbrk (Begin, Delimiters); - while (SavedPtr == Begin) - { - *Begin++ = '\0'; - SavedPtr = strpbrk (Begin, Delimiters); - } - - if (SavedPtr) - { - *SavedPtr++ = '\0'; - return (Begin); - } - else - { - return (NULL); - } -} - - -/******************************************************************************* - * * FUNCTION: strcpy * * PARAMETERS: DstString - Target of the copy @@ -1129,4 +987,4 @@ const UINT8 AcpiGbl_Ctypes[257] = { }; -#endif /* ACPI_USE_SYSTEM_CLIBRARY && !ACPI_USE_STANDARD_HEADERS */ +#endif /* ACPI_USE_SYSTEM_CLIBRARY */ |