xnu-792.tar.gz

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

diff --git a/iokit/Kernel/IOCommandGate.cpp b/iokit/Kernel/IOCommandGate.cpp
index 73a7cc98e5f2aa651e2f05a7e234228291a15316..dadd047536948761df81d0097ecc73373520872d 100644 (file)
--- a/iokit/Kernel/IOCommandGate.cpp
+++ b/iokit/Kernel/IOCommandGate.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@
  */
@@ -41,26 +38,26 @@ OSMetaClassDefineReservedUnused(IOCommandGate, 7);
 
 bool IOCommandGate::checkForWork() { return false; }
 
-bool IOCommandGate::init(OSObject *inOwner, Action inAction = 0)
+bool IOCommandGate::init(OSObject *inOwner, Action inAction)
 {
     return super::init(inOwner, (IOEventSource::Action) inAction);
 }
 
 IOCommandGate *
-IOCommandGate::commandGate(OSObject *inOwner, Action inAction = 0)
+IOCommandGate::commandGate(OSObject *inOwner, Action inAction)
 {
     IOCommandGate *me = new IOCommandGate;
 
     if (me && !me->init(inOwner, inAction)) {
-        me->free();
+        me->release();
         return 0;
     }
 
     return me;
 }
 
-IOReturn IOCommandGate::runCommand(void *arg0 = 0, void *arg1 = 0,
-                                   void *arg2 = 0, void *arg3 = 0)
+IOReturn IOCommandGate::runCommand(void *arg0, void *arg1,
+                                   void *arg2, void *arg3)
 {
     IOReturn res;
 
@@ -82,8 +79,8 @@ IOReturn IOCommandGate::runCommand(void *arg0 = 0, void *arg1 = 0,
 }
 
 IOReturn IOCommandGate::runAction(Action inAction,
-                                  void *arg0 = 0, void *arg1 = 0,
-                                  void *arg2 = 0, void *arg3 = 0)
+                                  void *arg0, void *arg1,
+                                  void *arg2, void *arg3)
 {
     IOReturn res;
 
@@ -104,8 +101,8 @@ IOReturn IOCommandGate::runAction(Action inAction,
     return res;
 }
 
-IOReturn IOCommandGate::attemptCommand(void *arg0 = 0, void *arg1 = 0,
-                                       void *arg2 = 0, void *arg3 = 0)
+IOReturn IOCommandGate::attemptCommand(void *arg0, void *arg1,
+                                       void *arg2, void *arg3)
 {
     IOReturn res;
 
@@ -130,8 +127,8 @@ IOReturn IOCommandGate::attemptCommand(void *arg0 = 0, void *arg1 = 0,
 }
 
 IOReturn IOCommandGate::attemptAction(Action inAction,
-                                      void *arg0 = 0, void *arg1 = 0,
-                                      void *arg2 = 0, void *arg3 = 0)
+                                      void *arg0, void *arg1,
+                                      void *arg2, void *arg3)
 {
     IOReturn res;
 
@@ -156,8 +153,6 @@ IOReturn IOCommandGate::attemptAction(Action inAction,
 
 IOReturn IOCommandGate::commandSleep(void *event, UInt32 interruptible)
 {
-    IOReturn ret;
-
     if (!workLoop->inGate())
         return kIOReturnNotPermitted;