Loading...
--- xnu/xnu-4903.231.4/libkern/c++/OSString.cpp
+++ xnu/xnu-792.13.8/libkern/c++/OSString.cpp
@@ -1,29 +1,31 @@
/*
* Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_OSREFERENCE_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.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ *
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
*/
/* IOString.m created by rsulack on Wed 17-Sep-1997 */
/* IOString.cpp converted to C++ on Tue 1998-9-22 */
@@ -56,6 +58,15 @@
OSMetaClassDefineReservedUnused(OSString, 14);
OSMetaClassDefineReservedUnused(OSString, 15);
+#if OSALLOCDEBUG
+extern "C" {
+ extern int debug_container_malloc_size;
+};
+#define ACCUMSIZE(s) do { debug_container_malloc_size += (s); } while(0)
+#else
+#define ACCUMSIZE(s)
+#endif
+
bool OSString::initWithString(const OSString *aString)
{
return initWithCString(aString->string);
@@ -63,74 +74,29 @@
bool OSString::initWithCString(const char *cString)
{
- unsigned int newLength;
- char * newString;
-
- if (!cString || !super::init()) return false;
-
- newLength = strnlen(cString, kMaxStringLength);
- if (newLength >= kMaxStringLength) return false;
-
- newLength++;
- newString = (char *) kalloc_container(newLength);
- if (!newString) return false;
-
- bcopy(cString, newString, newLength);
-
- if ( !(flags & kOSStringNoCopy) && string) {
- kfree(string, (vm_size_t)length);
- OSCONTAINER_ACCUMSIZE(-((size_t)length));
- }
- string = newString;
- length = newLength;
- flags &= ~kOSStringNoCopy;
-
- OSCONTAINER_ACCUMSIZE(length);
+ if (!cString || !super::init())
+ return false;
+
+ length = strlen(cString) + 1;
+ string = (char *) kalloc(length);
+ if (!string)
+ return false;
+
+ bcopy(cString, string, length);
+
+ ACCUMSIZE(length);
return true;
}
-bool OSString::initWithStringOfLength(const char *cString, size_t inlength)
-{
- unsigned int newLength;
- char * newString;
-
- if (!cString || !super::init()) return false;
-
- if (inlength >= kMaxStringLength) return false;
-
- newLength = inlength + 1;
- newString = (char *) kalloc_container(newLength);
- if (!newString) return false;
-
- bcopy(cString, newString, inlength);
- newString[inlength] = 0;
-
- if ( !(flags & kOSStringNoCopy) && string) {
- kfree(string, (vm_size_t)length);
- OSCONTAINER_ACCUMSIZE(-((size_t)length));
- }
-
- string = newString;
- length = newLength;
- flags &= ~kOSStringNoCopy;
-
- OSCONTAINER_ACCUMSIZE(length);
-
- return true;
-}
-
bool OSString::initWithCStringNoCopy(const char *cString)
{
if (!cString || !super::init())
return false;
- length = strnlen(cString, kMaxStringLength);
- if (length >= kMaxStringLength) return false;
-
- length++;
+ length = strlen(cString) + 1;
flags |= kOSStringNoCopy;
- string = const_cast<char *>(cString);
+ string = (char *) cString;
return true;
}
@@ -170,20 +136,6 @@
return me;
}
-
-OSString *OSString::withStringOfLength(const char *cString, size_t length)
-{
- OSString *me = new OSString;
-
- if (me && !me->initWithStringOfLength(cString, length)) {
- me->release();
- return 0;
- }
-
- return me;
-}
-
-
/* @@@ gvdl */
#if 0
@@ -215,7 +167,7 @@
{
if ( !(flags & kOSStringNoCopy) && string) {
kfree(string, (vm_size_t)length);
- OSCONTAINER_ACCUMSIZE(-((size_t)length));
+ ACCUMSIZE(-length);
}
super::free();
@@ -258,7 +210,7 @@
bool OSString::isEqualTo(const char *aCString) const
{
- return strncmp(string, aCString, length) == 0;
+ return strcmp(string, aCString) == 0;
}
bool OSString::isEqualTo(const OSMetaClassBase *obj) const
@@ -280,7 +232,7 @@
return false;
unsigned int dataLen = obj->getLength ();;
- const char * dataPtr = (const char *) obj->getBytesNoCopy ();
+ char * dataPtr = (char *) obj->getBytesNoCopy ();
if (dataLen != length) {