Loading...
--- xnu/xnu-1699.24.8/libkern/c++/OSDictionary.cpp
+++ xnu/xnu-517/libkern/c++/OSDictionary.cpp
@@ -1,19 +1,16 @@
/*
* Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * 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. 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.
+ * 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
@@ -23,7 +20,7 @@
* Please see the License for the specific language governing rights and
* limitations under the License.
*
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ * @APPLE_LICENSE_HEADER_END@
*/
/* OSDictionary.m created by rsulack on Fri 12-Sep-1997 */
/* OSDictionary.cpp converted to C++ by gvdl on Fri 1998-10-30 */
@@ -58,9 +55,6 @@
#define ACCUMSIZE(s)
#endif
-#define EXT_CAST(obj) \
- reinterpret_cast<OSObject *>(const_cast<OSMetaClassBase *>(obj))
-
bool OSDictionary::initWithCapacity(unsigned int inCapacity)
{
if (!super::init())
@@ -87,7 +81,7 @@
unsigned int theCount,
unsigned int theCapacity)
{
- unsigned int newCapacity = theCount;
+ unsigned int capacity = theCount;
if (!objects || !keys)
return false;
@@ -96,10 +90,10 @@
if (theCount > theCapacity)
return false;
- newCapacity = theCapacity;
- }
-
- if (!initWithCapacity(newCapacity))
+ capacity = theCapacity;
+ }
+
+ if (!initWithCapacity(capacity))
return false;
for (unsigned int i = 0; i < theCount; i++) {
@@ -117,7 +111,7 @@
unsigned int theCount,
unsigned int theCapacity)
{
- unsigned int newCapacity = theCount;
+ unsigned int capacity = theCount;
if (!objects || !keys)
return false;
@@ -126,10 +120,10 @@
if (theCount > theCapacity)
return false;
- newCapacity = theCapacity;
- }
-
- if (!initWithCapacity(newCapacity))
+ capacity = theCapacity;
+ }
+
+ if (!initWithCapacity(capacity))
return false;
for (unsigned int i = 0; i < theCount; i++) {
@@ -153,21 +147,21 @@
bool OSDictionary::initWithDictionary(const OSDictionary *dict,
unsigned int theCapacity)
{
- unsigned int newCapacity;
+ unsigned int capacity;
if ( !dict )
return false;
- newCapacity = dict->count;
+ capacity = dict->count;
if ( theCapacity ) {
if ( dict->count > theCapacity )
return false;
- newCapacity = theCapacity;
- }
-
- if (!initWithCapacity(newCapacity))
+ capacity = theCapacity;
+ }
+
+ if (!initWithCapacity(capacity))
return false;
count = dict->count;
@@ -237,10 +231,9 @@
void OSDictionary::free()
{
- (void) super::setOptions(0, kImmutable);
flushCollection();
if (dictionary) {
- kfree(dictionary, capacity * sizeof(dictEntry));
+ kfree((vm_offset_t)dictionary, capacity * sizeof(dictEntry));
ACCUMSIZE( -(capacity * sizeof(dictEntry)) );
}
@@ -283,7 +276,7 @@
bzero(&newDict[capacity], newSize - oldSize);
ACCUMSIZE(newSize - oldSize);
- kfree(dictionary, oldSize);
+ kfree((vm_offset_t)dictionary, oldSize);
dictionary = newDict;
capacity = newCapacity;
@@ -314,10 +307,10 @@
if (aKey == dictionary[i].key) {
const OSMetaClassBase *oldObject = dictionary[i].value;
- haveUpdated();
-
anObject->taggedRetain(OSTypeID(OSCollection));
dictionary[i].value = anObject;
+
+ haveUpdated();
oldObject->taggedRelease(OSTypeID(OSCollection));
return true;
@@ -327,8 +320,6 @@
// add new key, possibly extending our capacity
if (count >= capacity && count >= ensureCapacity(count+1))
return 0;
-
- haveUpdated();
aKey->taggedRetain(OSTypeID(OSCollection));
anObject->taggedRetain(OSTypeID(OSCollection));
@@ -336,6 +327,8 @@
dictionary[count].value = anObject;
count++;
+ haveUpdated();
+
return true;
}
@@ -371,7 +364,7 @@
if ( !OSDynamicCast(OSDictionary, srcDict) )
return false;
- iter = OSCollectionIterator::withCollection(const_cast<OSDictionary *>(srcDict));
+ iter = OSCollectionIterator::withCollection((OSDictionary *)srcDict);
if ( !iter )
return false;
@@ -397,7 +390,7 @@
// if the key exists, remove the object
for (unsigned int i = 0; i < count; i++)
if (aKey == dictionary[i].key)
- return (const_cast<OSObject *> ((const OSObject *)dictionary[i].value));
+ return (OSObject *) dictionary[i].value;
return 0;
}
@@ -578,77 +571,3 @@
return s->addXMLEndTag("dict");
}
-
-unsigned OSDictionary::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 *v = OSDynamicCast(OSCollection, dictionary[i].value);
- if (v)
- v->setOptions(options, mask);
- }
- }
-
- return old;
-}
-
-OSCollection * OSDictionary::copyCollection(OSDictionary *cycleDict)
-{
- bool allocDict = !cycleDict;
- OSCollection *ret = 0;
- OSDictionary *newDict = 0;
-
- if (allocDict) {
- cycleDict = OSDictionary::withCapacity(16);
- if (!cycleDict)
- return 0;
- }
-
- do {
- // Check for a cycle
- ret = super::copyCollection(cycleDict);
- if (ret)
- continue;
-
- newDict = OSDictionary::withDictionary(this);
- if (!newDict)
- continue;
-
- // Insert object into cycle Dictionary
- cycleDict->setObject((const OSSymbol *) this, newDict);
-
- for (unsigned int i = 0; i < count; i++) {
- const OSMetaClassBase *obj = dictionary[i].value;
- OSCollection *coll = OSDynamicCast(OSCollection, EXT_CAST(obj));
-
- if (coll) {
- OSCollection *newColl = coll->copyCollection(cycleDict);
- if (!newColl)
- goto abortCopy;
-
- newDict->dictionary[i].value = newColl;
-
- coll->taggedRelease(OSTypeID(OSCollection));
- newColl->taggedRetain(OSTypeID(OSCollection));
- newColl->release();
- };
- }
-
- ret = newDict;
- newDict = 0;
-
- } while (false);
-
-abortCopy:
- if (newDict)
- newDict->release();
-
- if (allocDict)
- cycleDict->release();
-
- return ret;
-}
-