xnu-7195.101.1.tar.gz

[apple/xnu.git] / bsd / libkern / memchr.c

diff --git a/bsd/libkern/memchr.c b/bsd/libkern/memchr.c
index fced31c67919529e43cb120424ff25acceed6d32..a3eb09e49ba24120a37d9d93ca0970a2e16274bf 100644 (file)
--- a/bsd/libkern/memchr.c
+++ b/bsd/libkern/memchr.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2012 Apple Computer, Inc. All rights reserved.
  *
  * @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
@@ -11,10 +11,10 @@
  * 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,
@@ -22,7 +22,7 @@
  * 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.
- * 
+ *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 
@@ -34,9 +34,10 @@ memchr(const void *bigptr, int ch, size_t length)
 {
        const char *big = (const char *)bigptr;
        size_t n;
-       for (n = 0; n < length; n++)
-               if (big[n] == ch)
-                       return (void *)&big[n];
+       for (n = 0; n < length; n++) {
+               if (big[n] == ch) {
+                       return __DECONST(void *, &big[n]);
+               }
+       }
        return NULL;
 }
-