Changeset 91722 in vbox for trunk

Timestamp:

Oct 14, 2021 12:25:38 PM (3 years ago)

Author:

vboxsync

Message:

Main: bugref:1909: Fixed compilation issues

Location:

trunk

Files:

• include/VBox/ExtPack/ExtPack.h (modified) (1 diff)
• src/VBox/Main/include/ExtPackManagerImpl.h (modified) (1 diff)
• src/VBox/Main/src-all/ExtPackManagerImpl.cpp (modified) (2 diffs)
• src/VBox/Main/src-all/ExtPackUtil.cpp (modified) (1 diff)

trunk/include/VBox/ExtPack/ExtPack.h

@@ -341 +341 @@
      * @param   pszComment                Comment to the string to resolve possible ambiguities
      *                                    (NULL means no comment).
-     * @param   iNum                      Number used to define plural form of the translation
+     * @param   aNum                      Number used to define plural form of the translation
      */
     DECLR3CALLBACKMEMBER(const char *, pfnTranslate,(PCVBOXEXTPACKHLP pHlp,
-                                                     const char *pszComponent,
-                                                     const char *pszSourceText,
-                                                     const char *pszComment,
-                                                     const int   iNum));
+                                                     const char  *pszComponent,
+                                                     const char  *pszSourceText,
+                                                     const char  *pszComment,
+                                                     const size_t aNum));
 
     DECLR3CALLBACKMEMBER(int, pfnReserved1,(PCVBOXEXTPACKHLP pHlp)); /**< Reserved for minor structure revisions. */

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

@@ -183 +183 @@
                                                        VBOXEXTPACK_IF_CS(IVetoEvent) **ppEventOut);
     static DECLCALLBACK(const char *) i_hlpTranslate(PCVBOXEXTPACKHLP pHlp,
-                                                     const char *pszComponent,
-                                                     const char *pszSourceText,
-                                                     const char *pszComment = NULL,
-                                                     const int   iNum = -1);
+                                                     const char  *pszComponent,
+                                                     const char  *pszSourceText,
+                                                     const char  *pszComment = NULL,
+                                                     const size_t aNum = -1);
     static DECLCALLBACK(int)      i_hlpReservedN(PCVBOXEXTPACKHLP pHlp);
     /** @}  */

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

@@ -2015 +2015 @@
 /*static*/ DECLCALLBACK(const char *)
 ExtPack::i_hlpTranslate(PCVBOXEXTPACKHLP pHlp,
-                        const char *pszComponent,
-                        const char *pszSourceText,
-                        const char *pszComment /* = NULL */,
-                        const int   iNum /* = -1 */)
+                        const char  *pszComponent,
+                        const char  *pszSourceText,
+                        const char  *pszComment /* = NULL */,
+                        const size_t aNum /* = -1 */)
 {
     /*
@@ -2030 +2030 @@
 #ifdef VBOX_WITH_MAIN_NLS
     return VirtualBoxTranslator::translate(m->pTrComponent, pszComponent,
-                                           pszSourceText,  pszComment, iNum);
+                                           pszSourceText,  pszComment, aNum);
 #else
     NOREF(pszComponent);
     NOREF(pszComment);
-    NOREF(iNum);
+    NOREF(aNum);
     return pszSourceText;
 #endif

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

@@ -1091 +1091 @@
             if (ObjInfo.cbObject >= 9*_1G64)
                 rc = vboxExtPackReturnError(VERR_OUT_OF_RANGE, pszError, cbError,
-                                            ExtPackUtil::tr("'%s': too large (%'RU64 bytes)", "", ObjInfo.cbObject),
+                                            ExtPackUtil::tr("'%s': too large (%'RU64 bytes)", "", (size_t)ObjInfo.cbObject),
                                             pszName, (uint64_t)ObjInfo.cbObject);
             if (!RTFS_IS_FILE(ObjInfo.Attr.fMode))