xnu-344.23.tar.gz

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

diff --git a/iokit/Kernel/IONVRAM.cpp b/iokit/Kernel/IONVRAM.cpp
index fb6ceb5cd5f4f40c101a1ccdd0858bdbd66fe2dc..738a03cfabd3c321a9a87bbad62e8bff3057a526 100644 (file)
--- a/iokit/Kernel/IONVRAM.cpp
+++ b/iokit/Kernel/IONVRAM.cpp
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 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 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. 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
+ * 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.
+ * 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@
  */
@@ -1424,23 +1421,18 @@ IOReturn IODTNVRAM::readNVRAMPropertyType1(IORegistryEntry *entry,
       nvPath = start;
     else if (nvName == 0)
       nvName = start;
-    else {
-      IORegistryEntry * compareEntry = IORegistryEntry::fromPath((const char *) nvPath, gIODTPlane);
-      if (entry == compareEntry) {
-        if (compareEntry)
-          compareEntry->release();
-       *name = OSSymbol::withCString((const char *) nvName);
-       *value = unescapeBytesToData(start, where - start - 1);
-       if ((*name != 0) && (*value != 0))
-         err = kIOReturnSuccess;
-       else
-         err = kIOReturnNoMemory;
-       break;
-      }
-      if (compareEntry)
-        compareEntry->release();
+    else if (entry ==
+            IORegistryEntry::fromPath((const char *) nvPath, gIODTPlane)) {
+      *name = OSSymbol::withCString((const char *) nvName);
+      *value = unescapeBytesToData(start, where - start - 1);
+      if ((*name != 0) && (*value != 0))
+        err = kIOReturnSuccess;
+      else
+        err = kIOReturnNoMemory;
+      break;
+    } else
       nvPath = nvName = 0;
-    }
+    
     start = where;
   }
 
@@ -1483,21 +1475,15 @@ IOReturn IODTNVRAM::writeNVRAMPropertyType1(IORegistryEntry *entry,
         nvPath = start;
       else if (nvName == 0)
         nvName = start;
-      else {
-        IORegistryEntry * compareEntry = IORegistryEntry::fromPath((const char *) nvPath, gIODTPlane);
-        if (entry == compareEntry) {
-          if (compareEntry)
-             compareEntry->release();
-           // delete old property (nvPath -> where)
-           data = OSData::withBytes(propStart, nvPath - propStart);
-           if (data)
-             ok &= data->appendBytes(where, end - where);
-          break;
-        }
-        if (compareEntry)
-          compareEntry->release();
+      else if (entry ==
+                IORegistryEntry::fromPath((const char *) nvPath, gIODTPlane)) {
+        // delete old property (nvPath -> where)
+        data = OSData::withBytes(propStart, nvPath - propStart);
+        if (data)
+          ok &= data->appendBytes(where, end - where);
+        break;
+      } else
         nvPath = nvName = 0;
-      }
         
       start = where;
     }