Loading...
--- xnu/xnu-1228/libkern/c++/OSSet.cpp
+++ xnu/xnu-344.2/libkern/c++/OSSet.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@
*/
/* IOSet.m created by rsulack on Thu 11-Jun-1998 */
-#include <libkern/c++/OSDictionary.h>
+#include <libkern/c++/OSSet.h>
#include <libkern/c++/OSArray.h>
#include <libkern/c++/OSSerialize.h>
-#include <libkern/c++/OSSet.h>
#define super OSCollection
@@ -44,9 +37,6 @@
OSMetaClassDefineReservedUnused(OSSet, 6);
OSMetaClassDefineReservedUnused(OSSet, 7);
-#define EXT_CAST(obj) \
- reinterpret_cast<OSObject *>(const_cast<OSMetaClassBase *>(obj))
-
bool OSSet::initWithCapacity(unsigned int inCapacity)
{
if ( !super::init() )
@@ -61,7 +51,7 @@
bool OSSet::initWithObjects(const OSObject *inObjects[],
unsigned int inCount,
- unsigned int inCapacity)
+ unsigned int inCapacity = 0)
{
unsigned int capacity = inCount;
@@ -86,7 +76,7 @@
}
bool OSSet::initWithArray(const OSArray *inArray,
- unsigned int inCapacity)
+ unsigned int inCapacity = 0)
{
if ( !inArray )
return false;
@@ -96,7 +86,7 @@
}
bool OSSet::initWithSet(const OSSet *inSet,
- unsigned int inCapacity)
+ unsigned int inCapacity = 0)
{
return initWithArray(inSet->members, inCapacity);
}
@@ -106,7 +96,7 @@
OSSet *me = new OSSet;
if (me && !me->initWithCapacity(capacity)) {
- me->release();
+ me->free();
return 0;
}
@@ -115,12 +105,12 @@
OSSet *OSSet::withObjects(const OSObject *objects[],
unsigned int count,
- unsigned int capacity)
+ unsigned int capacity = 0)
{
OSSet *me = new OSSet;
if (me && !me->initWithObjects(objects, count, capacity)) {
- me->release();
+ me->free();
return 0;
}
@@ -128,12 +118,12 @@
}
OSSet *OSSet::withArray(const OSArray *array,
- unsigned int capacity)
+ unsigned int capacity = 0)
{
OSSet *me = new OSSet;
if (me && !me->initWithArray(array, capacity)) {
- me->release();
+ me->free();
return 0;
}
@@ -141,12 +131,12 @@
}
OSSet *OSSet::withSet(const OSSet *set,
- unsigned int capacity)
+ unsigned int capacity = 0)
{
OSSet *me = new OSSet;
if (me && !me->initWithSet(set, capacity)) {
- me->release();
+ me->free();
return 0;
}
@@ -155,7 +145,6 @@
void OSSet::free()
{
- (void) members->super::setOptions(0, kImmutable);
if (members)
members->release();
@@ -217,7 +206,7 @@
bool OSSet::merge(const OSSet *set)
{
- return merge(set->members);
+ return setObject(set->members);
}
void OSSet::removeObject(const OSMetaClassBase *anObject)
@@ -332,71 +321,3 @@
return s->addXMLEndTag("set");
}
-
-unsigned OSSet::setOptions(unsigned options, unsigned mask, void *)
-{
- unsigned old = super::setOptions(options, mask);
- if ((old ^ options) & mask)
- members->setOptions(options, mask);
-
- return old;
-}
-
-OSCollection * OSSet::copyCollection(OSDictionary *cycleDict)
-{
- bool allocDict = !cycleDict;
- OSCollection *ret = 0;
- OSSet *newSet = 0;
-
- if (allocDict) {
- cycleDict = OSDictionary::withCapacity(16);
- if (!cycleDict)
- return 0;
- }
-
- do {
- // Check for a cycle
- ret = super::copyCollection(cycleDict);
- if (ret)
- continue; // Found it
-
- newSet = OSSet::withCapacity(members->capacity);
- if (!newSet)
- continue; // Couldn't create new set abort
-
- // Insert object into cycle Dictionary
- cycleDict->setObject((const OSSymbol *) this, newSet);
-
- OSArray *newMembers = newSet->members;
- newMembers->capacityIncrement = members->capacityIncrement;
-
- // Now copy over the contents into the new duplicate
- for (unsigned int i = 0; i < members->count; i++) {
- OSObject *obj = EXT_CAST(members->array[i]);
- OSCollection *coll = OSDynamicCast(OSCollection, obj);
- if (coll) {
- OSCollection *newColl = coll->copyCollection(cycleDict);
- if (newColl) {
- obj = newColl; // Rely on cycleDict ref for a bit
- newColl->release();
- }
- else
- goto abortCopy;
- };
- newMembers->setObject(obj);
- };
-
- ret = newSet;
- newSet = 0;
-
- } while(false);
-
-abortCopy:
- if (newSet)
- newSet->release();
-
- if (allocDict)
- cycleDict->release();
-
- return ret;
-}