Changeset 47964 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Aug 21, 2013 12:53:18 PM (11 years ago)

Author:

vboxsync

Message:

Main/src-server: Unused variables and parameters warnings.

Location:

trunk/src/VBox/Main/src-server

Files:

• ApplianceImplImport.cpp (modified) (21 diffs)
• NATNetworkImpl.cpp (modified) (4 diffs)

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

@@ -625 +625 @@
                     }
 
-                    /* 
+                    /*
                      * Figure out from URI which format the image of disk has.
                      * URI must have inside section <Disk>                   .
-                     * But there aren't strong requirements about correspondence one URI for one disk virtual format. 
+                     * But there aren't strong requirements about correspondence one URI for one disk virtual format.
                      * So possibly, we aren't able to recognize some URIs.
                      */
                     Utf8Str vdf = typeOfVirtualDiskFormatFromURI(di.strFormat);
 
-                    /* 
+                    /*
                      * fallback, if we can't determine virtual disk format using URI from the attribute ovf:format
                      * in the corresponding section <Disk> in the OVF file.
@@ -828 +828 @@
         {
             throw setError(VBOX_E_FILE_ERROR,
-                   tr("Empty directory folder (%s) isn't allowed in the OVA package (%Rrc)"), 
+                   tr("Empty directory folder (%s) isn't allowed in the OVA package (%Rrc)"),
                       pszFilename,
                       vrc);
@@ -1557 +1557 @@
 
             size_t cbMfSize = 0;
-            
+
             /* Now import the appliance. */
             importMachines(stack, pShaIo, &storage);
@@ -1674 +1674 @@
             {
                 throw setError(VBOX_E_FILE_ERROR,
-                       tr("Empty directory folder (%s) isn't allowed in the OVA package (%Rrc)"), 
+                       tr("Empty directory folder (%s) isn't allowed in the OVA package (%Rrc)"),
                           pszFilename,
                           vrc);
@@ -1691 +1691 @@
             {
                 throw setError(VBOX_E_FILE_ERROR,
-                       tr("Empty directory folder (%s) isn't allowed in the OVA package (%Rrc)"), 
+                       tr("Empty directory folder (%s) isn't allowed in the OVA package (%Rrc)"),
                           pszFilename,
                           vrc);
@@ -1723 +1723 @@
         if (FAILED(rc)) throw rc;
 
-        /* 
+        /*
          * Try to read the certificate file. First try.
-         * Logic is the same as with manifest file 
-         * Only if the manifest file had been read successfully before 
+         * Logic is the same as with manifest file
+         * Only if the manifest file had been read successfully before
          */
         vrc = RTTarCurrentFile(tar, &pszFilename);
@@ -2024 +2024 @@
 
     bool fOldDigest = pStorage->fCreateDigest;/* Save the old digest property */
-    pStorage->fCreateDigest = fCreateDigest; 
+    pStorage->fCreateDigest = fCreateDigest;
     int vrc = ShaReadBuf(strFile.c_str(), ppvBuf, pcbSize, pCallbacks, pStorage);
     if (   RT_FAILURE(vrc)
@@ -2245 +2245 @@
     SystemProperties *pSysProps = mVirtualBox->getSystemProperties();
 
-    /* 
+    /*
      * we put strSourceOVF into the stack.llSrcDisksDigest in the end of this
-     * function like a key for a later validation of the SHA digests 
-     */ 
+     * function like a key for a later validation of the SHA digests
+     */
     const Utf8Str &strSourceOVF = di.strHref;
 
@@ -2277 +2277 @@
     else
     {
-        bool fGzipUsed = !(di.strCompression.compare("gzip",Utf8Str::CaseInsensitive)); 
+        bool fGzipUsed = !(di.strCompression.compare("gzip",Utf8Str::CaseInsensitive));
         /* check read file to GZIP compression */
         try
@@ -2289 +2289 @@
                  * with simple FILE interface because we don't need SHA or TAR interfaces here anymore.
                  * But we mustn't delete the chain of SHA-TAR or SHA-FILE interfaces.
-                 */ 
+                 */
 
                 /* Decompress the GZIP file and save a new file in the target path */
@@ -2323 +2323 @@
                                    tr("Creation of the VD interface failed (%Rrc)"), vrc);
 
-                /* Correct the source and the target with the actual values */ 
+                /* Correct the source and the target with the actual values */
                 strSrcFilePath = strTargetDir;
                 strTargetDir = strTargetDir.stripFilename();
@@ -2335 +2335 @@
             Utf8Str strTrgFormat = "VMDK";
             ULONG lCabs = 0;
-            char *pszExt = NULL; 
+            char *pszExt = NULL;
 
             if (RTPathHaveExt(strTargetPath->c_str()))
@@ -2371 +2371 @@
             else
             {
-                throw setError(VBOX_E_FILE_ERROR, 
-                               tr("The target disk '%s' has no extension "), 
+                throw setError(VBOX_E_FILE_ERROR,
+                               tr("The target disk '%s' has no extension "),
                                strTargetPath->c_str(), VERR_INVALID_NAME);
             }
@@ -2383 +2383 @@
             {
                 void *pvTmpBuf = 0;
-                size_t cbSize = 0;
                 try
                 {
                     if (fGzipUsed == true)
                     {
-                        /*  
-                         * The source and target pathes are the same.  
-                         * It means that we have the needed file already. 
-                         * For example, in GZIP case, we decompress the file and save it in the target path,  
-                         * but with some prefix like "temp_". See part "check read file to GZIP compression" earlier  
-                         * in this function. 
-                         * Just rename the file by deleting "temp_" from it's name  
-                         */ 
-                        vrc = RTFileRename(strSrcFilePath.c_str(), strTargetPath->c_str(), RTPATHRENAME_FLAGS_NO_REPLACE); 
-                        if (RT_FAILURE(vrc)) 
-                            throw setError(VBOX_E_FILE_ERROR, 
-                                           tr("Could not rename the file '%s' (%Rrc)"), 
+                        /*
+                         * The source and target pathes are the same.
+                         * It means that we have the needed file already.
+                         * For example, in GZIP case, we decompress the file and save it in the target path,
+                         * but with some prefix like "temp_". See part "check read file to GZIP compression" earlier
+                         * in this function.
+                         * Just rename the file by deleting "temp_" from it's name
+                         */
+                        vrc = RTFileRename(strSrcFilePath.c_str(), strTargetPath->c_str(), RTPATHRENAME_FLAGS_NO_REPLACE);
+                        if (RT_FAILURE(vrc))
+                            throw setError(VBOX_E_FILE_ERROR,
+                                           tr("Could not rename the file '%s' (%Rrc)"),
                                            RTPathFilename(strSourceOVF.c_str()), vrc);
                     }
-                    else 
-                    { 
-                        /* Calculating SHA digest for ISO file while copying one */ 
-                        vrc = copyFileAndCalcShaDigest(strSrcFilePath.c_str(),  
-                                                        strTargetPath->c_str(),  
-                                                       pCallbacks,  
-                                                       pRealUsedStorage); 
-
-                        if (RT_FAILURE(vrc)) 
-                            throw setError(VBOX_E_FILE_ERROR, 
-                                           tr("Could not copy ISO file '%s' listed in the OVF file (%Rrc)"), 
-                                           RTPathFilename(strSourceOVF.c_str()), vrc); 
-                    } 
+                    else
+                    {
+                        /* Calculating SHA digest for ISO file while copying one */
+                        vrc = copyFileAndCalcShaDigest(strSrcFilePath.c_str(),
+                                                        strTargetPath->c_str(),
+                                                       pCallbacks,
+                                                       pRealUsedStorage);
+
+                        if (RT_FAILURE(vrc))
+                            throw setError(VBOX_E_FILE_ERROR,
+                                           tr("Could not copy ISO file '%s' listed in the OVF file (%Rrc)"),
+                                           RTPathFilename(strSourceOVF.c_str()), vrc);
+                    }
                 }
                 catch (HRESULT arc)
@@ -2508 +2507 @@
                 waitForAsyncProgress(stack.pProgress, pp);
 
-                if (fGzipUsed == true) 
-                { 
-                    /*  
-                     * Just delete the temporary file 
-                     */ 
-                    vrc = RTFileDelete(strSrcFilePath.c_str()); 
-                    if (RT_FAILURE(vrc)) 
-                        setWarning(VBOX_E_FILE_ERROR, 
-                                   tr("Could not delete the file '%s' (%Rrc)"), 
-                                   RTPathFilename(strSrcFilePath.c_str()), vrc); 
-                } 
+                if (fGzipUsed == true)
+                {
+                    /*
+                     * Just delete the temporary file
+                     */
+                    vrc = RTFileDelete(strSrcFilePath.c_str());
+                    if (RT_FAILURE(vrc))
+                        setWarning(VBOX_E_FILE_ERROR,
+                                   tr("Could not delete the file '%s' (%Rrc)"),
+                                   RTPathFilename(strSrcFilePath.c_str()), vrc);
+                }
             }
         }
@@ -2986 +2985 @@
                 VirtualSystemDescriptionEntry *vsdeTargetHD = 0;
 
-                /* 
-                 * 
+                /*
+                 *
                  * Iterate over all given disk images of the virtual system
                  * disks description. We need to find the target disk path,
-                 * which could be changed by the user. 
+                 * which could be changed by the user.
                  *
                  */
@@ -3049 +3048 @@
                         if(availableImage.compare(diCurrent.strHref, Utf8Str::CaseInsensitive) != 0)
                         {
-                            /* 
+                            /*
                              * availableImage contains the disk file reference (e.g. "disk1.vmdk"), which should exist
                              * in the global images map.
@@ -3075 +3074 @@
                             }
 
-                            /* 
+                            /*
                              * Again iterate over all given disk images of the virtual system
-                             * disks description using the found disk image 
+                             * disks description using the found disk image
                              */
                             {
@@ -3155 +3154 @@
                                             mhda.lDevice);
 
-                Log(("Attaching disk %s to port %d on device %d\n", 
+                Log(("Attaching disk %s to port %d on device %d\n",
                 vsdeTargetHD->strVboxCurrent.c_str(), mhda.lControllerPort, mhda.lDevice));
 
@@ -3500 +3499 @@
                     diCurrent = *(&itDiskImage->second);
 
-                    /* 
+                    /*
                      * Again iterate over all given disk images of the virtual system
                      * disks description using the found disk image
@@ -3695 +3694 @@
     const ovf::OVFReader &reader = *m->pReader;
 
-    /* 
-     * get the SHA digest version that was set in accordance with the value of attribute "xmlns:ovf" 
+    /*
+     * get the SHA digest version that was set in accordance with the value of attribute "xmlns:ovf"
      * of the element <Envelope> in the OVF file during reading operation. See readFSImpl().
      */

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

@@ -478 +478 @@
 STDMETHODIMP NATNetwork::COMGETTER(LocalMappings)(ComSafeArrayOut(BSTR, aLocalMappings))
 {
+    NOREF(aLocalMappings); NOREF(aLocalMappingsSize);
     return E_NOTIMPL;
 }
@@ -483 +484 @@
 STDMETHODIMP NATNetwork::AddLocalMapping(IN_BSTR aHostId, LONG aOffset)
 {
+    NOREF(aHostId); NOREF(aOffset);
     return E_NOTIMPL;
 }
@@ -488 +490 @@
 STDMETHODIMP NATNetwork::COMGETTER(LoopbackIp6)(LONG *aLoopbackIp6)
 {
+    NOREF(aLoopbackIp6);
     return E_NOTIMPL;
 }
@@ -493 +496 @@
 STDMETHODIMP NATNetwork::COMSETTER(LoopbackIp6)(LONG aLoopbackIp6)
 {
+    NOREF(aLoopbackIp6);
     return E_NOTIMPL;
 }