Changeset 93089 in vbox for trunk/src/VBox/Main/src-server/UnattendedInstaller.cpp

Timestamp:

Dec 27, 2021 11:20:36 AM (3 years ago)

Author:

vboxsync

Message:

Main/Unattended: Some more work on the OS/2 unattended installation. [implicit signed clang annoyances]

File:

• trunk/src/VBox/Main/src-server/UnattendedInstaller.cpp (modified) (8 diffs)

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

@@ -915 +915 @@
                  */
                 uint8_t *pbBootSector = NULL;
-                uint64_t off          = 0;
+                RTFOFF   off          = 0;
                 bool     fEof         = false;
                 uint8_t  abBuf[_8K]   = {0};
@@ -959 +959 @@
                         /* skip */
                         pbCur  = pbHit - 510 + 1;
-                        cbLeft = &abBuf[sizeof(abBuf)] - pbCur;
+                        cbLeft = (uintptr_t)&abBuf[sizeof(abBuf)] - (uintptr_t)pbCur;
                     }
                 } while (!fEof);
@@ -1306 +1306 @@
         else
             break;
-        cchSrc -= pszHit0 - pszSrc + 1;
+        cchSrc -= (size_t)(pszHit0 - pszSrc) + 1;
         pszSrc  = pszHit0 + 1;
     }
@@ -1336 +1336 @@
                                           pszFileToSplit, pszMarker - pszStart, pszMarker);
         pszMarker += sizeof("START[") - 1;
-        const char *pszTail = splitFileLocateSubstring(pszMarker, pszEnd - pszMarker, RT_STR_TUPLE("]@@"));
+        const char *pszTail = splitFileLocateSubstring(pszMarker, (size_t)(pszEnd - pszMarker), RT_STR_TUPLE("]@@"));
         if (   !pszTail
             || pszTail - pszMarker > 64
@@ -1345 +1345 @@
             return mpParent->setErrorBoth(E_FAIL, VERR_PARSE_ERROR,
                                           tr("Malformed splitter tag in '%s' at offset %p: @@VBOX_SPLITTER_START[%.64s"),
-                                          pszFileToSplit, pszMarker - pszStart, pszMarker);
+                                          pszFileToSplit, (size_t)(pszEnd - pszMarker), pszMarker);
         int vrc = RTStrValidateEncodingEx(pszMarker, pszTail - pszMarker, RTSTR_VALIDATE_ENCODING_EXACT_LENGTH);
         if (RT_FAILURE(vrc))
             return mpParent->setErrorBoth(E_FAIL, vrc,
                                           tr("Malformed splitter tag in '%s' at offset %p: @@VBOX_SPLITTER_START[%.*Rhxs"),
-                                          pszFileToSplit, pszMarker - pszStart, pszTail - pszMarker, pszMarker);
+                                          pszFileToSplit, (size_t)(pszEnd - pszMarker), pszTail - pszMarker, pszMarker);
         const char *pszFilename;
         try
@@ -1381 +1381 @@
             return mpParent->setErrorBoth(E_FAIL, VERR_PARSE_ERROR,
                                           tr("Unexpected splitter tag in '%s' at offset %p: @@VBOX_SPLITTER_%.64s"),
-                                          pszFileToSplit, pszMarker - pszStart, pszMarker);
+                                          pszFileToSplit, (size_t)(pszEnd - pszMarker), pszMarker);
         pszMarker += sizeof("END[") - 1;
         size_t const cchFilename = strlen(pszFilename);
@@ -1390 +1390 @@
             return mpParent->setErrorBoth(E_FAIL, VERR_PARSE_ERROR,
                                           tr("Mismatching splitter tag for '%s' in '%s' at offset %p: @@VBOX_SPLITTER_END[%.64Rhxs"),
-                                          pszFilename, pszFileToSplit, pszMarker - pszStart, pszMarker);
+                                          pszFilename, pszFileToSplit, (size_t)(pszEnd - pszMarker), pszMarker);
 
         /* Advance. */
         pszSrc = pszMarker + cchFilename + sizeof("]@@") - 1;
-        cbLeft = pszEnd - pszSrc;
+        cbLeft = (size_t)(pszEnd - pszSrc);
 
         /*
@@ -1409 +1409 @@
             if (RT_SUCCESS(vrc))
             {
-                vrc = RTFileWrite(hFile, pszDocStart, pszDocEnd - pszDocStart, NULL);
+                vrc = RTFileWrite(hFile, pszDocStart, (size_t)(pszDocEnd - pszDocStart), NULL);
                 if (RT_SUCCESS(vrc))
                     vrc = RTFileClose(hFile);