xnu-2782.20.48.tar.gz

[apple/xnu.git] / iokit / Kernel / IOPMPowerSourceList.cpp

diff --git a/iokit/Kernel/IOPMPowerSourceList.cpp b/iokit/Kernel/IOPMPowerSourceList.cpp
index f8ad3dc5d9cb4f45ba7d7dd34ec6ca01795fb29a..a933ebf767eea42c866e5c98967e8f28088dd663 100644 (file)
--- a/iokit/Kernel/IOPMPowerSourceList.cpp
+++ b/iokit/Kernel/IOPMPowerSourceList.cpp
@@ -32,54 +32,61 @@
 #define super OSObject
 OSDefineMetaClassAndStructors(IOPMPowerSourceList,OSObject)
 
 #define super OSObject
 OSDefineMetaClassAndStructors(IOPMPowerSourceList,OSObject)
 

-//*********************************************************************************
+//******************************************************************************

 // init
 //
 // init
 //

-//*********************************************************************************
+//******************************************************************************

 void IOPMPowerSourceList::initialize ( void )
 {
     firstItem = NULL;
     length = 0;
 }
 
 void IOPMPowerSourceList::initialize ( void )
 {
     firstItem = NULL;
     length = 0;
 }
 

-//*********************************************************************************
+//******************************************************************************

 // addToList
 //
 // addToList
 //

-//*********************************************************************************
+//******************************************************************************

 
 

-IOReturn IOPMPowerSourceList::addToList ( IOPMPowerSource * newPowerSource )
+IOReturn IOPMPowerSourceList::addToList(IOPMPowerSource *newPowerSource)

 {
     IOPMPowerSource * nextPowerSource;
 {
     IOPMPowerSource * nextPowerSource;

-    nextPowerSource = firstItem;                               // Is new object already in the list?
-    while (  nextPowerSource != NULL ) {
-        if ( nextPowerSource == newPowerSource ) {
-            return IOPMNoErr;                          // yes, just return
+
+    // Is new object already in the list?
+    nextPowerSource = firstItem;
+    while (  nextPowerSource != NULL ) 
+    {
+        if ( nextPowerSource == newPowerSource ) 
+        {
+            // yes, just return
+            return IOPMNoErr;                          

         }
         nextPowerSource = nextInList(nextPowerSource);
     }
         }
         nextPowerSource = nextInList(nextPowerSource);
     }

-    newPowerSource->nextInList = firstItem;            // add it to list
+
+    // add it to list
+    newPowerSource->nextInList = firstItem;

     firstItem = newPowerSource;
     firstItem = newPowerSource;

-    length += 1;
+    length++;

     return IOPMNoErr;
 }
 
 
     return IOPMNoErr;
 }
 
 

-//*********************************************************************************
+//******************************************************************************

 // firstInList
 //
 // firstInList
 //

-//*********************************************************************************
+//******************************************************************************

 
 IOPMPowerSource * IOPMPowerSourceList::firstInList ( void )
 {
     return firstItem;
 }
 
 
 IOPMPowerSource * IOPMPowerSourceList::firstInList ( void )
 {
     return firstItem;
 }
 

-//*********************************************************************************
+//******************************************************************************

 // nextInList
 //
 // nextInList
 //

-//*********************************************************************************
+//******************************************************************************

 
 

-IOPMPowerSource * IOPMPowerSourceList::nextInList ( IOPMPowerSource * currentItem )
+IOPMPowerSource * IOPMPowerSourceList::nextInList(IOPMPowerSource *currentItem)

 {
     if ( currentItem != NULL ) {
        return (currentItem->nextInList);
 {
     if ( currentItem != NULL ) {
        return (currentItem->nextInList);


@@ -87,54 +94,56 @@ IOPMPowerSource * IOPMPowerSourceList::nextInList ( IOPMPowerSource * currentIte
     return NULL;
 }
 
     return NULL;
 }
 

-//*********************************************************************************
+//******************************************************************************

 // numberOfItems
 //
 // numberOfItems
 //

-//*********************************************************************************
+//******************************************************************************

 
 unsigned long IOPMPowerSourceList::numberOfItems ( void )
 {
     return length;
 }
 
 
 unsigned long IOPMPowerSourceList::numberOfItems ( void )
 {
     return length;
 }
 

-//*********************************************************************************
+//******************************************************************************

 // removeFromList
 //
 // Find the item in the list, unlink it, and free it.
 // removeFromList
 //
 // Find the item in the list, unlink it, and free it.

-//*********************************************************************************
+//******************************************************************************

 
 IOReturn IOPMPowerSourceList::removeFromList ( IOPMPowerSource * theItem )
 {
     IOPMPowerSource * item = firstItem;
     IOPMPowerSource * temp;
 
 
 IOReturn IOPMPowerSourceList::removeFromList ( IOPMPowerSource * theItem )
 {
     IOPMPowerSource * item = firstItem;
     IOPMPowerSource * temp;
 

-    if ( item != NULL ) {
-        if ( item  == theItem ) {
-            firstItem = item->nextInList;
+    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;

             length--;
             length--;

-            item->release();
+            temp->release();

             return IOPMNoErr;
         }
             return IOPMNoErr;
         }

-        while ( item->nextInList != NULL ) {
-            if ( item->nextInList == theItem ) {
-                temp = item->nextInList;
-                item->nextInList = temp->nextInList;
-                length--;
-                temp->release();
-                return IOPMNoErr;
-            }
-            item = item->nextInList;
-        }
+        item = item->nextInList;

     }
     }

+
+exit:

     return IOPMNoErr;
 }
 
 
     return IOPMNoErr;
 }
 
 

-//*********************************************************************************
+//******************************************************************************

 // free
 //
 // Free all items in the list, and then free the list itself
 // free
 //
 // Free all items in the list, and then free the list itself

-//*********************************************************************************
+//******************************************************************************

 
 void IOPMPowerSourceList::free (void )
 {
 
 void IOPMPowerSourceList::free (void )
 {


@@ -146,7 +155,7 @@ void IOPMPowerSourceList::free (void )
         next->release();
         next = firstItem;        
     }
         next->release();
         next = firstItem;        
     }

-super::free();
+    super::free();

 }
 
 
 }