--- xnu/xnu-7195.121.3/libkern/c++/OSString.cpp
+++ xnu/xnu-6153.41.3/libkern/c++/OSString.cpp
@@ -28,21 +28,17 @@
 /* IOString.m created by rsulack on Wed 17-Sep-1997 */
 /* IOString.cpp converted to C++ on Tue 1998-9-22 */
 
-#define IOKIT_ENABLE_SHARED_PTR
-
 #include <string.h>
 
 #include <libkern/c++/OSString.h>
 #include <libkern/c++/OSSerialize.h>
-#include <libkern/c++/OSSharedPtr.h>
 #include <libkern/c++/OSLib.h>
 #include <libkern/c++/OSData.h>
 #include <string.h>
 
 #define super OSObject
 
-OSDefineMetaClassAndStructorsWithZone(OSString, OSObject,
-    (zone_create_flags_t) (ZC_CACHING | ZC_ZFREE_CLEARMEM))
+OSDefineMetaClassAndStructors(OSString, OSObject)
 OSMetaClassDefineReservedUnused(OSString, 0);
 OSMetaClassDefineReservedUnused(OSString, 1);
 OSMetaClassDefineReservedUnused(OSString, 2);
@@ -76,13 +72,13 @@
 		return false;
 	}
 
-	newLength = (unsigned int) strnlen(cString, kMaxStringLength);
+	newLength = strnlen(cString, kMaxStringLength);
 	if (newLength >= kMaxStringLength) {
 		return false;
 	}
 
 	newLength++;
-	newString = (char *)kalloc_data_container(newLength, Z_WAITOK);
+	newString = (char *) kalloc_container(newLength);
 	if (!newString) {
 		return false;
 	}
@@ -90,7 +86,7 @@
 	bcopy(cString, newString, newLength);
 
 	if (!(flags & kOSStringNoCopy) && string) {
-		kfree_data_container(string, length);
+		kfree(string, (vm_size_t)length);
 		OSCONTAINER_ACCUMSIZE(-((size_t)length));
 	}
 	string = newString;
@@ -120,8 +116,8 @@
 		return false;
 	}
 
-	newLength = (unsigned int) (inlength + 1);
-	newString = (char *)kalloc_data_container(newLength, Z_WAITOK);
+	newLength = inlength + 1;
+	newString = (char *) kalloc_container(newLength);
 	if (!newString) {
 		return false;
 	}
@@ -130,7 +126,7 @@
 	newString[inlength] = 0;
 
 	if (!(flags & kOSStringNoCopy) && string) {
-		kfree_data_container(string, length);
+		kfree(string, (vm_size_t)length);
 		OSCONTAINER_ACCUMSIZE(-((size_t)length));
 	}
 
@@ -150,7 +146,7 @@
 		return false;
 	}
 
-	length = (unsigned int) strnlen(cString, kMaxStringLength);
+	length = strnlen(cString, kMaxStringLength);
 	if (length >= kMaxStringLength) {
 		return false;
 	}
@@ -162,49 +158,53 @@
 	return true;
 }
 
-OSSharedPtr<OSString>
+OSString *
 OSString::withString(const OSString *aString)
 {
-	OSSharedPtr<OSString> me = OSMakeShared<OSString>();
+	OSString *me = new OSString;
 
 	if (me && !me->initWithString(aString)) {
-		return nullptr;
-	}
-
-	return me;
-}
-
-OSSharedPtr<OSString>
+		me->release();
+		return NULL;
+	}
+
+	return me;
+}
+
+OSString *
 OSString::withCString(const char *cString)
 {
-	OSSharedPtr<OSString> me = OSMakeShared<OSString>();
+	OSString *me = new OSString;
 
 	if (me && !me->initWithCString(cString)) {
-		return nullptr;
-	}
-
-	return me;
-}
-
-OSSharedPtr<OSString>
+		me->release();
+		return NULL;
+	}
+
+	return me;
+}
+
+OSString *
 OSString::withCStringNoCopy(const char *cString)
 {
-	OSSharedPtr<OSString> me = OSMakeShared<OSString>();
+	OSString *me = new OSString;
 
 	if (me && !me->initWithCStringNoCopy(cString)) {
-		return nullptr;
-	}
-
-	return me;
-}
-
-OSSharedPtr<OSString>
+		me->release();
+		return NULL;
+	}
+
+	return me;
+}
+
+OSString *
 OSString::withStringOfLength(const char *cString, size_t length)
 {
-	OSSharedPtr<OSString> me = OSMakeShared<OSString>();
+	OSString *me = new OSString;
 
 	if (me && !me->initWithStringOfLength(cString, length)) {
-		return nullptr;
+		me->release();
+		return NULL;
 	}
 
 	return me;
@@ -245,7 +245,7 @@
 OSString::free()
 {
 	if (!(flags & kOSStringNoCopy) && string) {
-		kfree_data_container(string, length);
+		kfree(string, (vm_size_t)length);
 		OSCONTAINER_ACCUMSIZE(-((size_t)length));
 	}