Changeset 54962 in vbox

Timestamp:

Mar 26, 2015 9:16:03 AM (10 years ago)

Author:

vboxsync

Message:

On FreeBSD hosts use the correct semantics of the last parameter of sysctlbyname(). Thank you Jung-uk Kim.

Location:

trunk/src/VBox

Files:

• Devices/PC/DrvACPI.cpp (modified) (3 diffs)
• Runtime/r3/freebsd/fileaio-freebsd.cpp (modified) (1 diff)
• Runtime/r3/freebsd/mp-freebsd.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/PC/DrvACPI.cpp

@@ -205 +205 @@
     size_t cbParameter = sizeof(fAcLine);
 
-    int rc = sysctlbyname("hw.acpi.acline", &fAcLine, &cbParameter, NULL, NULL);
+    int rc = sysctlbyname("hw.acpi.acline", &fAcLine, &cbParameter, NULL, 0);
 
     if (!rc)
@@ -464 +464 @@
         size_t cbParameter = sizeof(fBatteryState);
 
-        rc = sysctlbyname("hw.acpi.battery.state", &fBatteryState, &cbParameter, NULL, NULL);
+        rc = sysctlbyname("hw.acpi.battery.state", &fBatteryState, &cbParameter, NULL, 0);
         if (!rc)
         {
@@ -486 +486 @@
                 int curCapacity = 0;
                 cbParameter = sizeof(curCapacity);
-                rc = sysctlbyname("hw.acpi.battery.life", &curCapacity, &cbParameter, NULL, NULL);
+                rc = sysctlbyname("hw.acpi.battery.life", &curCapacity, &cbParameter, NULL, 0);
                 if (!rc && curCapacity >= 0)
                     *penmRemainingCapacity = (PDMACPIBATCAPACITY)curCapacity;

trunk/src/VBox/Runtime/r3/freebsd/fileaio-freebsd.cpp

@@ -125 +125 @@
                          &cbParameter,               /* Size of the memory pointed to. */
                          NULL,                       /* Where the new value is located. */
-                         NULL);                      /* Where the size of the new value is stored. */
+                         0);                         /* Where the size of the new value is stored. */
     if (rcBSD == -1)
     {

trunk/src/VBox/Runtime/r3/freebsd/mp-freebsd.cpp

@@ -94 +94 @@
     size_t  cbDriver = sizeof(szDriver);
     RT_ZERO(szDriver);                  /* this shouldn't be necessary. */
-    int rcBsd = sysctlbyname(szName, szDriver, &cbDriver, NULL, NULL);
+    int rcBsd = sysctlbyname(szName, szDriver, &cbDriver, NULL, 0);
     if (rcBsd == 0)
         return true;
@@ -155 +155 @@
 
     /* CPU's have a common frequency. */
-    int rc = sysctlbyname("dev.cpu.0.freq", &uFreqCurr, &cbParameter, NULL, NULL);
+    int rc = sysctlbyname("dev.cpu.0.freq", &uFreqCurr, &cbParameter, NULL, 0);
     if (rc)
         return 0;
@@ -177 +177 @@
      * levels but only the first one.
      */
-    int rc = sysctlbyname("dev.cpu.0.freq_levels", szFreqLevels, &cbFreqLevels, NULL, NULL);
+    int rc = sysctlbyname("dev.cpu.0.freq_levels", szFreqLevels, &cbFreqLevels, NULL, 0);
     if (   (rc && (errno != ENOMEM))
         || (cbFreqLevels == 0))