xnu-344.21.73.tar.gz

[apple/xnu.git] / libkern / c++ / OSSerialize.cpp

diff --git a/libkern/c++/OSSerialize.cpp b/libkern/c++/OSSerialize.cpp
index b84656c48e999728a88ae6ee0c13c5b85671f513..e3eb5e2e5c3f9b7e6d83152c41cfe13c62f83a1d 100644 (file)
--- a/libkern/c++/OSSerialize.cpp
+++ b/libkern/c++/OSSerialize.cpp
@@ -3,19 +3,22 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -148,7 +151,7 @@ bool OSSerialize::initWithCapacity(unsigned int inCapacity)
 
     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
@@ -173,7 +176,7 @@ OSSerialize *OSSerialize::withCapacity(unsigned int inCapacity)
        OSSerialize *me = new OSSerialize;
 
        if (me && !me->initWithCapacity(inCapacity)) {
-               me->free();
+               me->release();
                return 0;
        }
 
@@ -197,7 +200,7 @@ unsigned int OSSerialize::ensureCapacity(unsigned int newCapacity)
                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,
@@ -238,7 +241,7 @@ void OSSerialize::free()
 OSDefineMetaClassAndStructors(OSSerializer, OSObject)
 
 OSSerializer * OSSerializer::forTarget( void * target,
-                               OSSerializerCallback callback, void * ref = 0 )
+                               OSSerializerCallback callback, void * ref )
 {
     OSSerializer * thing;