Changeset 93301 in vbox for trunk/src/VBox/Runtime/common/checksum

Timestamp:

Jan 18, 2022 11:24:43 AM (3 years ago)

Author:

vboxsync

Message:

IPRT: VC++ 19.2 update 11 build adjustments. bugref:8489

Location:

trunk/src/VBox/Runtime/common/checksum

Files:

• RTSha1Digest.cpp (modified) (5 diffs)
• RTSha256Digest.cpp (modified) (5 diffs)

trunk/src/VBox/Runtime/common/checksum/RTSha1Digest.cpp

@@ -58 +58 @@
 
     /* Buffer size for progress callback */
-    double rdMulti = 100.0 / (cbBuf ? cbBuf : 1);
+    double rdMulti = 100.0 / (cbBuf ? (double)cbBuf : 1.0);
 
     /* Working buffer */
@@ -75 +75 @@
         if (pfnProgressCallback)
         {
-            rc = pfnProgressCallback((unsigned)(cbReadTotal * rdMulti), pvUser);
+            rc = pfnProgressCallback((unsigned)((double)cbReadTotal * rdMulti), pvUser);
             if (RT_FAILURE(rc))
                 break; /* canceled */
@@ -120 +120 @@
 
     /* Fetch the file size. Only needed if there is a progress callback. */
-    double rdMulti = 0;
+    double rdMulti = 0.0;
     if (pfnProgressCallback)
     {
@@ -130 +130 @@
             return rc;
         }
-        rdMulti = 100.0 / (cbFile ? cbFile : 1);
+        rdMulti = 100.0 / (cbFile ? (double)cbFile : 1.0);
     }
 
@@ -161 +161 @@
         if (pfnProgressCallback)
         {
-            rc = pfnProgressCallback((unsigned)(cbReadTotal * rdMulti), pvUser);
+            rc = pfnProgressCallback((unsigned)((double)cbReadTotal * rdMulti), pvUser);
             if (RT_FAILURE(rc))
                 break; /* canceled */

trunk/src/VBox/Runtime/common/checksum/RTSha256Digest.cpp

@@ -58 +58 @@
 
     /* Buffer size for progress callback */
-    double rdMulti = 100.0 / (cbBuf ? cbBuf : 1);
+    double rdMulti = 100.0 / (cbBuf ? (double)cbBuf : 1);
 
     /* Working buffer */
@@ -75 +75 @@
         if (pfnProgressCallback)
         {
-            rc = pfnProgressCallback((unsigned)(cbReadTotal * rdMulti), pvUser);
+            rc = pfnProgressCallback((unsigned)((double)cbReadTotal * rdMulti), pvUser);
             if (RT_FAILURE(rc))
                 break; /* canceled */
@@ -124 +124 @@
 
     /* Fetch the file size. Only needed if there is a progress callback. */
-    double rdMulti = 0;
+    double rdMulti = 0.0;
     if (pfnProgressCallback)
     {
@@ -134 +134 @@
             return rc;
         }
-        rdMulti = 100.0 / (cbFile ? cbFile : 1);
+        rdMulti = 100.0 / (cbFile ? (double)cbFile : 1.0);
     }
 
@@ -161 +161 @@
         if (pfnProgressCallback)
         {
-            rc = pfnProgressCallback((unsigned)(cbReadTotal * rdMulti), pvUser);
+            rc = pfnProgressCallback((unsigned)((double)cbReadTotal * rdMulti), pvUser);
             if (RT_FAILURE(rc))
                 break; /* canceled */