Loading...
--- xnu/xnu-2050.22.13/libkern/c++/OSDictionary.cpp
+++ xnu/xnu-792.13.8/libkern/c++/OSDictionary.cpp
@@ -1,29 +1,31 @@
/*
* Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_OSREFERENCE_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 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
+ * 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.
+ *
+ * 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_OSREFERENCE_LICENSE_HEADER_END@
+ *
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
*/
/* OSDictionary.m created by rsulack on Fri 12-Sep-1997 */
/* OSDictionary.cpp converted to C++ by gvdl on Fri 1998-10-30 */
@@ -68,8 +70,6 @@
int size = inCapacity * sizeof(dictEntry);
-//fOptions |= kSort;
-
dictionary = (dictEntry *) kalloc(size);
if (!dictionary)
return false;
@@ -89,7 +89,7 @@
unsigned int theCount,
unsigned int theCapacity)
{
- unsigned int newCapacity = theCount;
+ unsigned int capacity = theCount;
if (!objects || !keys)
return false;
@@ -98,10 +98,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++) {
@@ -119,7 +119,7 @@
unsigned int theCount,
unsigned int theCapacity)
{
- unsigned int newCapacity = theCount;
+ unsigned int capacity = theCount;
if (!objects || !keys)
return false;
@@ -128,10 +128,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++) {
@@ -155,31 +155,22 @@
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))
- return false;
-
- if ((kSort & fOptions) && !(kSort & dict->fOptions)) {
- for (unsigned int i = 0; i < dict->count; i++) {
- if (!setObject(dict->dictionary[i].key, dict->dictionary[i].value)) {
- return false;
- }
- }
- return true;
- }
+ capacity = theCapacity;
+ }
+
+ if (!initWithCapacity(capacity))
+ return false;
count = dict->count;
bcopy(dict->dictionary, dictionary, count * sizeof(dictEntry));
@@ -317,45 +308,34 @@
bool OSDictionary::
setObject(const OSSymbol *aKey, const OSMetaClassBase *anObject)
{
- unsigned int i;
- bool exists;
-
if (!anObject || !aKey)
return false;
// if the key exists, replace the object
-
- if (fOptions & kSort) {
- i = OSSymbol::bsearch(aKey, &dictionary[0], count, sizeof(dictionary[0]));
- exists = (i < count) && (aKey == dictionary[i].key);
- } else for (exists = false, i = 0; i < count; i++) {
- if ((exists = (aKey == dictionary[i].key))) break;
- }
-
- if (exists) {
- const OSMetaClassBase *oldObject = dictionary[i].value;
-
- haveUpdated();
-
- anObject->taggedRetain(OSTypeID(OSCollection));
- dictionary[i].value = anObject;
-
- oldObject->taggedRelease(OSTypeID(OSCollection));
- return true;
+ for (unsigned int i = 0; i < count; i++) {
+ if (aKey == dictionary[i].key) {
+ const OSMetaClassBase *oldObject = dictionary[i].value;
+
+ haveUpdated();
+
+ anObject->taggedRetain(OSTypeID(OSCollection));
+ dictionary[i].value = anObject;
+
+ oldObject->taggedRelease(OSTypeID(OSCollection));
+ return true;
+ }
}
// add new key, possibly extending our capacity
if (count >= capacity && count >= ensureCapacity(count+1))
- return false;
+ return 0;
haveUpdated();
-
- bcopy(&dictionary[i], &dictionary[i+1], (count - i) * sizeof(dictionary[0]));
aKey->taggedRetain(OSTypeID(OSCollection));
anObject->taggedRetain(OSTypeID(OSCollection));
- dictionary[i].key = aKey;
- dictionary[i].value = anObject;
+ dictionary[count].key = aKey;
+ dictionary[count].value = anObject;
count++;
return true;
@@ -363,33 +343,24 @@
void OSDictionary::removeObject(const OSSymbol *aKey)
{
- unsigned int i;
- bool exists;
-
if (!aKey)
return;
// if the key exists, remove the object
-
- if (fOptions & kSort) {
- i = OSSymbol::bsearch(aKey, &dictionary[0], count, sizeof(dictionary[0]));
- exists = (i < count) && (aKey == dictionary[i].key);
- } else for (exists = false, i = 0; i < count; i++) {
- if ((exists = (aKey == dictionary[i].key))) break;
- }
-
- if (exists) {
- dictEntry oldEntry = dictionary[i];
-
- haveUpdated();
-
- count--;
- bcopy(&dictionary[i+1], &dictionary[i], (count - i) * sizeof(dictionary[0]));
-
- oldEntry.key->taggedRelease(OSTypeID(OSCollection));
- oldEntry.value->taggedRelease(OSTypeID(OSCollection));
- return;
- }
+ for (unsigned int i = 0; i < count; i++)
+ if (aKey == dictionary[i].key) {
+ dictEntry oldEntry = dictionary[i];
+
+ haveUpdated();
+
+ count--;
+ for (; i < count; i++)
+ dictionary[i] = dictionary[i+1];
+
+ oldEntry.key->taggedRelease(OSTypeID(OSCollection));
+ oldEntry.value->taggedRelease(OSTypeID(OSCollection));
+ return;
+ }
}
@@ -402,7 +373,7 @@
if ( !OSDynamicCast(OSDictionary, srcDict) )
return false;
- iter = OSCollectionIterator::withCollection(const_cast<OSDictionary *>(srcDict));
+ iter = OSCollectionIterator::withCollection((OSDictionary *)srcDict);
if ( !iter )
return false;
@@ -422,24 +393,13 @@
OSObject *OSDictionary::getObject(const OSSymbol *aKey) const
{
- unsigned int i;
- bool exists;
-
if (!aKey)
return 0;
- // if the key exists, return the object
-
- if (fOptions & kSort) {
- i = OSSymbol::bsearch(aKey, &dictionary[0], count, sizeof(dictionary[0]));
- exists = (i < count) && (aKey == dictionary[i].key);
- } else for (exists = false, i = 0; i < count; i++) {
- if ((exists = (aKey == dictionary[i].key))) break;
- }
-
- if (exists) {
- return (const_cast<OSObject *> ((const OSObject *)dictionary[i].value));
- }
+ // if the key exists, remove the object
+ for (unsigned int i = 0; i < count; i++)
+ if (aKey == dictionary[i].key)
+ return (OSObject *) dictionary[i].value;
return 0;
}