--- xnu/xnu-12377.101.15/libkern/c++/OSBoolean.cpp
+++ xnu/xnu-201.42.3/libkern/c++/OSBoolean.cpp
@@ -1,29 +1,23 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_OSREFERENCE_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.
- *
- * 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
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * 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.
+ * 
+ * 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.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
  */
 /* OSBoolean.cpp created by rsulack on Tue Oct 12 1999 */
 
@@ -34,7 +28,7 @@
 
 #define super OSObject
 
-OSDefineMetaClassAndStructorsWithInit(OSBoolean, OSObject, OSBoolean::initialize())
+OSDefineMetaClassAndStructors(OSBoolean, OSObject)
 OSMetaClassDefineReservedUnused(OSBoolean, 0);
 OSMetaClassDefineReservedUnused(OSBoolean, 1);
 OSMetaClassDefineReservedUnused(OSBoolean, 2);
@@ -44,102 +38,74 @@
 OSMetaClassDefineReservedUnused(OSBoolean, 6);
 OSMetaClassDefineReservedUnused(OSBoolean, 7);
 
-static OSBoolean * gOSBooleanTrue  = NULL;
-static OSBoolean * gOSBooleanFalse = NULL;
+static OSBoolean * gOSBooleanTrue  = 0;
+static OSBoolean * gOSBooleanFalse = 0;
 
 OSBoolean * const & kOSBooleanTrue  = gOSBooleanTrue;
 OSBoolean * const & kOSBooleanFalse = gOSBooleanFalse;
 
-void
-OSBoolean::initialize()
+void OSBoolean::initialize()
 {
-	gOSBooleanTrue = new OSBoolean;
-	assert(gOSBooleanTrue);
+    gOSBooleanTrue = new OSBoolean;
+    assert(gOSBooleanTrue);
 
-	if (!gOSBooleanTrue->init()) {
-		gOSBooleanTrue->OSObject::free();
-		assert(false);
-	}
-	;
-	gOSBooleanTrue->value = true;
+    if (!gOSBooleanTrue->init()) {
+        gOSBooleanTrue->OSObject::free();
+        assert(false);
+    };
+    gOSBooleanTrue->value = true;
 
-	gOSBooleanFalse = new OSBoolean;
-	assert(gOSBooleanFalse);
+    gOSBooleanFalse = new OSBoolean;
+    assert(gOSBooleanFalse);
 
-	if (!gOSBooleanFalse->init()) {
-		gOSBooleanFalse->OSObject::free();
-		assert(false);
-	}
-	;
-	gOSBooleanFalse->value = false;
+    if (!gOSBooleanFalse->init()) {
+        gOSBooleanFalse->OSObject::free();
+        assert(false);
+    };
+    gOSBooleanFalse->value = false;
 }
 
-void
-OSBoolean::free()
+void OSBoolean::free()
 {
-	/*
-	 * An OSBoolean should never have free() called on it, since it is a shared
-	 * object, with two non-mutable instances: kOSBooleanTrue, kOSBooleanFalse.
-	 * There will be cases where an incorrect number of releases will cause the
-	 * free() method to be called, however, which we must catch and ignore here.
-	 */
-	assert(false);
+    /*
+     * An OSBoolean should never have free() called on it, since it is a shared
+     * object, with two non-mutable instances: kOSBooleanTrue, kOSBooleanFalse.
+     * There will be cases where an incorrect number of releases will cause the
+     * free() method to be called, however, which we must catch and ignore here.
+     */
+    assert(false);
 }
 
-void
-OSBoolean::taggedRetain(__unused const void *tag) const
+OSBoolean *OSBoolean::withBoolean(bool inValue)
 {
-}
-void
-OSBoolean::taggedRelease(__unused const void *tag, __unused const int when) const
-{
+    if (inValue) {
+        kOSBooleanTrue->retain();
+        return kOSBooleanTrue;
+    } else {
+        kOSBooleanFalse->retain();
+        return kOSBooleanFalse;
+    }
 }
 
-OSBoolean *
-OSBoolean::withBoolean(bool inValue)
+bool OSBoolean::isTrue() const { return value; }
+bool OSBoolean::isFalse() const { return !value; }
+bool OSBoolean::getValue() const { return value; }
+
+bool OSBoolean::isEqualTo(const OSBoolean *boolean) const
 {
-	return (inValue) ? kOSBooleanTrue : kOSBooleanFalse;
+    return (boolean == this);
 }
 
-bool
-OSBoolean::isTrue() const
+bool OSBoolean::isEqualTo(const OSMetaClassBase *obj) const
 {
-	return value;
-}
-bool
-OSBoolean::isFalse() const
-{
-	return !value;
-}
-bool
-OSBoolean::getValue() const
-{
-	return value;
+    OSBoolean *	boolean;
+    if ((boolean = OSDynamicCast(OSBoolean, obj)))
+	return isEqualTo(boolean);
+    else
+	return false;
 }
 
-bool
-OSBoolean::isEqualTo(const OSBoolean *boolean) const
+bool OSBoolean::serialize(OSSerialize *s) const
 {
-	return boolean == this;
+    return s->addString(value ? "<true/>" : "<false/>");
 }
-
-bool
-OSBoolean::isEqualTo(const OSMetaClassBase *obj) const
-{
-	OSBoolean * boolean;
-	if ((boolean = OSDynamicCast(OSBoolean, obj))) {
-		return isEqualTo(boolean);
-	} else {
-		return false;
-	}
-}
-
-bool
-OSBoolean::serialize(OSSerialize *s) const
-{
-	if (s->binary) {
-		return s->binarySerialize(this);
-	}
-
-	return s->addString(value ? "<true/>" : "<false/>");
-}