Changeset 47117 in vbox for trunk/src/VBox/Main

Timestamp:

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

Author:

vboxsync

Message:

Main: RT_ZERO() / RTStrCopy()

Location:

trunk/src/VBox/Main

Files:

• glue/initterm.cpp (modified) (3 diffs)
• include/netif.h (modified) (1 diff)
• src-client/ConsoleImpl.cpp (modified) (3 diffs)
• src-client/ConsoleImpl2.cpp (modified) (4 diffs)
• src-client/ConsoleVRDPServer.cpp (modified) (5 diffs)
• src-client/DisplayImpl.cpp (modified) (4 diffs)
• src-client/HGCM.cpp (modified) (3 diffs)
• src-client/HGCMThread.cpp (modified) (2 diffs)
• src-client/RemoteUSBBackend.cpp (modified) (1 diff)
• src-server/HostImpl.cpp (modified) (1 diff)
• src-server/darwin/NetIf-darwin.cpp (modified) (3 diffs)
• src-server/darwin/iokit.cpp (modified) (1 diff)
• src-server/freebsd/HostHardwareFreeBSD.cpp (modified) (2 diffs)
• src-server/freebsd/NetIf-freebsd.cpp (modified) (2 diffs)
• src-server/freebsd/USBProxyServiceFreeBSD.cpp (modified) (1 diff)
• src-server/generic/AutostartDb-generic.cpp (modified) (1 diff)
• src-server/generic/NetIf-generic.cpp (modified) (1 diff)
• src-server/linux/NetIf-linux.cpp (modified) (3 diffs)
• src-server/linux/USBGetDevices.cpp (modified) (1 diff)
• src-server/linux/USBProxyServiceLinux.cpp (modified) (1 diff)
• src-server/solaris/NetIf-solaris.cpp (modified) (2 diffs)
• src-server/win/NetIf-win.cpp (modified) (1 diff)
• src-server/xpcom/server_module.cpp (modified) (2 diffs)

trunk/src/VBox/Main/glue/initterm.cpp

@@ -346 +346 @@
         return NS_ERROR_FILE_ACCESS_DENIED;
     AssertRCReturn(vrc, NS_ERROR_FAILURE);
-    strcpy(szXptiDat, szCompReg);
-
+    vrc = RTStrCopy(szXptiDat, sizeof(szXptiDat), szCompReg);
+    AssertRCReturn(vrc, NS_ERROR_FAILURE);
     vrc = RTPathAppend(szCompReg, sizeof(szCompReg), "compreg.dat");
     AssertRCReturn(vrc, NS_ERROR_FAILURE);
@@ -397 +397 @@
         {
             /* Iterate over all other paths */
-            szAppHomeDir[RTPATH_MAX - 1] = '\0';
-            strncpy(szAppHomeDir, kAppPathsToProbe[i], RTPATH_MAX - 1);
+            RTStrCopy(szAppHomeDir, sizeof(szAppHomeDir), kAppPathsToProbe[i]);
             vrc = VINF_SUCCESS;
         }
@@ -406 +405 @@
             continue;
         }
-
         char szCompDir[RTPATH_MAX];
-        vrc = RTPathAppend(strcpy(szCompDir, szAppHomeDir), sizeof(szCompDir), "components");
+        vrc = RTStrCopy(szCompDir, sizeof(szCompDir), szAppHomeDir);
+        if (RT_FAILURE(vrc))
+        {
+            rc = NS_ERROR_FAILURE;
+            continue;
+        }
+        vrc = RTPathAppend(szCompDir, sizeof(szCompDir), "components");
         if (RT_FAILURE(vrc))
         {

trunk/src/VBox/Main/include/netif.h

@@ -129 +129 @@
         return VERR_INVALID_PARAMETER;
 
-    memset(aAddrPtr, 0, sizeof(RTNETADDRIPV6));
+    RT_ZERO(*aAddrPtr);
 
     ASMBitSetRange(aAddrPtr, 0, cPrefix);

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -405 +405 @@
     LogFlowThisFunc(("\n"));
 
-    memset(mapStorageLeds, 0, sizeof(mapStorageLeds));
-    memset(mapNetworkLeds, 0, sizeof(mapNetworkLeds));
-    memset(&mapUSBLed, 0, sizeof(mapUSBLed));
-    memset(&mapSharedFolderLed, 0, sizeof(mapSharedFolderLed));
+    RT_ZERO(mapStorageLeds);
+    RT_ZERO(mapNetworkLeds);
+    RT_ZERO(mapUSBLed);
+    RT_ZERO(mapSharedFolderLed);
 
     for (unsigned i = 0; i < RT_ELEMENTS(maStorageDevType); ++i)
@@ -8297 +8297 @@
          */
         struct ifreq IfReq;
-        memset(&IfReq, 0, sizeof(IfReq));
+        RT_ZERO(IfReq);
         /* The name of the TAP interface we are using */
         Bstr tapDeviceName;
@@ -8313 +8313 @@
             /* If we are using a static TAP device then try to open it. */
             Utf8Str str(tapDeviceName);
-            if (str.length() <= sizeof(IfReq.ifr_name))
-                strcpy(IfReq.ifr_name, str.c_str());
-            else
-                memcpy(IfReq.ifr_name, str.c_str(), sizeof(IfReq.ifr_name) - 1); /** @todo bitch about names which are too long... */
+            RTStrCopy(IfReq.ifr_name, sizeof(IfReq.ifr_name), str.c_str()); /** @todo bitch about names which are too long... */
             IfReq.ifr_flags = IFF_TAP | IFF_NO_PI;
             rcVBox = ioctl(maTapFD[slot], TUNSETIFF, &IfReq);

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -1915 +1915 @@
             Assert(strlen(macStr) == 12);
             RTMAC Mac;
-            memset(&Mac, 0, sizeof(Mac));
+            RT_ZERO(Mac);
             char *pMac = (char*)&Mac;
             for (uint32_t i = 0; i < 6; ++i)
@@ -4397 +4397 @@
                         struct ifreq Req;
                         RT_ZERO(Req);
-                        strncpy(Req.ifr_name, pszBridgedIfName, sizeof(Req.ifr_name) - 1);
+                        RTStrCopy(Req.ifr_name, sizeof(Req.ifr_name), pszBridgedIfName);
                         if (ioctl(iSock, SIOCGIFFLAGS, &Req) >= 0)
                             if ((Req.ifr_flags & IFF_UP) == 0)
@@ -4446 +4446 @@
                     struct iwreq WRq;
 
-                    memset(&WRq, 0, sizeof(WRq));
+                    RT_ZERO(WRq);
                     strncpy(WRq.ifr_name, pszBridgedIfName, IFNAMSIZ);
                     bool fSharedMacOnWire = ioctl(iSock, SIOCGIWNAME, &WRq) >= 0;
@@ -4467 +4467 @@
                     uint8_t abData[32];
 
-                    memset(&WReq, 0, sizeof(WReq));
+                    RT_ZERO(WReq);
                     strncpy(WReq.i_name, pszBridgedIfName, sizeof(WReq.i_name));
                     WReq.i_type = IEEE80211_IOC_SSID;

trunk/src/VBox/Main/src-client/ConsoleVRDPServer.cpp

@@ -1351 +1351 @@
     m_InputSynch.fClientScrollLock = false;
 
-    memset(maFramebuffers, 0, sizeof(maFramebuffers));
+    RT_ZERO(maFramebuffers);
 
     {
@@ -1377 +1377 @@
      */
     m_fInterfaceImage = false;
-    memset(&m_interfaceImage, 0, sizeof (m_interfaceImage));
-    memset(&m_interfaceCallbacksImage, 0, sizeof (m_interfaceCallbacksImage));
+    RT_ZERO(m_interfaceImage);
+    RT_ZERO(m_interfaceCallbacksImage);
     RT_ZERO(m_interfaceMousePtr);
     RT_ZERO(m_interfaceSCard);
@@ -1416 +1416 @@
     {
         RTCritSectDelete(&mCritSect);
-        memset(&mCritSect, 0, sizeof(mCritSect));
+        RT_ZERO(mCritSect);
     }
 
@@ -1422 +1422 @@
     {
         RTCritSectDelete(&mTSMFLock);
-        memset(&mTSMFLock, 0, sizeof(mTSMFLock));
+        RT_ZERO(mTSMFLock);
     }
 }
@@ -2586 +2586 @@
                 pThis->tsmfUnlock();
 
-                memset(pVRDPCtx, 0, sizeof(*pVRDPCtx));
+                RT_ZERO(*pVRDPCtx);
                 RTMemFree(pVRDPCtx);
             }

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -149 +149 @@
     {
         RTCritSectDelete (&mVBVALock);
-        memset (&mVBVALock, 0, sizeof (mVBVALock));
+        RT_ZERO(mVBVALock);
     }
 
@@ -155 +155 @@
     {
         RTCritSectDelete(&mSaveSeamlessRectLock);
-        memset(&mSaveSeamlessRectLock, 0, sizeof (mSaveSeamlessRectLock));
+        RT_ZERO(mSaveSeamlessRectLock);
     }
     BaseFinalRelease();
@@ -489 +489 @@
         maFramebuffers[ul].mpSavedVisibleRegion = NULL;
 
-        memset (&maFramebuffers[ul].dirtyRect, 0 , sizeof (maFramebuffers[ul].dirtyRect));
-        memset (&maFramebuffers[ul].pendingResize, 0 , sizeof (maFramebuffers[ul].pendingResize));
+        RT_ZERO(maFramebuffers[ul].dirtyRect);
+        RT_ZERO(maFramebuffers[ul].pendingResize);
 #ifdef VBOX_WITH_HGSMI
         maFramebuffers[ul].fVBVAEnabled = false;
         maFramebuffers[ul].cVBVASkipUpdate = 0;
-        memset (&maFramebuffers[ul].vbvaSkippedRect, 0, sizeof (maFramebuffers[ul].vbvaSkippedRect));
+        RT_ZERO(maFramebuffers[ul].vbvaSkippedRect);
         maFramebuffers[ul].pVBVAHostFlags = NULL;
 #endif /* VBOX_WITH_HGSMI */
@@ -1244 +1244 @@
         DISPLAYFBINFO *pFBInfo = &prgn->paFramebuffers[uScreenId];
 
-        memset (&pFBInfo->dirtyRect, 0, sizeof (pFBInfo->dirtyRect));
+        RT_ZERO(pFBInfo->dirtyRect);
     }
 }

trunk/src/VBox/Main/src-client/HGCM.cpp

@@ -243 +243 @@
     m_hExtension (NULL)
 {
-    memset (&m_fntable, 0, sizeof (m_fntable));
+    RT_ZERO(m_fntable);
 }
 
@@ -290 +290 @@
         if (RT_SUCCESS(rc))
         {
-            memset (&m_fntable, 0, sizeof (m_fntable));
+            RT_ZERO(m_fntable);
 
             m_fntable.cbSize     = sizeof (m_fntable);
@@ -346 +346 @@
     }
 
-    memset (&m_fntable, 0, sizeof (m_fntable));
+    RT_ZERO(m_fntable);
     m_pfnLoad = NULL;
     m_hLdrMod = NIL_RTLDRMOD;

trunk/src/VBox/Main/src-client/HGCMThread.cpp

@@ -221 +221 @@
     m_handle (0)
 {
-    memset (&m_critsect, 0, sizeof (m_critsect));
+    RT_ZERO(m_critsect);
 }
 
@@ -307 +307 @@
             {
                 Log(("hgcmThreadCreate: FAILURE: Can't init a critical section for a hgcm worker thread.\n"));
-                memset (&m_critsect, 0, sizeof (m_critsect));
+                RT_ZERO(m_critsect);
             }
         }

trunk/src/VBox/Main/src-client/RemoteUSBBackend.cpp

@@ -962 +962 @@
     {
         AssertFailed ();
-        memset (&mCritsect, 0, sizeof (mCritsect));
+        RT_ZERO(mCritsect);
     }
 

trunk/src/VBox/Main/src-server/HostImpl.cpp

@@ -253 +253 @@
 
     RT_ZERO(g_aszResolvConf);
-    RTStrmPrintf(g_aszResolvConf, MAX_PATH, "%/RESOLV2", _PATH_ETC);
+    RTStrmPrintf(g_aszResolvConf, sizeof(g_aszResolvConf), "%/RESOLV2", _PATH_ETC);
 # else
-    strcpy(g_aszResolvConf, "/etc/resolv.conf");
+    RTStrCopy(g_aszResolvConf, sizeof(g_aszResolvConf), "/etc/resolv.conf");
 # endif    
     return g_aszResolvConf;

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

@@ -86 +86 @@
 
         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)
         {
@@ -392 +392 @@
         {
             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)
             {
@@ -512 +512 @@
 
             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/darwin/iokit.cpp

@@ -374 +374 @@
             CFIndex iCF;
         } u;
-        memset(&u, 0, sizeof(u));
+        RT_ZERO(u);
         CFNumberType NumType = CFNumberGetType((CFNumberRef)pvValue);
         if (CFNumberGetValue((CFNumberRef)pvValue, NumType, &u))

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);

trunk/src/VBox/Main/src-server/generic/AutostartDb-generic.cpp

@@ -79 +79 @@
                     uint32_t cAutostartVms = 0;
 
-                    memset(abBuf, 0, sizeof(abBuf));
+                    RT_ZERO(abBuf);
 
                     /* Check if the file was just created. */

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

@@ -381 +381 @@
         return VERR_OUT_OF_RESOURCES;
     struct ifreq Req;
-    memset(&Req, 0, sizeof(Req));
-    strncpy(Req.ifr_name, pcszIfName, sizeof(Req.ifr_name) - 1);
+    RT_ZERO(Req);
+    RTStrCopy(Req.ifr_name, sizeof(Req.ifr_name), pcszIfName);
     if (ioctl(sock, SIOCGIFFLAGS, &Req) < 0)
     {

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

@@ -119 +119 @@
     // memset(pInfo, 0, sizeof(*pInfo));
     struct ifreq Req;
-    memset(&Req, 0, sizeof(Req));
-    strncpy(Req.ifr_name, pszName, sizeof(Req.ifr_name) - 1);
+    RT_ZERO(Req);
+    RTStrCopy(Req.ifr_name, sizeof(Req.ifr_name), pszName);
     if (ioctl(iSocket, SIOCGIFHWADDR, &Req) >= 0)
     {
@@ -164 +164 @@
             for (;;)
             {
-                memset(szName, 0, sizeof(szName));
+                RT_ZERO(szName);
                 int n = fscanf(fp,
                                "%08x%08x%08x%08x"
@@ -288 +288 @@
         return VERR_OUT_OF_RESOURCES;
     struct ifreq Req;
-    memset(&Req, 0, sizeof(Req));
-    strncpy(Req.ifr_name, pcszIfName, sizeof(Req.ifr_name) - 1);
+    RT_ZERO(Req);
+    RTStrCopy(Req.ifr_name, sizeof(Req.ifr_name), pcszIfName);
     if (ioctl(sock, SIOCGIFHWADDR, &Req) >= 0)
     {

trunk/src/VBox/Main/src-server/linux/USBGetDevices.cpp

@@ -594 +594 @@
 
                     /* Reset device state */
-                    memset(&Dev, 0, sizeof (Dev));
+                    RT_ZERO(Dev);
                     Dev.enmState = USBDEVICESTATE_UNUSED;
                     cHits = 1;

trunk/src/VBox/Main/src-server/linux/USBProxyServiceLinux.cpp

@@ -321 +321 @@
     }
 
-    memset(&PollFds, 0, sizeof(PollFds));
+    RT_ZERO(PollFds);
     PollFds[0].fd        = RTFileToNative(mhFile);
     PollFds[0].events    = POLLIN;

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

@@ -205 +205 @@
     {
         struct lifreq IfReq;
-        strcpy(IfReq.lifr_name, szNICInstance);
+        RTStrCopy(IfReq.lifr_name, sizeof(IfReq.lifr_name), szNICInstance);
         if (ioctl(Sock, SIOCGLIFADDR, &IfReq) >= 0)
         {
@@ -244 +244 @@
     {
         struct lifreq IfReq;
-        strcpy(IfReq.lifr_name, szNICInstance);
+        RTStrCopy(IfReq.lifr_name, sizeof(IfReq.lifr_name), szNICInstance);
         if (ioctl(Sock, SIOCGLIFADDR, &IfReq) >= 0)
         {

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

@@ -955 +955 @@
         {
             NETIFINFO Info;
-            memset(&Info, 0, sizeof(Info));
+            RT_ZERO(Info);
             Info.Uuid = *(Guid(IfGuid).raw());
             rc = collectNetIfInfo(name, Guid(IfGuid), &Info, iDefaultInterface);

trunk/src/VBox/Main/src-server/xpcom/server_module.cpp

@@ -54 +54 @@
 #include <iprt/process.h>
 #include <iprt/env.h>
+#include <iprt/string.h>
 #include <iprt/thread.h>
-
-#include <string.h>
 
 #if defined(RT_OS_SOLARIS)
@@ -138 +137 @@
 
     char msg[10];
-    memset(msg, '\0', sizeof(msg));
+    RT_ZERO(msg);
     if (   PR_Read(readable, msg, sizeof(msg)-1) != 5
         || strcmp(msg, "READY"))