--- xnu/xnu-2782.1.97/libkern/c++/OSData.cpp
+++ xnu/xnu-792.22.5/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,13 +190,7 @@
     if (capacity != EXTERNAL && data && capacity) {
         kfree(data, capacity);
         ACCUMSIZE( -capacity );
-    } else if (capacity == EXTERNAL) {
-	DeallocFunction freemem = reserved ? reserved->deallocFunction : NULL;
-	if (freemem && data && length) {
-		freemem(data, length);
-	}
-    }
-    if (reserved) kfree(reserved, sizeof(ExpansionData));
+    }
     super::free();
 }
 
@@ -213,34 +207,27 @@
     return capacityIncrement = increment; 
 }
 
-// xx-review: does not check for capacity == EXTERNAL
-
 unsigned int OSData::ensureCapacity(unsigned int newCapacity)
 {
     unsigned char * newData;
-    unsigned int finalCapacity;
 
     if (newCapacity <= capacity)
         return capacity;
 
-    finalCapacity = (((newCapacity - 1) / capacityIncrement) + 1)
+    newCapacity = (((newCapacity - 1) / capacityIncrement) + 1)
                 * capacityIncrement;
 
-    // integer overflow check
-    if (finalCapacity < newCapacity)
-        return capacity;
-
-    newData = (unsigned char *) kalloc(finalCapacity);
-
+    newData = (unsigned char *) kalloc(newCapacity);
+    
     if ( newData ) {
-        bzero(newData + capacity, finalCapacity - capacity);
+        bzero(newData + capacity, newCapacity - capacity);
         if (data) {
             bcopy(data, newData, capacity);
             kfree(data, capacity);
         }
-        ACCUMSIZE( finalCapacity - capacity );
+        ACCUMSIZE( newCapacity - capacity );
         data = (void *) newData;
-        capacity = finalCapacity;
+        capacity = newCapacity;
     }
 
     return capacity;
@@ -334,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
@@ -394,16 +381,12 @@
     unsigned int i;
     const unsigned char *p;
     unsigned char c;
-    unsigned int serializeLength;
 
     if (s->previouslySerialized(this)) return true;
 
     if (!s->addXMLStartTag(this, "data")) return false;
 
-    serializeLength = length;
-    if (reserved && reserved->disableSerialization) serializeLength = 0;
-
-    for (i = 0, p = (unsigned char *)data; i < serializeLength; i++, p++) {
+    for (i = 0, p = (unsigned char *)data; i < length; i++, p++) {
         /* 3 bytes are encoded as 4 */
         switch (i % 3) {
 	case 0:
@@ -440,25 +423,3 @@
 
     return s->addXMLEndTag("data");
 }
-
-void OSData::setDeallocFunction(DeallocFunction func)
-{
-    if (!reserved)
-    {
-    	reserved = (typeof(reserved)) kalloc(sizeof(ExpansionData));
-        if (!reserved) return;
-        bzero(reserved, sizeof(ExpansionData));
-    }
-    reserved->deallocFunction = func;
-}
-
-void OSData::setSerializable(bool serializable)
-{
-    if (!reserved)
-    {
-    	reserved = (typeof(reserved)) kalloc(sizeof(ExpansionData));
-	if (!reserved) return;
-	bzero(reserved, sizeof(ExpansionData));
-    }
-    reserved->disableSerialization = (!serializable);
-}