Changeset 26296 in vbox for trunk/src/VBox

Timestamp:

Feb 5, 2010 2:53:35 PM (15 years ago)

Author:

vboxsync

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

57365

Message:

more warnings.

Location:

trunk/src/VBox

Files:

• Devices/Network/DevPCNet.cpp (modified) (1 diff)
• Devices/Network/testcase/tstIntNetR0.cpp (modified) (2 diffs)
• Devices/Storage/testcase/vditool.cpp (modified) (1 diff)
• Disassembler/DisasmTest.cpp (modified) (2 diffs)
• Disassembler/DisasmTestCore.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/extensions/QIWizard.cpp (modified) (1 diff)
• HostServices/SharedClipboard/x11-clipboard.cpp (modified) (5 diffs)
• Main/MediumImpl.cpp (modified) (2 diffs)
• Main/include/AutoStateDep.h (modified) (1 diff)
• Main/linux/HostHardwareLinux.cpp (modified) (4 diffs)
• Main/xml/Settings.cpp (modified) (1 diff)
• Runtime/testcase/tstLdr-2.cpp (modified) (2 diffs)
• Runtime/testcase/tstLdr-3.cpp (modified) (1 diff)
• Runtime/testcase/tstRTAvl.cpp (modified) (1 diff)
• VMM/PATM/VMMAll/PATMAll.cpp (modified) (1 diff)
• VMM/PATM/VMMGC/CSAMGC.cpp (modified) (3 diffs)
• VMM/PATM/VMMGC/PATMGC.cpp (modified) (4 diffs)
• VMM/VMMR0/HWVMXR0.cpp (modified) (1 diff)
• VMM/testcase/tstCompiler.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Network/DevPCNet.cpp

@@ -2826 +2826 @@
             }
         case 15: /* Mode */
-            if ((pThis->aCSR[15] & 0x8000) != (val & 0x8000) && pThis->pDrv)
+            if ((pThis->aCSR[15] & 0x8000) != (uint16_t)(val & 0x8000) && pThis->pDrv)
             {
                 Log(("#%d: promiscuous mode changed to %d\n", PCNET_INST_NR, !!(val & 0x8000)));

trunk/src/VBox/Devices/Network/testcase/tstIntNetR0.cpp

@@ -560 +560 @@
                             if (!g_cErrors)
                             {
-                                ARGS Args0 = {0};
+                                ARGS Args0;
+                                RT_ZERO(Args0);
                                 Args0.hIf = hIf0;
                                 Args0.pBuf = pBuf0;
@@ -568 +569 @@
                                 Args0.Mac.au16[2] = 0;
 
-                                ARGS Args1 = {0};
+                                ARGS Args1;
+                                RT_ZERO(Args1);
                                 Args1.hIf = hIf1;
                                 Args1.pBuf = pBuf1;

trunk/src/VBox/Devices/Storage/testcase/vditool.cpp

@@ -112 +112 @@
         return PrintDone(rc);
 
-    PDMMEDIAGEOMETRY geo = { 0 }; /* auto-detect */
+    PDMMEDIAGEOMETRY geo = { 0, 0, 0 }; /* auto-detect */
     rc = VDCreateBase(hdd, "vdi", pszUtf8Filename,
                       (uint64_t)cMBs * _1M,

trunk/src/VBox/Disassembler/DisasmTest.cpp

@@ -46 +46 @@
     else
     {
-        RTUINTPTR pInstr = (RTUINTPTR)TestProc;
+        RTUINTPTR pInstr = (uintptr_t)TestProc;
 
         for (int i=0;i<50;i++)
@@ -70 +70 @@
 #ifndef RT_OS_OS2
         printf("\n64 bits disassembly\n");
-        pInstr = (RTUINTPTR)TestProc64;
+        pInstr = (uintptr_t)TestProc64;
 
 ////__debugbreak();

trunk/src/VBox/Disassembler/DisasmTestCore.cpp

@@ -44 +44 @@
         DISCPUSTATE cpu;
         cpu.mode = CPUMODE_32BIT;
-        if (DISCoreOne(&cpu, (RTUINTPTR)&DISCoreOne, &cb))
+        if (DISCoreOne(&cpu, (uintptr_t)&DISCoreOne, &cb))
             printf("ok %d\n", cpu.addrmode);
         else

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIWizard.cpp

@@ -47 +47 @@
 
     /* Calculating nearest 'golden ratio' width. */
-    int iGoldRatioWidth = sqrt(1.61 * width() * height());
+    int iGoldRatioWidth = (int)sqrt(1.61 * width() * height());
     int iNewLabelWidth = iGoldRatioWidth - iLabelDelta;
     resizeAccordingLabelWidth(iNewLabelWidth);

trunk/src/VBox/HostServices/SharedClipboard/x11-clipboard.cpp

@@ -53 +53 @@
      * the backend is responsible for ensuring that this does not happen. */
     VBOXCLIPBOARDREQFROMVBOX *pReq;
-    
+
     /** Pointer to the opaque X11 backend structure */
     CLIPBACKEND *pBackend;
@@ -222 +222 @@
  *         freed in ClipCompleteDataRequestFromX11 when it is called back from
  *         the backend code.
- *         
+ *
  */
 int vboxClipboardReadData (VBOXCLIPBOARDCLIENTDATA *pClient,
@@ -230 +230 @@
     LogRelFlowFunc(("pClient=%p, u32Format=%02X, pv=%p, cb=%u, pcbActual=%p",
                  pClient, u32Format, pv, cb, pcbActual));
-    
+
     int rc = VINF_SUCCESS;
     CLIPREADCBREQ *pReq = (CLIPREADCBREQ *) RTMemAlloc(sizeof(CLIPREADCBREQ));
@@ -357 +357 @@
                                    uint32_t *pcb)
 {
-    VBOXCLIPBOARDREQFROMVBOX request = { NULL };
+    VBOXCLIPBOARDREQFROMVBOX request = { NULL, 0, 0, NIL_RTSEMEVENT };
 
     LogRelFlowFunc(("pCtx=%p, u32Format=%02X, ppv=%p, pcb=%p\n", pCtx,
@@ -413 +413 @@
                 pReq->cb = cb;
                 pReq->format = u32Format;
-            }            
+            }
         }
         /* Signal that the request has been completed. */

trunk/src/VBox/Main/MediumImpl.cpp

@@ -4949 +4949 @@
             if (FAILED(rc)) throw rc;
 
-            PDMMEDIAGEOMETRY geo = { 0 }; /* auto-detect */
+            PDMMEDIAGEOMETRY geo = { 0, 0, 0 }; /* auto-detect */
 
             vrc = VDCreateBase(hdd,
@@ -5501 +5501 @@
     ComObjPtr<Medium> &pParent = task.d.parentDisk;
 
-    bool fCreatingTarget;
+    bool fCreatingTarget; /** @todo warning: 'fCreatingTarget' might be used uninitialized in this function */
 
     uint64_t size = 0, logicalSize = 0;

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

@@ -164 +164 @@
 
 #endif // ____H_AUTOSTATEDEP
+

trunk/src/VBox/Main/linux/HostHardwareLinux.cpp

@@ -325 +325 @@
     AssertPtrNullReturn(pchModel, VERR_INVALID_POINTER);
 
-    unsigned char u8Response[96] = { 0 };
-    struct cdrom_generic_command CdromCommandReq =
-    { { INQUIRY, 0, 0, 0, sizeof(u8Response), 0 }  /* INQUIRY */ };
-    int rc, rcIoCtl = 0;
-    RTFILE file;
-    rc = RTFileOpen(&file, pcszNode, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE | RTFILE_O_NON_BLOCK);
+    RTFILE hFile;
+    int rc = RTFileOpen(&hFile, pcszNode, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE | RTFILE_O_NON_BLOCK);
     if (RT_SUCCESS(rc))
     {
-        CdromCommandReq.buffer = u8Response;
-        CdromCommandReq.buflen = sizeof(u8Response);
+        int                             rcIoCtl        = 0;
+        unsigned char                   u8Response[96] = { 0 };
+        struct cdrom_generic_command    CdromCommandReq;
+        RT_ZERO(CdromCommandReq);
+        CdromCommandReq.cmd[0]         = INQUIRY;
+        CdromCommandReq.cmd[4]         = sizeof(u8Response);
+        CdromCommandReq.buffer         = u8Response;
+        CdromCommandReq.buflen         = sizeof(u8Response);
         CdromCommandReq.data_direction = CGC_DATA_READ;
-        CdromCommandReq.timeout = 5000;  /* ms */
-        rc = RTFileIoCtl(file, CDROM_SEND_PACKET, &CdromCommandReq, 0,
-                         &rcIoCtl);
+        CdromCommandReq.timeout        = 5000;  /* ms */
+        rc = RTFileIoCtl(hFile, CDROM_SEND_PACKET, &CdromCommandReq, 0, &rcIoCtl);
         if (RT_SUCCESS(rc) && rcIoCtl < 0)
             rc = RTErrConvertFromErrno(-CdromCommandReq.stat);
-        RTFileClose(file);
-    }
-    if (RT_SUCCESS(rc))
-    {
-        if (pu8Type)
-            *pu8Type = u8Response[0] & 0x1f;
-        if (pchVendor)
-            RTStrPrintf(pchVendor, cchVendor, "%.8s",
-                        (char *) &u8Response[8] /* vendor id string */);
-        if (pchModel)
-            RTStrPrintf(pchModel, cchModel, "%.16s",
-                        (char *) &u8Response[16] /* product id string */);
+        RTFileClose(hFile);
+
+        if (RT_SUCCESS(rc))
+        {
+            if (pu8Type)
+                *pu8Type = u8Response[0] & 0x1f;
+            if (pchVendor)
+                RTStrPrintf(pchVendor, cchVendor, "%.8s",
+                            &u8Response[8] /* vendor id string */);
+            if (pchModel)
+                RTStrPrintf(pchModel, cchModel, "%.16s",
+                            &u8Response[16] /* product id string */);
+            LogRelFlowFunc(("returning success: type=%u, vendor=%.8s, product=%.16s\n",
+                            u8Response[0] & 0x1f, &u8Response[8], &u8Response[16]));
+            return VINF_SUCCESS;
+        }
     }
     LogRelFlowFunc(("returning %Rrc\n", rc));
-    if (RT_SUCCESS(rc))
-        LogRelFlowFunc(("    type=%u, vendor=%.8s, product=%.16s\n",
-                        u8Response[0] & 0x1f, (char *) &u8Response[8],
-                        (char *) &u8Response[16]));
     return rc;
 }
@@ -801 +802 @@
                   pList, (unsigned) isDVD, pfSuccess));
     PRTDIR pDir = NULL;
-    RTDIRENTRY entry = {0};
     int rc;
     bool fSuccess = false;
@@ -813 +813 @@
     fSuccess = true;
     if (RT_SUCCESS(rc))
-        while (true)
-        {
+        for (;;)
+        {
+            RTDIRENTRY entry;
             rc = RTDirRead(pDir, &entry, NULL);
             Assert(rc != VERR_BUFFER_OVERFLOW);  /* Should never happen... */
@@ -989 +990 @@
     bool success = false;
 
-    deviceNodeArray aDevices = { { 0 } };
     char szPath[RTPATH_MAX] = "/dev";
+    deviceNodeArray aDevices;
+    RT_ZERO(aDevices);
     devFindDeviceRecursive(szPath, sizeof(szPath), aDevices, isDVD);
     try

trunk/src/VBox/Main/xml/Settings.cpp

@@ -394 +394 @@
                )
             {
-                RTTIME time = { yyyy,
-                                (uint8_t)mm,
-                                0,
-                                0,
-                                (uint8_t)dd,
-                                (uint8_t)hh,
-                                (uint8_t)min,
-                                (uint8_t)secs,
-                                0,
-                                RTTIME_FLAGS_TYPE_UTC };
+                RTTIME time =
+                {
+                    yyyy,
+                    (uint8_t)mm,
+                    0,
+                    0,
+                    (uint8_t)dd,
+                    (uint8_t)hh,
+                    (uint8_t)min,
+                    (uint8_t)secs,
+                    0,
+                    RTTIME_FLAGS_TYPE_UTC,
+                    0
+                };
                 if (RTTimeNormalize(&time))
                     if (RTTimeImplode(&timestamp, &time))

trunk/src/VBox/Runtime/testcase/tstLdr-2.cpp

@@ -126 +126 @@
                         memset(&Cpu, 0, sizeof(Cpu));
                         Cpu.mode = CPUMODE_32BIT;
-                        if (MyDisBlock(&Cpu, (RTUINTPTR)pvBits + off, 200, Addr - (uintptr_t)pvBits))
+                        if (MyDisBlock(&Cpu, (uintptr_t)pvBits + off, 200, Addr - (uintptr_t)pvBits))
                         {
                             RTUINTPTR Addr2 = 0xd0000000;
@@ -132 +132 @@
                             if (RT_SUCCESS(rc))
                             {
-                                if (MyDisBlock(&Cpu, (RTUINTPTR)pvBits + off, 200, Addr2 - (uintptr_t)pvBits))
+                                if (MyDisBlock(&Cpu, (uintptr_t)pvBits + off, 200, Addr2 - (uintptr_t)pvBits))
                                     rcRet = 0;
                                 else

trunk/src/VBox/Runtime/testcase/tstLdr-3.cpp

@@ -199 +199 @@
             for (int i = 3; i < argc; i++)
             {
-                TESTNEARSYM NearSym = {0};
+                TESTNEARSYM NearSym;
+                RT_ZERO(NearSym);
                 NearSym.Addr = (RTUINTPTR)RTStrToUInt64(argv[i]);
                 NearSym.aSyms[1].Value = ~(RTUINTPTR)0;

trunk/src/VBox/Runtime/testcase/tstRTAvl.cpp

@@ -841 +841 @@
         AVLROGCPHYSTREE     Tree;
         AVLROGCPHYSNODECORE aNode[4];
-    } s1 = {0}, s2 = {0}, s3 = {0};
+    }   s1, s2, s3;
+    RT_ZERO(s1);
+    RT_ZERO(s2);
+    RT_ZERO(s3);
 
     s1.aNode[0].Key        = 0x00030000;

trunk/src/VBox/VMM/PATM/VMMAll/PATMAll.cpp

@@ -391 +391 @@
             ||  (pRegFrame->cs & X86_SEL_RPL) != 3
             ||  pVM->patm.s.pfnSysEnterPatchGC == 0
-            ||  pVM->patm.s.pfnSysEnterGC != (RTRCPTR)pCtx->SysEnter.eip
+            ||  pVM->patm.s.pfnSysEnterGC != (RTRCPTR)(RTRCUINTPTR)pCtx->SysEnter.eip
             ||  !(PATMRawGetEFlags(pVM, pRegFrame) & X86_EFL_IF))
             goto end;

trunk/src/VBox/VMM/PATM/VMMGC/CSAMGC.cpp

@@ -91 +91 @@
         rc = PGMShwModifyPage(pVCpu, pvFault, 1, X86_PTE_RW, ~(uint64_t)X86_PTE_RW);
         AssertMsgRC(rc, ("PGMShwModifyPage -> rc=%Rrc\n", rc));
-        ASMInvalidatePage((void *)pvFault);
+        ASMInvalidatePage((void *)(uintptr_t)pvFault);
         return VINF_SUCCESS;
     }
@@ -121 +121 @@
 
     /* Note that pvFault might be a different address in case of aliases. So use pvRange + offset instead!. */
-    pVM->csam.s.pvDirtyBasePage[pVM->csam.s.cDirtyPages] = (RTRCPTR)((RTGCUINTPTR)pvRange + offRange);
-    pVM->csam.s.pvDirtyFaultPage[pVM->csam.s.cDirtyPages] = (RTRCPTR)((RTGCUINTPTR)pvRange + offRange);
+    pVM->csam.s.pvDirtyBasePage[pVM->csam.s.cDirtyPages] = (RTRCPTR)((RTRCUINTPTR)pvRange + offRange);
+    pVM->csam.s.pvDirtyFaultPage[pVM->csam.s.cDirtyPages] = (RTRCPTR)((RTRCUINTPTR)pvRange + offRange);
     if (++pVM->csam.s.cDirtyPages == CSAM_MAX_DIRTY_PAGES)
         return VINF_CSAM_PENDING_ACTION;
@@ -132 +132 @@
     rc = PGMShwModifyPage(pVCpu, pvFault, 1, X86_PTE_RW, ~(uint64_t)X86_PTE_RW);
     AssertMsgRC(rc, ("PGMShwModifyPage -> rc=%Rrc\n", rc));
-    ASMInvalidatePage((void *)pvFault);
+    ASMInvalidatePage((void *)(uintptr_t)pvFault);
 
     STAM_COUNTER_INC(&pVM->csam.s.StatCodePageModified);

trunk/src/VBox/VMM/PATM/VMMGC/PATMGC.cpp

@@ -63 +63 @@
 VMMRCDECL(int) PATMGCMonitorPage(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange)
 {
-    pVM->patm.s.pvFaultMonitor = (RTRCPTR)pvFault;
+    pVM->patm.s.pvFaultMonitor = (RTRCPTR)(RTRCUINTPTR)pvFault;
     return VINF_PATM_CHECK_PATCH_PAGE;
 }
@@ -92 +92 @@
     STAM_PROFILE_ADV_START(&pVM->patm.s.StatPatchWriteDetect, a);
 
-    pWritePageStart = (RTGCUINTPTR)GCPtr & PAGE_BASE_GC_MASK;
-    pWritePageEnd   = ((RTGCUINTPTR)GCPtr + cbWrite - 1) & PAGE_BASE_GC_MASK;
+    pWritePageStart = (RTRCUINTPTR)GCPtr & PAGE_BASE_GC_MASK;
+    pWritePageEnd   = ((RTRCUINTPTR)GCPtr + cbWrite - 1) & PAGE_BASE_GC_MASK;
 
     pPatchPage = (PPATMPATCHPAGE)RTAvloU32Get(CTXSUFF(&pVM->patm.s.PatchLookupTree)->PatchTreeByPage, (AVLOU32KEY)pWritePageStart);
@@ -110 +110 @@
     if (pPatchPage)
     {
-        if (    pPatchPage->pLowestAddrGC  > (RTRCPTR)((RTGCUINTPTR)GCPtr + cbWrite - 1)
+        if (    pPatchPage->pLowestAddrGC  > (RTRCPTR)((RTRCUINTPTR)GCPtr + cbWrite - 1)
             ||  pPatchPage->pHighestAddrGC < (RTRCPTR)GCPtr)
         {
@@ -516 +516 @@
                 return VINF_EM_RAW_EMULATE_INSTR;
             }
-            rc = DISCoreOne(&cpu, (RTUINTPTR)&pRec->patch.aPrivInstr[0], &cbOp);
+            rc = DISCoreOne(&cpu, (uintptr_t)&pRec->patch.aPrivInstr[0], &cbOp);
             if (RT_FAILURE(rc))
             {

trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp

@@ -2262 +2262 @@
     int         rc = VINF_SUCCESS;
     RTGCUINTREG val;
-    RTGCUINTREG exitReason = VMX_EXIT_INVALID;
+    RTGCUINTREG exitReason = (RTGCUINTREG)VMX_EXIT_INVALID;
     RTGCUINTREG instrError, cbInstr;
     RTGCUINTPTR exitQualification = 0;

trunk/src/VBox/VMM/testcase/tstCompiler.cpp

@@ -201 +201 @@
 {
     RTPrintf("tstBitFields: Disassembly of %s:\n", pszName);
-    RTUINTPTR uCur = (RTUINTPTR)pv;
+    RTUINTPTR uCur = (uintptr_t)pv;
     RTUINTPTR uCurMax = uCur + 256;
     DISCPUSTATE Cpu;
@@ -218 +218 @@
         else
         {
-            RTPrintf("tstBitFields: %p: %02x - DISInstr failed!\n", uCur, *(uint8_t *)uCur);
+            RTPrintf("tstBitFields: %p: %02x - DISInstr failed!\n", uCur, *(uint8_t *)(uintptr_t)uCur);
             uCur += 1;
         }