Changeset 29248 in vbox

Timestamp:

May 9, 2010 5:18:13 PM (15 years ago)

Author:

vboxsync

Message:

ConsoleImpl2.cpp: some cleanup, hope it compiles.

File:

• trunk/src/VBox/Main/ConsoleImpl2.cpp (modified) (6 diffs)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -105 +105 @@
 # include "IOKit/IOKitLib.h"
 
-int DarwinSmcKey(char* aKey, uint32_t iKeySize)
+static int DarwinSmcKey(char *aKey, uint32_t iKeySize)
 {
     /*
@@ -122 +122 @@
     } AppleSMCBuffer;
 
-
-    if (iKeySize < 65)
-        return VERR_INTERNAL_ERROR;
+    AssertReturn(iKeySize >= 65, VERR_INTERNAL_ERROR;
 
     io_service_t service = IOServiceGetMatchingService(kIOMasterPortDefault,
@@ -131 +129 @@
         return VERR_INTERNAL_ERROR;
 
-    io_connect_t port = (io_connect_t)0;
-    kern_return_t kr = IOServiceOpen(service, mach_task_self(), 0, &port);
+    io_connect_t    port = (io_connect_t)0;
+    kern_return_t   kr   = IOServiceOpen(service, mach_task_self(), 0, &port);
     IOObjectRelease(service);
 
@@ -138 +136 @@
         return VERR_INTERNAL_ERROR;
 
-    AppleSMCBuffer inputStruct = { 0, {0}, 32, {0}, 5, }, outputStruct;
-    size_t outputStructCnt = sizeof(outputStruct);
+    AppleSMCBuffer  inputStruct    = { 0, {0}, 32, {0}, 5, };
+    AppleSMCBuffer  outputStruct;
+    size_t          cbOutputStruct = sizeof(outputStruct);
 
     for (int i = 0; i < 2; i++)
@@ -146 +145 @@
         kr = IOConnectCallStructMethod((mach_port_t)port,
                                        (uint32_t)2,
-                                       (const void*)&inputStruct,
+                                       (const void *)&inputStruct,
                                        sizeof(inputStruct),
-                                       (void*)&outputStruct,
-                                       &outputStructCnt);
+                                       (void *)&outputStruct,
+                                       &cbOutputStruct);
         if (kr != kIOReturnSuccess)
         {
@@ -156 +155 @@
         }
 
-        for (int j=0; j<32; j++)
+        for (int j = 0; j < 32; j++)
             aKey[j + i*32] = outputStruct.data[j];
     }