Changeset 47117 in vbox for trunk/src/VBox/Main/src-server/freebsd

Timestamp:

Jul 12, 2013 12:48:17 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

87211

Message:

Main: RT_ZERO() / RTStrCopy()

Location:

trunk/src/VBox/Main/src-server/freebsd

Files:

• HostHardwareFreeBSD.cpp (modified) (2 diffs)
• NetIf-freebsd.cpp (modified) (2 diffs)
• USBProxyServiceFreeBSD.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-server/freebsd/HostHardwareFreeBSD.cpp

@@ -173 +173 @@
         struct dev_match_result *paMatches = NULL;
 
-        memset(&DeviceCCB, 0, sizeof(union ccb));
-        memset(&DeviceMatchPattern, 0, sizeof(struct device_match_pattern));
+        RT_ZERO(DeviceCCB);
+        RT_ZERO(DeviceMatchPattern);
 
         /* We want to get all devices. */
@@ -237 +237 @@
                         unsigned iPeriphMatch = 0;
 
-                        memset(&PeriphCCB, 0, sizeof(union ccb));
-                        memset(&PeriphMatchPattern, 0, sizeof(struct dev_match_pattern));
-                        memset(aPeriphMatches, 0, sizeof(aPeriphMatches));
+                        RT_ZERO(PeriphCCB);
+                        RT_ZERO(PeriphMatchPattern);
+                        RT_ZERO(aPeriphMatches);
 
                         /* This time we only want the specific nodes for the device. */

trunk/src/VBox/Main/src-server/freebsd/NetIf-freebsd.cpp

@@ -272 +272 @@
         {
             struct ifreq IfReq;
-            strcpy(IfReq.ifr_name, pNew->szShortName);
+            RTStrCopy(IfReq.ifr_name, sizeof(IfReq.ifr_name), pNew->szShortName);
             if (ioctl(sock, SIOCGIFFLAGS, &IfReq) < 0)
             {
@@ -389 +389 @@
 
             struct ifreq IfReq;
-            strcpy(IfReq.ifr_name, pInfo->szShortName);
+            RTSTrCopy(IfReq.ifr_name, sizeof(IfReq.ifr_name), pInfo->szShortName);
             if (ioctl(sock, SIOCGIFFLAGS, &IfReq) < 0)
             {

trunk/src/VBox/Main/src-server/freebsd/USBProxyServiceFreeBSD.cpp

@@ -267 +267 @@
 
         struct usb_device_info UsbDevInfo;
-        memset(&UsbDevInfo, 0, sizeof(struct usb_device_info));
+        RT_ZERO(UsbDevInfo);
 
         rc = ioctl(FileUsb, USB_GET_DEVICEINFO, &UsbDevInfo);