--- xnu/xnu-3789.21.4/libkern/c++/OSSet.cpp
+++ xnu/xnu-1228/libkern/c++/OSSet.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2014 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -76,8 +76,7 @@
         return false;
 
     for ( unsigned int i = 0; i < inCount; i++ ) {
-// xx-review: no test here for failure of setObject()
-        if (members->getCount() < capacity)
+        if (members->getCount() < inCapacity)
             setObject(inObjects[i]);
         else
             return false;
@@ -156,10 +155,9 @@
 
 void OSSet::free()
 {
-    if (members) {
-        (void) members->super::setOptions(0, kImmutable);
+    (void) members->super::setOptions(0, kImmutable);
+    if (members)
         members->release();
-    }
 
     super::free();
 }
@@ -197,36 +195,27 @@
 
 bool OSSet::setObject(const OSMetaClassBase *anObject)
 {
-    if (containsObject(anObject)) {
-        return false;
-    } else {
+    if (containsObject(anObject))
+        return false;
+    else {
         haveUpdated();
         return members->setObject(anObject);
     }
 }
 
-bool OSSet::merge(const OSArray * array)
-{
-    const OSMetaClassBase * anObject = 0;
-    bool                    result   = true;
-
-    for (int i = 0; (anObject = array->getObject(i)); i++) {
-
-       /* setObject() returns false if the object is already in the set,
-        * so we have to check beforehand here with containsObject().
-        */
-        if (containsObject(anObject)) {
-            continue;
-        }
-        if (!setObject(anObject)) {
-            result = false;
-        }
-    }
-
-    return result;
-}
-
-bool OSSet::merge(const OSSet * set)
+bool OSSet::merge(const OSArray *array)
+{
+    const OSMetaClassBase *anObject;
+    bool retVal = false;
+
+    for (int i = 0; (anObject = array->getObject(i)); i++)
+        if (setObject(anObject))
+            retVal = true;
+
+    return retVal;
+}
+
+bool OSSet::merge(const OSSet *set)
 {
     return merge(set->members);
 }
@@ -281,8 +270,6 @@
 
     for ( i = 0; i < count; i++ ) {
         obj1 = aSet->members->getObject(i);
-	if (containsObject(obj1))
-		continue;
         obj2 = members->getObject(i);
         if ( !obj1 || !obj2 )
                 return false;