--- xnu/xnu-1699.22.81/libkern/c++/OSData.cpp
+++ xnu/xnu-1228/libkern/c++/OSData.cpp
@@ -38,7 +38,7 @@
 #define super OSObject
 
 OSDefineMetaClassAndStructors(OSData, OSObject)
-OSMetaClassDefineReservedUsed(OSData, 0);    // setDeallocFunction
+OSMetaClassDefineReservedUnused(OSData, 0);
 OSMetaClassDefineReservedUnused(OSData, 1);
 OSMetaClassDefineReservedUnused(OSData, 2);
 OSMetaClassDefineReservedUnused(OSData, 3);
@@ -190,12 +190,7 @@
     if (capacity != EXTERNAL && data && capacity) {
         kfree(data, capacity);
         ACCUMSIZE( -capacity );
-    } else if (capacity == EXTERNAL) {
-	    DeallocFunction freemem = (DeallocFunction)reserved;
-		if (freemem && data && length) {
-			freemem(data, length);
-		}
-	}
+    }
     super::free();
 }
 
@@ -211,8 +206,6 @@
 {
     return capacityIncrement = increment; 
 }
-
-// xx-review: does not check for capacity == EXTERNAL
 
 unsigned int OSData::ensureCapacity(unsigned int newCapacity)
 {
@@ -328,11 +321,11 @@
 
 bool OSData::isEqualTo(const OSMetaClassBase *obj) const
 {
-    OSData *	otherData;
+    OSData *	data;
     OSString *  str;
 
-    if ((otherData = OSDynamicCast(OSData, obj)))
-        return isEqualTo(otherData);
+    if ((data = OSDynamicCast(OSData, obj)))
+        return isEqualTo(data);
     else if ((str = OSDynamicCast (OSString, obj)))
         return isEqualTo(str);
     else
@@ -430,12 +423,3 @@
 
     return s->addXMLEndTag("data");
 }
-
-/* Note I am just using the reserved pointer here instead of allocating a whole buffer
- * to hold one pointer.
- */
-void OSData::setDeallocFunction(DeallocFunction func)
-{
-    reserved = (ExpansionData *)func;
-	return;
-}