Changeset 91720 in vbox for trunk/src

Timestamp:

Oct 14, 2021 11:59:23 AM (3 years ago)

Author:

vboxsync

Message:

Main: bugref:1909: Fixed compilation issues

Location:

trunk/src/VBox/Main

Files:

• include/QMTranslator.h (modified) (1 diff)
• src-all/ExtPackUtil.cpp (modified) (2 diffs)
• src-server/ApplianceImplImport.cpp (modified) (1 diff)

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

@@ -39 +39 @@
      *                          Will be set to NULL if @a pszSource is returned.
      * @param   pszDisamb       Disambiguationg comment, empty by default
-     * @param   iNum            Plural form indicator.
+     * @param   aNum            Plural form indicator.
      *
      * @returns Pointer to a translation (UTF-8 encoding), source string on failure.

trunk/src/VBox/Main/src-all/ExtPackUtil.cpp

@@ -337 +337 @@
     /* Check the file size. */
     if (ObjInfo.cbObject > _1M || ObjInfo.cbObject < 0)
-        return &(new RTCString)->printf(ExtPackUtil::tr("The XML file is too large (%'RU64 bytes)", "", ObjInfo.cbObject),
+        return &(new RTCString)->printf(ExtPackUtil::tr("The XML file is too large (%'RU64 bytes)", "", (size_t)ObjInfo.cbObject),
                                         ObjInfo.cbObject);
     size_t const cbFile = (size_t)ObjInfo.cbObject;
@@ -950 +950 @@
                 rc = vboxExtPackReturnError(VERR_OUT_OF_RANGE, pszError, cbError,
                                             ExtPackUtil::tr("Standard member '%s' is too large: %'RU64 bytes (max 1 MB)", "",
-                                                            ObjInfo.cbObject),
+                                                            (size_t)ObjInfo.cbObject),
                                             pszAdjName, (uint64_t)ObjInfo.cbObject);
             else

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

@@ -3048 +3048 @@
     else if (RTAsn1OctetString_IsPresent(&pSignedData->ContentInfo.Content))
         i_addWarning(tr("Invalid PKCS#7/CMS data: embedded (%u bytes), expected external","",
-                        (int)pSignedData->ContentInfo.Content.Asn1Core.cb),
+                        pSignedData->ContentInfo.Content.Asn1Core.cb),
                      pSignedData->ContentInfo.Content.Asn1Core.cb);
     else if (pSignedData->SignerInfos.cItems == 0)