Changeset 14070 in vbox for trunk/src/VBox/VMM

Timestamp:

Nov 10, 2008 11:45:24 PM (16 years ago)

Author:

vboxsync

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

39126

Message:

CFGM: 64-bit MSC warning hunt.

Location:

trunk/src/VBox/VMM

Files:

• CFGM.cpp (modified) (5 diffs)
• CFGMInternal.h (modified) (4 diffs)
• PDMDevice.cpp (modified) (1 diff)
• PDMDriver.cpp (modified) (1 diff)

trunk/src/VBox/VMM/CFGM.cpp

@@ -339 +339 @@
  *                          or successive calls to CFGMR3GetNextChild().
  */
-VMMR3DECL(int) CFGMR3GetNameLen(PCFGMNODE pCur)
+VMMR3DECL(size_t) CFGMR3GetNameLen(PCFGMNODE pCur)
 {
     return pCur ? pCur->cchName + 1 : 0;
@@ -448 +448 @@
  *                          or successive calls to CFGMR3GetNextValue().
  */
-VMMR3DECL(int) CFGMR3GetValueNameLen(PCFGMLEAF pCur)
+VMMR3DECL(size_t) CFGMR3GetValueNameLen(PCFGMLEAF pCur)
 {
     return pCur ? pCur->cchName + 1 : 0;
 }
+
 
 /**
@@ -1073 +1074 @@
     if (pNode)
     {
-        RTUINT      cchName = strlen(pszName);
+        size_t      cchName = strlen(pszName);
         PCFGMLEAF   pLeaf = pNode->pFirstLeaf;
         while (pLeaf)
@@ -2516 +2517 @@
      */
     PCFGMLEAF pLeaf;
-    unsigned cchMax = 0;
+    size_t cchMax = 0;
     for (pLeaf = CFGMR3GetFirstValue(pRoot); pLeaf; pLeaf = CFGMR3GetNextValue(pLeaf))
         cchMax = RT_MAX(cchMax, pLeaf->cchName);
@@ -2524 +2525 @@
         {
             case CFGMVALUETYPE_INTEGER:
-                pHlp->pfnPrintf(pHlp, "  %-*s <integer> = %#018llx (%lld)\n", cchMax, pLeaf->szName, pLeaf->Value.Integer.u64, pLeaf->Value.Integer.u64);
+                pHlp->pfnPrintf(pHlp, "  %-*s <integer> = %#018llx (%lld)\n", (int)cchMax, pLeaf->szName, pLeaf->Value.Integer.u64, pLeaf->Value.Integer.u64);
                 break;
 
             case CFGMVALUETYPE_STRING:
-                pHlp->pfnPrintf(pHlp, "  %-*s <string>  = \"%s\" (cch=%d)\n", cchMax, pLeaf->szName, pLeaf->Value.String.psz, pLeaf->Value.String.cch);
+                pHlp->pfnPrintf(pHlp, "  %-*s <string>  = \"%s\" (cch=%d)\n", (int)cchMax, pLeaf->szName, pLeaf->Value.String.psz, pLeaf->Value.String.cch);
                 break;
 
             case CFGMVALUETYPE_BYTES:
-                pHlp->pfnPrintf(pHlp, "  %-*s <bytes>   = \"%.*Rhxs\" (cb=%d)\n", cchMax, pLeaf->szName, pLeaf->Value.Bytes.cb, pLeaf->Value.Bytes.pau8, pLeaf->Value.Bytes.cb);
+                pHlp->pfnPrintf(pHlp, "  %-*s <bytes>   = \"%.*Rhxs\" (cb=%d)\n", (int)cchMax, pLeaf->szName, pLeaf->Value.Bytes.cb, pLeaf->Value.Bytes.pau8, pLeaf->Value.Bytes.cb);
                 break;
 

trunk/src/VBox/VMM/CFGMInternal.h

@@ -49 +49 @@
     {
         /** Length of string. (In bytes, including the terminator.) */
-        RTUINT          cch;
+        size_t          cch;
         /** Pointer to the string. */
         char           *psz;
@@ -58 +58 @@
     {
         /** Length of byte string. (in bytes) */
-        RTUINT          cb;
+        size_t          cb;
         /** Pointer to the byte string. */
         uint8_t        *pau8;
@@ -83 +83 @@
 
     /** Name length. (exclusive) */
-    RTUINT          cchName;
+    size_t          cchName;
     /** Name. */
     char            szName[1];
@@ -114 +114 @@
 
     /** Name length. (exclusive) */
-    RTUINT          cchName;
+    size_t          cchName;
     /** Name. */
     char            szName[1];

trunk/src/VBox/VMM/PDMDevice.cpp

@@ -496 +496 @@
         if (rc == VERR_CFGM_NOT_ENOUGH_SPACE)
         {
-            AssertMsgFailed(("configuration error: The module name is too long, cchName=%d.\n", CFGMR3GetNameLen(pCur)));
+            AssertMsgFailed(("configuration error: The module name is too long, cchName=%zu.\n", CFGMR3GetNameLen(pCur)));
             return VERR_PDM_MODULE_NAME_TOO_LONG;
         }

trunk/src/VBox/VMM/PDMDriver.cpp

@@ -175 +175 @@
         if (rc == VERR_CFGM_NOT_ENOUGH_SPACE)
         {
-            AssertMsgFailed(("configuration error: The module name is too long, cchName=%d.\n", CFGMR3GetNameLen(pCur)));
+            AssertMsgFailed(("configuration error: The module name is too long, cchName=%zu.\n", CFGMR3GetNameLen(pCur)));
             return VERR_PDM_MODULE_NAME_TOO_LONG;
         }