--- xnu/xnu-2422.100.13/libkern/c++/OSDictionary.cpp
+++ xnu/xnu-1228/libkern/c++/OSDictionary.cpp
@@ -68,8 +68,6 @@
 
     int size = inCapacity * sizeof(dictEntry);
 
-//fOptions |= kSort;
-
     dictionary = (dictEntry *) kalloc(size);
     if (!dictionary)
         return false;
@@ -89,7 +87,7 @@
                                    unsigned int theCount,
                                    unsigned int theCapacity)
 {
-    unsigned int newCapacity = theCount;
+    unsigned int capacity = theCount;
 
     if (!objects || !keys)
         return false;
@@ -98,10 +96,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 +117,7 @@
                                    unsigned int theCount,
                                    unsigned int theCapacity)
 {
-    unsigned int newCapacity = theCount;
+    unsigned int capacity = theCount;
 
     if (!objects || !keys)
         return false;
@@ -128,10 +126,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 +153,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 +306,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 +341,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 +371,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 +391,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;
 }