Changeset 104010 in vbox

Timestamp:

Mar 23, 2024 1:24:05 AM (13 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

162398

Message:

*: Fixed various calloc argument order warnings from gcc 14.

Location:

trunk

Files:

• include/iprt/bldprog-strtab-template.cpp.h (modified) (1 diff)
• src/VBox/Runtime/common/asn1/oiddb2c.cpp (modified) (1 diff)
• src/VBox/ValidationKit/bootsectors/bs3kit/VBoxBs3ObjConverter.cpp (modified) (2 diffs)

trunk/include/iprt/bldprog-strtab-template.cpp.h

@@ -252 +252 @@
 #endif
     cMaxStrings *= 2;
-    pThis->papStrHash = (PBLDPROGSTRING *)calloc(sizeof(pThis->papStrHash[0]), cMaxStrings);
+    pThis->papStrHash = (PBLDPROGSTRING *)calloc(cMaxStrings, sizeof(pThis->papStrHash[0]));
     if (pThis->papStrHash)
     {
         pThis->cStrHash = cMaxStrings;
 #ifdef BLDPROG_STRTAB_WITH_COMPRESSION
-        pThis->papPendingStrings = (PBLDPROGSTRING *)calloc(sizeof(pThis->papPendingStrings[0]), pThis->cMaxPendingStrings);
+        pThis->papPendingStrings = (PBLDPROGSTRING *)calloc(pThis->cMaxPendingStrings, sizeof(pThis->papPendingStrings[0]));
         if (pThis->papPendingStrings)
 #endif

trunk/src/VBox/Runtime/common/asn1/oiddb2c.cpp

@@ -247 +247 @@
     if (!g_pOidRoot)
     {
-        g_pOidRoot = (PRAWOIDNODE)calloc(sizeof(*g_pOidRoot), 1);
+        g_pOidRoot = (PRAWOIDNODE)calloc(1, sizeof(*g_pOidRoot));
         if (!g_pOidRoot)
             return error("Out of memory!\n");

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/VBoxBs3ObjConverter.cpp

@@ -371 +371 @@
 static POMFWRITER omfWriter_Create(const char *pszSrc, uint32_t cSegments, uint32_t cSymbols, FILE *pDst)
 {
-    POMFWRITER pThis = (POMFWRITER)calloc(sizeof(OMFWRITER), 1);
+    POMFWRITER pThis = (POMFWRITER)calloc(1, sizeof(OMFWRITER));
     if (pThis)
     {
@@ -377 +377 @@
         pThis->idxNextName   = 1;       /* We start counting at 1. */
         pThis->cSegments     = cSegments;
-        pThis->paSegments    = (POMFTOSEGDEF)calloc(sizeof(OMFTOSEGDEF), cSegments);
+        pThis->paSegments    = (POMFTOSEGDEF)calloc(cSegments, sizeof(OMFTOSEGDEF));
         if (pThis->paSegments)
         {
             pThis->cSymbols  = cSymbols;
-            pThis->paSymbols = (POMFSYMBOL)calloc(sizeof(OMFSYMBOL), cSymbols);
+            pThis->paSymbols = (POMFSYMBOL)calloc(cSymbols, sizeof(OMFSYMBOL));
             if (pThis->paSymbols)
             {