Changeset 85272 in vbox for trunk/src/VBox/Main/src-server/darwin/iokit.cpp

Timestamp:

Jul 12, 2020 12:39:12 PM (4 years ago)

Author:

vboxsync

Message:

Main/iokit.cpp: Signed/unsigned conversion issues. bugref:9790

File:

• trunk/src/VBox/Main/src-server/darwin/iokit.cpp (modified) (6 diffs)

trunk/src/VBox/Main/src-server/darwin/iokit.cpp

@@ -279 +279 @@
     if (ValRef)
     {
-        if (CFStringGetCString((CFStringRef)ValRef, psz, cch, kCFStringEncodingUTF8))
+        if (CFStringGetCString((CFStringRef)ValRef, psz, (CFIndex)cch, kCFStringEncodingUTF8))
             return true;
     }
@@ -328 +328 @@
         if (cbActual >= 0 && cbBuf == (size_t)cbActual)
         {
-            CFDataGetBytes((CFDataRef)ValRef, CFRangeMake(0, cbBuf), (uint8_t *)pvBuf);
+            CFDataGetBytes((CFDataRef)ValRef, CFRangeMake(0, (CFIndex)cbBuf), (uint8_t *)pvBuf);
             return true;
         }
@@ -1035 +1035 @@
         {
             io_object_t IOUSBDeviceNew = IO_OBJECT_NULL;
-            io_object_t krc = darwinGetUSBHostDeviceFromLegacyDevice(USBDevice, &IOUSBDeviceNew);
+            kern_return_t krc = darwinGetUSBHostDeviceFromLegacyDevice(USBDevice, &IOUSBDeviceNew);
             if (   krc == KERN_SUCCESS
                 && IOUSBDeviceNew != IO_OBJECT_NULL)
@@ -1718 +1718 @@
                         *psz++ = ':';
                         *psz++ = ' ';
-                        size_t cchLeft = sizeof(szTmp) - (psz - &szTmp[0]) - (sizeof(" (Wireless)") - 1);
+                        size_t cchLeft = sizeof(szTmp) - (size_t)(psz - &szTmp[0]) - (sizeof(" (Wireless)") - 1);
                         bool fFound = false;
                         CFIndex i;
@@ -1731 +1731 @@
                                 CFStringRef BSDNameRef = SCNetworkInterfaceGetBSDName(IfRef);
                                 if (     BSDNameRef
-                                    &&   CFStringGetCString(BSDNameRef, psz, cchLeft, kCFStringEncodingUTF8)
+                                    &&   CFStringGetCString(BSDNameRef, psz, (CFIndex)cchLeft, kCFStringEncodingUTF8)
                                     &&  !strcmp(psz, szBSDName))
                                 {
                                     CFStringRef ServiceNameRef = SCNetworkServiceGetName(ServiceRef);
                                     if (    ServiceNameRef
-                                        &&  CFStringGetCString(ServiceNameRef, psz, cchLeft, kCFStringEncodingUTF8))
+                                        &&  CFStringGetCString(ServiceNameRef, psz, (CFIndex)cchLeft, kCFStringEncodingUTF8))
                                     {
                                         fFound = true;
@@ -1751 +1751 @@
                                 CFStringRef BSDNameRef = SCNetworkInterfaceGetBSDName(IfRef);
                                 if (     BSDNameRef
-                                    &&   CFStringGetCString(BSDNameRef, psz, cchLeft, kCFStringEncodingUTF8)
+                                    &&   CFStringGetCString(BSDNameRef, psz, (CFIndex)cchLeft, kCFStringEncodingUTF8)
                                     &&  !strcmp(psz, szBSDName))
                                 {
                                     CFStringRef DisplayNameRef = SCNetworkInterfaceGetLocalizedDisplayName(IfRef);
                                     if (    DisplayNameRef
-                                        &&  CFStringGetCString(DisplayNameRef, psz, cchLeft, kCFStringEncodingUTF8))
+                                        &&  CFStringGetCString(DisplayNameRef, psz, (CFIndex)cchLeft, kCFStringEncodingUTF8))
                                     {
                                         fFound = true;