--- xnu/xnu-2422.100.13/libkern/c++/OSData.cpp
+++ xnu/xnu-517.3.7/libkern/c++/OSData.cpp
@@ -1,19 +1,16 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
  * 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.
+ * compliance with the License. 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
@@ -23,7 +20,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ * @APPLE_LICENSE_HEADER_END@
  */
 /* IOData.m created by rsulack on Thu 25-Sep-1997 */
 
@@ -38,7 +35,7 @@
 #define super OSObject
 
 OSDefineMetaClassAndStructors(OSData, OSObject)
-OSMetaClassDefineReservedUsed(OSData, 0);    // setDeallocFunction
+OSMetaClassDefineReservedUnused(OSData, 0);
 OSMetaClassDefineReservedUnused(OSData, 1);
 OSMetaClassDefineReservedUnused(OSData, 2);
 OSMetaClassDefineReservedUnused(OSData, 3);
@@ -56,12 +53,6 @@
 #define ACCUMSIZE(s)
 #endif
 
-struct OSData::ExpansionData
-{
-    DeallocFunction deallocFunction;
-    bool            disableSerialization;
-};
-
 bool OSData::initWithCapacity(unsigned int inCapacity)
 {
     if (!super::init())
@@ -69,7 +60,7 @@
 
     if (data && (!inCapacity || capacity < inCapacity) ) {
         // clean out old data's storage if it isn't big enough
-        kfree(data, capacity);
+        kfree((vm_address_t) data, capacity);
         data = 0;
         ACCUMSIZE(-capacity);
     }
@@ -194,15 +185,9 @@
 void OSData::free()
 {
     if (capacity != EXTERNAL && data && capacity) {
-        kfree(data, capacity);
+        kfree((vm_offset_t)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();
 }
 
@@ -218,8 +203,6 @@
 {
     return capacityIncrement = increment; 
 }
-
-// xx-review: does not check for capacity == EXTERNAL
 
 unsigned int OSData::ensureCapacity(unsigned int newCapacity)
 {
@@ -237,7 +220,7 @@
         bzero(newData + capacity, newCapacity - capacity);
         if (data) {
             bcopy(data, newData, capacity);
-            kfree(data, capacity);
+            kfree((vm_offset_t)data, capacity);
         }
         ACCUMSIZE( newCapacity - capacity );
         data = (void *) newData;
@@ -335,11 +318,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
@@ -395,16 +378,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:
@@ -441,25 +420,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);
-}