Vendor import of the Intel ACPI CA 20020217 drop.

1 files changed, 4 insertions, 16 deletions

diff --git a/sys/contrib/dev/acpica/utclib.c b/sys/contrib/dev/acpica/utclib.c
index 9de98de71b47..01245eaa6772 100644
--- a/sys/contrib/dev/acpica/utclib.c
+++ b/sys/contrib/dev/acpica/utclib.c
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: cmclib - Local implementation of C library functions
- * $Revision: 39 $
+ * $Revision: 43 $
  *
  *****************************************************************************/
 
@@ -9,7 +9,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999, 2000, 2001, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -131,7 +131,7 @@
  */
 
 #define _COMPONENT          MISCELLANEOUS
-        MODULE_NAME         ("cmclib")
+        ACPI_MODULE_NAME    ("cmclib")
 
 
 #ifndef ACPI_USE_SYSTEM_CLIBRARY
@@ -202,7 +202,6 @@ AcpiUtStrcpy (
     /* Null terminate */
 
     *String = 0;
-
     return (DstString);
 }
 
@@ -278,7 +277,6 @@ AcpiUtStrcmp (
         }
     }
 
-
     return ((unsigned char) *String1 - (unsigned char) *String2);
 }
 
@@ -313,7 +311,7 @@ AcpiUtStrncmp (
         }
     }
 
-    return ((Count == -1) ? 0 : ((unsigned char) *String1 -
+    return ((Count == ACPI_INTEGER_MAX) ? 0 : ((unsigned char) *String1 -
         (unsigned char) *String2));
 }
 
@@ -716,7 +714,6 @@ AcpiUtStrstr (
         String++;
     }
 
-
     return (String1);
 }
 
@@ -769,13 +766,11 @@ AcpiUtStrtoul (
         sign = NEGATIVE;
         ++String;
     }
-
     else if (*String == '+')
     {
         ++String;
         sign = POSITIVE;
     }
-
     else
     {
         sign = POSITIVE;
@@ -794,19 +789,16 @@ AcpiUtStrtoul (
                 Base = 16;
                 ++String;
             }
-
             else
             {
                 Base = 8;
             }
         }
-
         else
         {
             Base = 10;
         }
     }
-
     else if (Base < 2 || Base > 36)
     {
         /*
@@ -842,7 +834,6 @@ AcpiUtStrtoul (
         {
             index = *String - '0';
         }
-
         else
         {
             index = AcpiUtToUpper (*String);
@@ -850,7 +841,6 @@ AcpiUtStrtoul (
             {
                 index = index - 'A' + 10;
             }
-
             else
             {
                 goto done;
@@ -872,7 +862,6 @@ AcpiUtStrtoul (
             Status = AE_ERROR;
             ReturnValue = 0L;           /* reset */
         }
-
         else
         {
             ReturnValue *= Base;
@@ -894,7 +883,6 @@ done:
         {
             *Terminator = (NATIVE_CHAR *) StringStart;
         }
-
         else
         {
             *Terminator = (NATIVE_CHAR *) String;