xnu-1699.22.81.tar.gz

[apple/xnu.git] / iokit / Kernel / IOStringFuncs.c

diff --git a/iokit/Kernel/IOStringFuncs.c b/iokit/Kernel/IOStringFuncs.c
index e3742c96463b81f8d9dbf0bbbd41bd4e4ad396d8..548e980a1e78c47127729bec9a90e0b1184f5e3f 100644 (file)
--- a/iokit/Kernel/IOStringFuncs.c
+++ b/iokit/Kernel/IOStringFuncs.c
@@ -1,33 +1,33 @@
 /*
 /*

- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1998-2008 Apple Inc. All rights reserved.

  *
  *

- * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * 

- * This file contains Original Code and/or Modifications of Original Code 
- * as defined in and that are subject to the Apple Public Source License 
- * Version 2.0 (the 'License'). You may not use this file except in 
- * compliance with the License.  The rights granted to you under the 
- * License may not be used to create, or enable the creation or 
- * redistribution of, unlawful or unlicensed copies of an Apple operating 
- * system, or to circumvent, violate, or enable the circumvention or 
- * violation of, any terms of an Apple operating system software license 
- * agreement.
- *
- * Please obtain a copy of the License at 
- * http://www.opensource.apple.com/apsl/ and read it before using this 
- * file.
- *
- * The Original Code and all software distributed under the License are 
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, 
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
- * Please see the License for the specific language governing rights and 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and

  * limitations under the License.
  * limitations under the License.

- *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
  */

-/*      Copyright (c) 1995 NeXT Computer, Inc.  All rights reserved.
+
+/*      
+ *      Copyright (c) 1995 NeXT Computer, Inc.  All rights reserved.

  *
  * strol.c - The functions strtol() & strtoul() are exported as public API
  *           via the header file ~driverkit/generalFuncs.h
  *
  * strol.c - The functions strtol() & strtoul() are exported as public API
  *           via the header file ~driverkit/generalFuncs.h


@@ -40,7 +40,7 @@
  *      Commented out references to errno.
  */
 
  *      Commented out references to errno.
  */
 

-/*-
+/*

  * Copyright (c) 1990, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
  * Copyright (c) 1990, 1993
  *     The Regents of the University of California.  All rights reserved.
  *


@@ -81,6 +81,15 @@
 #include <sys/types.h>
 #include <machine/limits.h>
 
 #include <sys/types.h>
 #include <machine/limits.h>
 

+
+long strtol(const char *nptr, char **endptr, int base);
+unsigned long strtoul(const char *nptr, char **endptr, int base);
+quad_t strtoq(const char *nptr, char **endptr, int base);
+u_quad_t strtouq(const char *nptr, char **endptr, int base);
+char *strchr(const char *str, int ch);
+char *strncat(char *s1, const char *s2, unsigned long n);
+
+

 typedef int BOOL;
 
 static inline BOOL
 typedef int BOOL;
 
 static inline BOOL


@@ -115,10 +124,7 @@ isdigit(char c)
  * alphabets and digits are each contiguous.
  */
 long
  * alphabets and digits are each contiguous.
  */
 long

-strtol(nptr, endptr, base)
-       const char *nptr;
-       char **endptr;
-       register int base;
+strtol(const char *nptr, char **endptr, int base)

 {
        register const char *s = nptr;
        register unsigned long acc;
 {
        register const char *s = nptr;
        register unsigned long acc;


@@ -196,15 +202,21 @@ strtol(nptr, endptr, base)
        } else if (neg)
                acc = -acc;
        if (endptr != 0)
        } else if (neg)
                acc = -acc;
        if (endptr != 0)

-               *endptr = (char *)(any ? s - 1 : nptr);
+       {
+               if(any)
+               {
+                       *endptr = __CAST_AWAY_QUALIFIER(s - 1, const, char *);
+               }
+               else
+               {
+                       *endptr = __CAST_AWAY_QUALIFIER(nptr, const, char *);
+               }
+       }

        return (acc);
 }
 
 unsigned long
        return (acc);
 }
 
 unsigned long

-strtoul(nptr, endptr, base)
-       const char *nptr;
-       char **endptr;
-       register int base;
+strtoul(const char *nptr, char **endptr, int base)

 {
        register const char *s = nptr;
        register unsigned long acc;
 {
        register const char *s = nptr;
        register unsigned long acc;


@@ -261,7 +273,17 @@ strtoul(nptr, endptr, base)
        } else if (neg)
                acc = -acc;
        if (endptr != 0)
        } else if (neg)
                acc = -acc;
        if (endptr != 0)

-               *endptr = (char *)(any ? s - 1 : nptr);
+       {
+               if(any)
+               {
+                       *endptr = __CAST_AWAY_QUALIFIER(s - 1, const, char *);
+               }
+               else
+               {
+                       *endptr = __CAST_AWAY_QUALIFIER(nptr, const, char *);
+               }
+       }
+

        return (acc);
 }
 
        return (acc);
 }
 


@@ -272,10 +294,7 @@ strtoul(nptr, endptr, base)
  * alphabets and digits are each contiguous.
  */
 quad_t
  * alphabets and digits are each contiguous.
  */
 quad_t

-strtoq(nptr, endptr, base)
-       const char *nptr;
-       char **endptr;
-       register int base;
+strtoq(const char *nptr, char **endptr, int base)

 {
        register const char *s;
        register u_quad_t acc;
 {
        register const char *s;
        register u_quad_t acc;


@@ -340,7 +359,7 @@ strtoq(nptr, endptr, base)
                        break;
                if (c >= base)
                        break;
                        break;
                if (c >= base)
                        break;

-               if (any < 0 || acc > cutoff || acc == cutoff && c > cutlim)
+               if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))

                        any = -1;
                else {
                        any = 1;
                        any = -1;
                else {
                        any = 1;


@@ -354,7 +373,17 @@ strtoq(nptr, endptr, base)
        } else if (neg)
                acc = -acc;
        if (endptr != 0)
        } else if (neg)
                acc = -acc;
        if (endptr != 0)

-               *endptr = (char *)(any ? s - 1 : nptr);
+       {
+               if(any)
+               {
+                       *endptr = __CAST_AWAY_QUALIFIER(s - 1, const, char *);
+               }
+               else
+               {
+                       *endptr = __CAST_AWAY_QUALIFIER(nptr, const, char *);
+               }
+       }
+

        return (acc);
 }
 
        return (acc);
 }
 


@@ -365,7 +394,7 @@ strtoq(nptr, endptr, base)
  * Ignores `locale' stuff.  Assumes that the upper and lower case
  * alphabets and digits are each contiguous.
  */
  * Ignores `locale' stuff.  Assumes that the upper and lower case
  * alphabets and digits are each contiguous.
  */

-uint64_t
+u_quad_t

 strtouq(const char *nptr,
        char **endptr,
        register int base)
 strtouq(const char *nptr,
        char **endptr,
        register int base)


@@ -411,7 +440,7 @@ strtouq(const char *nptr,
                        break;
                if (c >= base)
                        break;
                        break;
                if (c >= base)
                        break;

-               if (any < 0 || acc > cutoff || acc == cutoff && c > cutlim)
+               if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))

                        any = -1;
                else {
                        any = 1;
                        any = -1;
                else {
                        any = 1;


@@ -425,7 +454,17 @@ strtouq(const char *nptr,
        } else if (neg)
                acc = -acc;
        if (endptr != 0)
        } else if (neg)
                acc = -acc;
        if (endptr != 0)

-               *endptr = (char *)(any ? s - 1 : nptr);
+       {
+               if(any)
+               {
+                       *endptr = __CAST_AWAY_QUALIFIER(s - 1, const, char *);
+               }
+               else
+               {
+                       *endptr = __CAST_AWAY_QUALIFIER(nptr, const, char *);
+               }
+       }
+

        return (acc);
 }
 
        return (acc);
 }
 


@@ -438,7 +477,7 @@ char *strchr(const char *str, int ch)
 {
     do {
        if (*str == ch)
 {
     do {
        if (*str == ch)

-           return((char *)str);
+           return(__CAST_AWAY_QUALIFIER(str, const, char *));

     } while (*str++);
     return ((char *) 0);
 }
     } while (*str++);
     return ((char *) 0);
 }