--- xnu/xnu-344.49/libkern/c++/OSSerialize.cpp
+++ xnu/xnu-1699.32.7/libkern/c++/OSSerialize.cpp
@@ -1,16 +1,19 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * 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. 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. 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.
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* OSSerialize.cpp created by rsulack on Wen 25-Nov-1998 */
 
@@ -76,6 +79,7 @@
 	// look it up
 	tagString = (OSString *)tags->getObject((const OSSymbol *) o);
 
+// xx-review: no error checking here for addString calls!
 	// does it exist?
 	if (tagString) {
 		addString("<reference IDREF=\"");
@@ -85,7 +89,7 @@
 	}
 
 	// build a tag
-	sprintf(temp, "%u", tag++);
+	snprintf(temp, sizeof(temp), "%u", tag++);
 	tagString = OSString::withCString(temp);
 
 	// add to tag dictionary
@@ -151,7 +155,7 @@
 
     tag = 0;
     length = 1;
-    capacity = (inCapacity) ? round_page(inCapacity) : round_page(1);
+    capacity = (inCapacity) ? round_page_32(inCapacity) : round_page_32(1);
     capacityIncrement = capacity;
 
     // allocate from the kernel map so that we can safely map this data
@@ -176,7 +180,7 @@
 	OSSerialize *me = new OSSerialize;
 
 	if (me && !me->initWithCapacity(inCapacity)) {
-		me->free();
+		me->release();
 		return 0;
 	}
 
@@ -200,7 +204,7 @@
 		return capacity;
 
 	// round up
-	newCapacity = round_page(newCapacity);
+	newCapacity = round_page_32(newCapacity);
 
 	kern_return_t rc = kmem_realloc(kernel_map,
 					(vm_offset_t)data,
@@ -241,7 +245,7 @@
 OSDefineMetaClassAndStructors(OSSerializer, OSObject)
 
 OSSerializer * OSSerializer::forTarget( void * target,
-                               OSSerializerCallback callback, void * ref = 0 )
+                               OSSerializerCallback callback, void * ref )
 {
     OSSerializer * thing;