X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/c0fea4742e91338fffdcf79f86a7c1d5e2b97eb1..8ad349bb6ed4a0be06e34c92be0d98b92e078db4:/iokit/Kernel/IOPMPowerSourceList.cpp?ds=sidebyside

diff --git a/iokit/Kernel/IOPMPowerSourceList.cpp b/iokit/Kernel/IOPMPowerSourceList.cpp
index cace37fa4..5e1fd433f 100644
--- a/iokit/Kernel/IOPMPowerSourceList.cpp
+++ b/iokit/Kernel/IOPMPowerSourceList.cpp
@@ -1,23 +1,31 @@
 /*
  * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_OSREFERENCE_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 OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
+ * 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_LICENSE_OSREFERENCE_HEADER_END@
  */
 #include <IOKit/pwr_mgt/IOPM.h>
 #include <IOKit/pwr_mgt/IOPMPowerSourceList.h>
@@ -26,61 +34,54 @@
 #define super OSObject
 OSDefineMetaClassAndStructors(IOPMPowerSourceList,OSObject)
 
-//******************************************************************************
+//*********************************************************************************
 // init
 //
-//******************************************************************************
+//*********************************************************************************
 void IOPMPowerSourceList::initialize ( void )
 {
     firstItem = NULL;
     length = 0;
 }
 
-//******************************************************************************
+//*********************************************************************************
 // addToList
 //
-//******************************************************************************
+//*********************************************************************************
 
-IOReturn IOPMPowerSourceList::addToList(IOPMPowerSource *newPowerSource)
+IOReturn IOPMPowerSourceList::addToList ( IOPMPowerSource * newPowerSource )
 {
     IOPMPowerSource * nextPowerSource;
-
-    // Is new object already in the list?
-    nextPowerSource = firstItem;
-    while (  nextPowerSource != NULL ) 
-    {
-        if ( nextPowerSource == newPowerSource ) 
-        {
-            // yes, just return
-            return IOPMNoErr;				
+    nextPowerSource = firstItem;				// Is new object already in the list?
+    while (  nextPowerSource != NULL ) {
+        if ( nextPowerSource == newPowerSource ) {
+            return IOPMNoErr;				// yes, just return
         }
         nextPowerSource = nextInList(nextPowerSource);
     }
-
-    // add it to list
-    newPowerSource->nextInList = firstItem;
+    newPowerSource->nextInList = firstItem;		// add it to list
     firstItem = newPowerSource;
-    length++;
+    length += 1;
     return IOPMNoErr;
 }
 
 
-//******************************************************************************
+//*********************************************************************************
 // firstInList
 //
-//******************************************************************************
+//*********************************************************************************
 
 IOPMPowerSource * IOPMPowerSourceList::firstInList ( void )
 {
     return firstItem;
 }
 
-//******************************************************************************
+//*********************************************************************************
 // nextInList
 //
-//******************************************************************************
+//*********************************************************************************
 
-IOPMPowerSource * IOPMPowerSourceList::nextInList(IOPMPowerSource *currentItem)
+IOPMPowerSource * IOPMPowerSourceList::nextInList ( IOPMPowerSource * currentItem )
 {
     if ( currentItem != NULL ) {
        return (currentItem->nextInList);
@@ -88,56 +89,54 @@ IOPMPowerSource * IOPMPowerSourceList::nextInList(IOPMPowerSource *currentItem)
     return NULL;
 }
 
-//******************************************************************************
+//*********************************************************************************
 // numberOfItems
 //
-//******************************************************************************
+//*********************************************************************************
 
 unsigned long IOPMPowerSourceList::numberOfItems ( void )
 {
     return length;
 }
 
-//******************************************************************************
+//*********************************************************************************
 // removeFromList
 //
 // Find the item in the list, unlink it, and free it.
-//******************************************************************************
+//*********************************************************************************
 
 IOReturn IOPMPowerSourceList::removeFromList ( IOPMPowerSource * theItem )
 {
     IOPMPowerSource * item = firstItem;
     IOPMPowerSource * temp;
 
-    if ( NULL == item) goto exit;
-    
-    if ( item  == theItem ) {
-        firstItem = item->nextInList;
-        length--;
-        item->release();
-        return IOPMNoErr;
-    }
-    while ( item->nextInList != NULL ) {
-        if ( item->nextInList == theItem ) {
-            temp = item->nextInList;
-            item->nextInList = temp->nextInList;
+    if ( item != NULL ) {
+        if ( item  == theItem ) {
+            firstItem = item->nextInList;
             length--;
-            temp->release();
+            item->release();
             return IOPMNoErr;
         }
-        item = item->nextInList;
+        while ( item->nextInList != NULL ) {
+            if ( item->nextInList == theItem ) {
+                temp = item->nextInList;
+                item->nextInList = temp->nextInList;
+                length--;
+                temp->release();
+                return IOPMNoErr;
+            }
+            item = item->nextInList;
+        }
     }
-
-exit:
     return IOPMNoErr;
 }
 
 
-//******************************************************************************
+//*********************************************************************************
 // free
 //
 // Free all items in the list, and then free the list itself
-//******************************************************************************
+//*********************************************************************************
 
 void IOPMPowerSourceList::free (void )
 {
@@ -149,7 +148,7 @@ void IOPMPowerSourceList::free (void )
         next->release();
         next = firstItem;        
     }
-    super::free();
+super::free();
 }