Loading...
--- xnu/xnu-2782.40.9/libkern/c++/OSArray.cpp
+++ xnu/xnu-344/libkern/c++/OSArray.cpp
@@ -1,36 +1,29 @@
/*
* Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_OSREFERENCE_LICENSE_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.
+ * 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.
*
- * 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
+ * This 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.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
*
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ * @APPLE_LICENSE_HEADER_END@
*/
/* IOArray.m created by rsulack on Fri 12-Sep-1997 */
/* IOArray.cpp converted to C++ by gvdl on Fri 1998-10-30 */
#include <libkern/c++/OSArray.h>
-#include <libkern/c++/OSDictionary.h>
#include <libkern/c++/OSSerialize.h>
#include <libkern/c++/OSLib.h>
@@ -55,18 +48,11 @@
#define ACCUMSIZE(s)
#endif
-#define EXT_CAST(obj) \
- reinterpret_cast<OSObject *>(const_cast<OSMetaClassBase *>(obj))
-
bool OSArray::initWithCapacity(unsigned int inCapacity)
{
- unsigned int size;
+ int size;
if (!super::init())
- return false;
-
- // integer overflow check
- if (inCapacity > (UINT_MAX / sizeof(const OSMetaClassBase*)))
return false;
size = sizeof(const OSMetaClassBase *) * inCapacity;
@@ -81,23 +67,23 @@
bzero(array, size);
ACCUMSIZE(size);
- return true;
+ return this;
}
bool OSArray::initWithObjects(const OSObject *objects[],
unsigned int theCount,
- unsigned int theCapacity)
-{
- unsigned int initCapacity;
+ unsigned int theCapacity = 0)
+{
+ unsigned int capacity;
if (!theCapacity)
- initCapacity = theCount;
+ capacity = theCount;
else if (theCount > theCapacity)
return false;
else
- initCapacity = theCapacity;
-
- if (!objects || !initWithCapacity(initCapacity))
+ capacity = theCapacity;
+
+ if (!objects || !initWithCapacity(capacity))
return false;
for ( unsigned int i = 0; i < theCount; i++ ) {
@@ -114,7 +100,7 @@
}
bool OSArray::initWithArray(const OSArray *anArray,
- unsigned int theCapacity)
+ unsigned int theCapacity = 0)
{
if ( !anArray )
return false;
@@ -128,7 +114,7 @@
OSArray *me = new OSArray;
if (me && !me->initWithCapacity(capacity)) {
- me->release();
+ me->free();
return 0;
}
@@ -137,12 +123,12 @@
OSArray *OSArray::withObjects(const OSObject *objects[],
unsigned int count,
- unsigned int capacity)
+ unsigned int capacity = 0)
{
OSArray *me = new OSArray;
if (me && !me->initWithObjects(objects, count, capacity)) {
- me->release();
+ me->free();
return 0;
}
@@ -150,12 +136,12 @@
}
OSArray *OSArray::withArray(const OSArray *array,
- unsigned int capacity)
+ unsigned int capacity = 0)
{
OSArray *me = new OSArray;
if (me && !me->initWithArray(array, capacity)) {
- me->release();
+ me->free();
return 0;
}
@@ -164,13 +150,10 @@
void OSArray::free()
{
- // Clear immutability - assumes the container is doing the right thing
- (void) super::setOptions(0, kImmutable);
-
flushCollection();
if (array) {
- kfree(array, sizeof(const OSMetaClassBase *) * capacity);
+ kfree((vm_offset_t)array, sizeof(const OSMetaClassBase *) * capacity);
ACCUMSIZE( -(sizeof(const OSMetaClassBase *) * capacity) );
}
@@ -191,21 +174,15 @@
unsigned int OSArray::ensureCapacity(unsigned int newCapacity)
{
const OSMetaClassBase **newArray;
- unsigned int finalCapacity;
- unsigned int oldSize, newSize;
+ int oldSize, newSize;
if (newCapacity <= capacity)
return capacity;
// round up
- finalCapacity = (((newCapacity - 1) / capacityIncrement) + 1)
+ newCapacity = (((newCapacity - 1) / capacityIncrement) + 1)
* capacityIncrement;
-
- // integer overflow check
- if ((finalCapacity < newCapacity) || (finalCapacity > (UINT_MAX / sizeof(const OSMetaClassBase*))))
- return capacity;
-
- newSize = sizeof(const OSMetaClassBase *) * finalCapacity;
+ newSize = sizeof(const OSMetaClassBase *) * newCapacity;
newArray = (const OSMetaClassBase **) kalloc(newSize);
if (newArray) {
@@ -215,9 +192,9 @@
bcopy(array, newArray, oldSize);
bzero(&newArray[capacity], newSize - oldSize);
- kfree(array, oldSize);
+ kfree((vm_offset_t)array, oldSize);
array = newArray;
- capacity = finalCapacity;
+ capacity = newCapacity;
}
return capacity;
@@ -228,9 +205,8 @@
unsigned int i;
haveUpdated();
- for (i = 0; i < count; i++) {
+ for (i = 0; i < count; i++)
array[i]->taggedRelease(OSTypeID(OSCollection));
- }
count = 0;
}
@@ -354,7 +330,7 @@
if (index >= count)
return 0;
else
- return (OSObject *) (const_cast<OSMetaClassBase *>(array[index]));
+ return (OSObject *) array[index];
}
OSObject *OSArray::getLastObject() const
@@ -362,7 +338,7 @@
if (count == 0)
return 0;
else
- return ( OSObject *) (const_cast<OSMetaClassBase *>(array[count - 1]));
+ return (OSObject *) array[count - 1];
}
unsigned int OSArray::getNextIndexOfObject(const OSMetaClassBase * anObject,
@@ -394,7 +370,7 @@
unsigned int index = (*iteratorP)++;
if (index < count) {
- *ret = (OSObject *)(const_cast<OSMetaClassBase *> (array[index]));
+ *ret = (OSObject *) array[index];
return true;
}
else {
@@ -409,80 +385,9 @@
if (!s->addXMLStartTag(this, "array")) return false;
- for (unsigned i = 0; i < count; i++) {
- if (array[i] == NULL || !array[i]->serialize(s)) return false;
+ for (unsigned i = 0; i < count; i++) {
+ if (!array[i]->serialize(s)) return false;
}
return s->addXMLEndTag("array");
}
-
-unsigned OSArray::setOptions(unsigned options, unsigned mask, void *)
-{
- unsigned old = super::setOptions(options, mask);
- if ((old ^ options) & mask) {
-
- // Value changed need to recurse over all of the child collections
- for ( unsigned i = 0; i < count; i++ ) {
- OSCollection *coll = OSDynamicCast(OSCollection, array[i]);
- if (coll)
- coll->setOptions(options, mask);
- }
- }
-
- return old;
-}
-
-OSCollection * OSArray::copyCollection(OSDictionary *cycleDict)
-{
- bool allocDict = !cycleDict;
- OSCollection *ret = 0;
- OSArray *newArray = 0;
-
- if (allocDict) {
- cycleDict = OSDictionary::withCapacity(16);
- if (!cycleDict)
- return 0;
- }
-
- do {
- // Check for a cycle
- ret = super::copyCollection(cycleDict);
- if (ret)
- continue;
-
- newArray = OSArray::withArray(this);
- if (!newArray)
- continue;
-
- // Insert object into cycle Dictionary
- cycleDict->setObject((const OSSymbol *) this, newArray);
-
- for (unsigned int i = 0; i < count; i++) {
- OSCollection *coll =
- OSDynamicCast(OSCollection, EXT_CAST(newArray->array[i]));
-
- if (coll) {
- OSCollection *newColl = coll->copyCollection(cycleDict);
- if (!newColl)
- goto abortCopy;
-
- newArray->replaceObject(i, newColl);
- newColl->release();
- };
- };
-
- ret = newArray;
- newArray = 0;
-
- } while (false);
-
-abortCopy:
- if (newArray)
- newArray->release();
-
- if (allocDict)
- cycleDict->release();
-
- return ret;
-}
-