Loading...
libkern/c++/OSSerialize.cpp xnu-792.6.56 xnu-344.49
--- xnu/xnu-792.6.56/libkern/c++/OSSerialize.cpp
+++ xnu/xnu-344.49/libkern/c++/OSSerialize.cpp
@@ -2,6 +2,8 @@
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
  * @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
@@ -149,7 +151,7 @@
 
     tag = 0;
     length = 1;
-    capacity = (inCapacity) ? round_page_32(inCapacity) : round_page_32(1);
+    capacity = (inCapacity) ? round_page(inCapacity) : round_page(1);
     capacityIncrement = capacity;
 
     // allocate from the kernel map so that we can safely map this data
@@ -174,7 +176,7 @@
 	OSSerialize *me = new OSSerialize;
 
 	if (me && !me->initWithCapacity(inCapacity)) {
-		me->release();
+		me->free();
 		return 0;
 	}
 
@@ -198,7 +200,7 @@
 		return capacity;
 
 	// round up
-	newCapacity = round_page_32(newCapacity);
+	newCapacity = round_page(newCapacity);
 
 	kern_return_t rc = kmem_realloc(kernel_map,
 					(vm_offset_t)data,
@@ -239,7 +241,7 @@
 OSDefineMetaClassAndStructors(OSSerializer, OSObject)
 
 OSSerializer * OSSerializer::forTarget( void * target,
-                               OSSerializerCallback callback, void * ref )
+                               OSSerializerCallback callback, void * ref = 0 )
 {
     OSSerializer * thing;