Loading...
--- xnu/xnu-4570.61.1/libkern/c++/OSString.cpp
+++ xnu/xnu-344/libkern/c++/OSString.cpp
@@ -1,29 +1,23 @@
/*
* Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * @APPLE_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.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License"). You may not use this file except in compliance with the
+ * License. Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
*
- * 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
+ * This 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.
+ * FITNESS FOR A PARTICULAR PURPOSE 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_HEADER_END@
*/
/* IOString.m created by rsulack on Wed 17-Sep-1997 */
/* IOString.cpp converted to C++ on Tue 1998-9-22 */
@@ -56,6 +50,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,84 +66,39 @@
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);
+bool OSString::initWithCStringNoCopy(const char *cString)
+{
+ if (!cString || !super::init())
+ return false;
+
+ length = strlen(cString) + 1;
+ flags |= kOSStringNoCopy;
+ string = (char *) cString;
return true;
}
-bool OSString::initWithCStringNoCopy(const char *cString)
-{
- if (!cString || !super::init())
- return false;
-
- length = strnlen(cString, kMaxStringLength);
- if (length >= kMaxStringLength) return false;
-
- length++;
- flags |= kOSStringNoCopy;
- string = const_cast<char *>(cString);
-
- return true;
-}
-
OSString *OSString::withString(const OSString *aString)
{
OSString *me = new OSString;
if (me && !me->initWithString(aString)) {
- me->release();
+ me->free();
return 0;
}
@@ -152,7 +110,7 @@
OSString *me = new OSString;
if (me && !me->initWithCString(cString)) {
- me->release();
+ me->free();
return 0;
}
@@ -164,26 +122,12 @@
OSString *me = new OSString;
if (me && !me->initWithCStringNoCopy(cString)) {
- me->release();
- return 0;
- }
-
- 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;
-}
-
-
+ me->free();
+ return 0;
+ }
+
+ return me;
+}
/* @@@ gvdl */
#if 0
@@ -214,8 +158,8 @@
void OSString::free()
{
if ( !(flags & kOSStringNoCopy) && string) {
- kfree(string, (vm_size_t)length);
- OSCONTAINER_ACCUMSIZE(-((size_t)length));
+ kfree((vm_offset_t)string, (vm_size_t)length);
+ ACCUMSIZE(-length);
}
super::free();
@@ -258,7 +202,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 +224,7 @@
return false;
unsigned int dataLen = obj->getLength ();;
- const char * dataPtr = (const char *) obj->getBytesNoCopy ();
+ char * dataPtr = (char *) obj->getBytesNoCopy ();
if (dataLen != length) {