Changeset 50199 in vbox

Timestamp:

Jan 23, 2014 6:48:54 PM (11 years ago)

Author:

vboxsync

Message:

Corrected misleading helper function names: s/ShaReadBuf/readFileIntoBuffer/, s/ShaWriteBuf/writeBufferToFile/

Location:

trunk/src/VBox/Main

Files:

• include/ApplianceImplPrivate.h (modified) (1 diff)
• src-server/ApplianceImplExport.cpp (modified) (2 diffs)
• src-server/ApplianceImplIO.cpp (modified) (2 diffs)
• src-server/ApplianceImplImport.cpp (modified) (5 diffs)

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

@@ -249 +249 @@
 PVDINTERFACEIO FileCreateInterface();
 PVDINTERFACEIO TarCreateInterface();
-int ShaReadBuf(const char *pcszFilename, void **ppvBuf, size_t *pcbSize, PVDINTERFACEIO pIfIo, void *pvUser);
-int ShaWriteBuf(const char *pcszFilename, void *pvBuf, size_t cbSize, PVDINTERFACEIO pIfIo, void *pvUser);
+int readFileIntoBuffer(const char *pcszFilename, void **ppvBuf, size_t *pcbSize, PVDINTERFACEIO pIfIo, void *pvUser);
+int writeBufferToFile(const char *pcszFilename, void *pvBuf, size_t cbSize, PVDINTERFACEIO pIfIo, void *pvUser);
 int decompressImageAndSave(const char *pcszFullFilenameIn, const char *pcszFullFilenameOut, PVDINTERFACEIO pIfIo, void *pvUser);
 int copyFileAndCalcShaDigest(const char *pcszSourceFilename, const char *pcszTargetFilename, PVDINTERFACEIO pIfIo, void *pvUser);

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

@@ -2041 +2041 @@
                                strOvfFile.c_str());
             /* Write the ovf file to disk. */
-            vrc = ShaWriteBuf(strOvfFile.c_str(), pvBuf, cbSize, pIfIo, pStorage);
+            vrc = writeBufferToFile(strOvfFile.c_str(), pvBuf, cbSize, pIfIo, pStorage);
             if (RT_FAILURE(vrc))
                 throw setError(VBOX_E_FILE_ERROR,
@@ -2276 +2276 @@
             pStorage->fCreateDigest = false;
             /* Write the manifest file to disk. */
-            vrc = ShaWriteBuf(strMfFilePath.c_str(), pvBuf, cbSize, pIfIo, pStorage);
+            vrc = writeBufferToFile(strMfFilePath.c_str(), pvBuf, cbSize, pIfIo, pStorage);
             RTMemFree(pvBuf);
             if (RT_FAILURE(vrc))

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

@@ -1243 +1243 @@
 }
 
-int ShaReadBuf(const char *pcszFilename, void **ppvBuf, size_t *pcbSize, PVDINTERFACEIO pIfIo, void *pvUser)
+int readFileIntoBuffer(const char *pcszFilename, void **ppvBuf, size_t *pcbSize, PVDINTERFACEIO pIfIo, void *pvUser)
 {
     /* Validate input. */
@@ -1310 +1310 @@
 }
 
-int ShaWriteBuf(const char *pcszFilename, void *pvBuf, size_t cbSize, PVDINTERFACEIO pIfIo, void *pvUser)
+int writeBufferToFile(const char *pcszFilename, void *pvBuf, size_t cbSize, PVDINTERFACEIO pIfIo, void *pvUser)
 {
     /* Validate input. */

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

@@ -813 +813 @@
 
 /**
- * Implementation for reading an OVF. This starts a new thread which will call
- * Appliance::taskThreadImportOrExport() which will then call readFS() or readS3().
- * This will then open the OVF with ovfreader.cpp.
+ * Implementation for reading an OVF (via task).
+ *
+ * This starts a new thread which will call
+ * Appliance::taskThreadImportOrExport() which will then call readFS() or
+ * readS3(). This will then open the OVF with ovfreader.cpp.
  *
  * This is in a separate private method because it is used from three locations:
@@ -826 +828 @@
  * 3) from Appliance::readS3(), which got called from a previous instance of Appliance::taskThreadImportOrExport().
  *
- * @param aLocInfo
- * @param aProgress
- * @return
+ * @param   aLocInfo    The OVF location.
+ * @param   aProgress   Where to return the progress object.
+ * @return  COM success status code. COM error codes will be thrown.
  */
 HRESULT Appliance::i_readImpl(const LocationInfo &aLocInfo, ComObjPtr<Progress> &aProgress)
@@ -1146 +1148 @@
         /* Read the OVF into a memory buffer */
         size_t cbSize = 0;
-        int vrc = ShaReadBuf(strFilename.c_str(), &pvTmpBuf, &cbSize, pIfIo, pStorage);
+        int vrc = readFileIntoBuffer(strFilename.c_str(), &pvTmpBuf, &cbSize, pIfIo, pStorage);
         if (RT_FAILURE(vrc)
             || !pvTmpBuf)
@@ -1161 +1163 @@
 
             uint8_t digest[RTSHA256_HASH_SIZE];
-            size_t cbDigest = RTSHA256_DIGEST_LEN;
+            size_t cchDigest = RTSHA256_DIGEST_LEN;
             char *pszDigest;
 
             RTSha256(pvTmpBuf, cbSize, &digest[0]);
 
-            vrc = RTStrAllocEx(&pszDigest, cbDigest + 1);
-            if (RT_SUCCESS(vrc))
-                vrc = RTSha256ToString(digest, pszDigest, cbDigest + 1);
-            else
-                throw setError(VBOX_E_FILE_ERROR,
-                           tr("Could not allocate string for SHA256 digest (%Rrc)"), vrc);
-
+            vrc = RTStrAllocEx(&pszDigest, cchDigest + 1);
+            if (RT_FAILURE(vrc))
+                throw setError(E_OUTOFMEMORY, tr("Could not allocate string for SHA256 digest (%Rrc)"), vrc);
+
+            vrc = RTSha256ToString(digest, pszDigest, cchDigest + 1);
             if (RT_SUCCESS(vrc))
                 /* Copy the SHA256 sum of the OVF file for later validation */
                 m->strOVFSHADigest = pszDigest;
             else
-                throw setError(VBOX_E_FILE_ERROR,
-                           tr("Converting SHA256 digest to a string was failed (%Rrc)"), vrc);
+                throw setError(VBOX_E_FILE_ERROR, tr("Converting SHA256 digest to a string was failed (%Rrc)"), vrc);
 
             RTStrFree(pszDigest);
@@ -2047 +2046 @@
     bool fOldDigest = pStorage->fCreateDigest;/* Save the old digest property */
     pStorage->fCreateDigest = fCreateDigest;
-    int vrc = ShaReadBuf(strFile.c_str(), ppvBuf, pcbSize, pCallbacks, pStorage);
+    int vrc = readFileIntoBuffer(strFile.c_str(), ppvBuf, pcbSize, pCallbacks, pStorage);
     if (   RT_FAILURE(vrc)
         && vrc != VERR_FILE_NOT_FOUND)