Loading...
--- xnu/xnu-792.13.8/libkern/c++/OSData.cpp
+++ xnu/xnu-344.49/libkern/c++/OSData.cpp
@@ -1,31 +1,26 @@
/*
* Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
+ * @APPLE_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. 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
+ * 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. 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
+ *
+ * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
* limitations under the License.
- *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
+ *
+ * @APPLE_LICENSE_HEADER_END@
*/
/* IOData.m created by rsulack on Thu 25-Sep-1997 */
@@ -52,7 +47,9 @@
#define EXTERNAL ((unsigned int) -1)
#if OSALLOCDEBUG
-extern int debug_container_malloc_size;
+extern "C" {
+ extern int debug_container_malloc_size;
+};
#define ACCUMSIZE(s) do { debug_container_malloc_size += (s); } while(0)
#else
#define ACCUMSIZE(s)
@@ -63,26 +60,19 @@
if (!super::init())
return false;
- if (data && (!inCapacity || capacity < inCapacity) ) {
- // clean out old data's storage if it isn't big enough
- kfree(data, capacity);
- data = 0;
- ACCUMSIZE(-capacity);
- }
-
- if (inCapacity && !data) {
+ if(inCapacity) {
data = (void *) kalloc(inCapacity);
if (!data)
return false;
- capacity = inCapacity;
- ACCUMSIZE(inCapacity);
}
length = 0;
- if (inCapacity < 16)
+ capacity = inCapacity;
+ capacityIncrement = capacity;
+ if(!capacityIncrement)
capacityIncrement = 16;
- else
- capacityIncrement = inCapacity;
+
+ ACCUMSIZE(capacity);
return true;
}
@@ -92,8 +82,7 @@
if ((inLength && !bytes) || !initWithCapacity(inLength))
return false;
- if (bytes != data)
- bcopy(bytes, data, inLength);
+ bcopy(bytes, data, inLength);
length = inLength;
return true;
@@ -132,7 +121,7 @@
OSData *me = new OSData;
if (me && !me->initWithCapacity(inCapacity)) {
- me->release();
+ me->free();
return 0;
}
@@ -144,7 +133,7 @@
OSData *me = new OSData;
if (me && !me->initWithBytes(bytes, inLength)) {
- me->release();
+ me->free();
return 0;
}
return me;
@@ -155,7 +144,7 @@
OSData *me = new OSData;
if (me && !me->initWithBytesNoCopy(bytes, inLength)) {
- me->release();
+ me->free();
return 0;
}
@@ -167,7 +156,7 @@
OSData *me = new OSData;
if (me && !me->initWithData(inData)) {
- me->release();
+ me->free();
return 0;
}
@@ -180,7 +169,7 @@
OSData *me = new OSData;
if (me && !me->initWithData(inData, start, inLength)) {
- me->release();
+ me->free();
return 0;
}
@@ -190,7 +179,7 @@
void OSData::free()
{
if (capacity != EXTERNAL && data && capacity) {
- kfree(data, capacity);
+ kfree((vm_offset_t)data, capacity);
ACCUMSIZE( -capacity );
}
super::free();
@@ -225,7 +214,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;
@@ -239,7 +228,7 @@
{
unsigned int newSize;
- if (!inLength)
+ if (inLength == 0)
return true;
if (capacity == EXTERNAL)
@@ -249,11 +238,7 @@
if ( (newSize > capacity) && newSize > ensureCapacity(newSize) )
return false;
- if (bytes)
- bcopy(bytes, &((unsigned char *)data)[length], inLength);
- else
- bzero(&((unsigned char *)data)[length], inLength);
-
+ bcopy(bytes, &((unsigned char *)data)[length], inLength);
length = newSize;
return true;
@@ -263,7 +248,7 @@
{
unsigned int newSize;
- if (!inLength)
+ if (inLength == 0)
return true;
if (capacity == EXTERNAL)
@@ -286,7 +271,7 @@
const void *OSData::getBytesNoCopy() const
{
- if (!length)
+ if (length == 0)
return 0;
else
return data;
@@ -341,7 +326,7 @@
unsigned int checkLen = length;
unsigned int stringLen;
- if (!obj)
+ if (NULL == obj)
return false;
stringLen = obj->getLength ();