Changeset 77727 in vbox for trunk/src/VBox

Timestamp:

Mar 15, 2019 2:14:18 PM (6 years ago)

Author:

vboxsync

Message:

IPRT,HostDrivers: Fixed some warnings.

Location:

trunk/src/VBox

Files:

• HostDrivers/Support/SUPDrv.cpp (modified) (1 diff)
• HostDrivers/Support/SUPDrvGip.cpp (modified) (5 diffs)
• HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c (modified) (1 diff)
• HostDrivers/VBoxPci/VBoxPci.c (modified) (7 diffs)
• Runtime/common/log/log.cpp (modified) (2 diffs)
• Runtime/common/table/avlpv.cpp (modified) (1 diff)
• Runtime/include/internal/initterm.h (modified) (1 diff)
• Runtime/r0drv/linux/alloc-r0drv-linux.c (modified) (1 diff)
• Runtime/r0drv/linux/initterm-r0drv-linux.c (modified) (1 diff)
• Runtime/r0drv/linux/memobj-r0drv-linux.c (modified) (1 diff)
• Runtime/r0drv/linux/timer-r0drv-linux.c (modified) (2 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDrv.cpp

@@ -4487 +4487 @@
  * @param   puRevision      Where to store the microcode revision.
  */
-int VBOXCALL supdrvQueryUcodeRev(uint32_t *puRevision)
+static int VBOXCALL supdrvQueryUcodeRev(uint32_t *puRevision)
 {
     int  rc = VERR_UNSUPPORTED_CPU;

trunk/src/VBox/HostDrivers/Support/SUPDrvGip.cpp

@@ -1013 +1013 @@
  *      the measurements on.}
  */
-DECLCALLBACK(void) supdrvGipInitReadTscAndNanoTsOnCpu(RTCPUID idCpu, void *pvUser1, void *pvUser2)
+static DECLCALLBACK(void) supdrvGipInitReadTscAndNanoTsOnCpu(RTCPUID idCpu, void *pvUser1, void *pvUser2)
 {
     RTCCUINTREG fEFlags   = ASMIntDisableFlags();
@@ -3419 +3419 @@
             {
                 /* Read, kick & wait #1. */
-                uint64_t register uTsc = ASMReadTSC();
+                uint64_t uTsc = ASMReadTSC();
                 ASMAtomicWriteU32(&pOtherSync->uSyncVar, GIP_TSC_DELTA_SYNC2_GO_GO);
                 ASMSerializeInstruction();
@@ -3510 +3510 @@
             for (i = 0; i < RT_ELEMENTS(pArgs->uWorker.Verify.auTscs); i += 2)
             {
-                uint64_t register uTsc;
+                uint64_t uTsc;
 
                 /* Wait, Read and Kick #1. */
@@ -4173 +4173 @@
 {
     PSUPDRVDEVEXT     pDevExt = (PSUPDRVDEVEXT)pvUser;
-    uint32_t          cConsecutiveTimeouts = 0;
     int               rc = VERR_INTERNAL_ERROR_2;
     for (;;)
@@ -4225 +4224 @@
             case kTscDeltaThreadState_Measuring:
             {
-                cConsecutiveTimeouts = 0;
                 if (pDevExt->fTscThreadRecomputeAllDeltas)
                 {

trunk/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c

@@ -183 +183 @@
 }
 
-struct net_device_stats *vboxNetAdpLinuxGetStats(struct net_device *pNetDev)
+static struct net_device_stats *vboxNetAdpLinuxGetStats(struct net_device *pNetDev)
 {
     PVBOXNETADPPRIV pPriv = netdev_priv(pNetDev);

trunk/src/VBox/HostDrivers/VBoxPci/VBoxPci.c

@@ -160 +160 @@
 
 
+#if 0 /** @todo r=bird: Who the heck is supposed to call this?!?   */
 DECLHIDDEN(void) vboxPciDevCleanup(PVBOXRAWPCIINS pThis)
 {
@@ -180 +181 @@
     vboxPciGlobalsUnlock(pThis->pGlobals);
 }
+#endif
 
 
@@ -674 +676 @@
 }
 
+
 /**
  * Try to close the IDC connection to SUPDRV if established.
@@ -683 +686 @@
  * @param   pGlobals        Pointer to the globals.
  */
-DECLHIDDEN(int) vboxPciDeleteIdc(PVBOXRAWPCIGLOBALS pGlobals)
+static int vboxPciDeleteIdc(PVBOXRAWPCIGLOBALS pGlobals)
 {
     int rc;
@@ -718 +721 @@
  * @param   pGlobals        Pointer to the globals.
  */
-DECLHIDDEN(int) vboxPciInitGlobals(PVBOXRAWPCIGLOBALS pGlobals)
+static int vboxPciInitGlobals(PVBOXRAWPCIGLOBALS pGlobals)
 {
     /*
@@ -742 +745 @@
  * Deletes the globals.
  *
- *
  * @param   pGlobals        Pointer to the globals.
  */
-DECLHIDDEN(void) vboxPciDeleteGlobals(PVBOXRAWPCIGLOBALS pGlobals)
+static void vboxPciDeleteGlobals(PVBOXRAWPCIGLOBALS pGlobals)
 {
     Assert(!pGlobals->fIDCOpen);
@@ -783 +785 @@
 {
     int rc = vboxPciDeleteIdc(pGlobals);
-
     if (RT_SUCCESS(rc))
         vboxPciDeleteGlobals(pGlobals);

trunk/src/VBox/Runtime/common/log/log.cpp

@@ -3607 +3607 @@
 
 
+/**
+ * stpncpy implementation for use in rtLogOutputPrefixed w/ padding.
+ *
+ * @returns Pointer to the destination buffer byte following the copied string.
+ * @param   pszDst              The destination buffer.
+ * @param   pszSrc              The source string.
+ * @param   cchSrc              The number of characters to copy from the
+ *                              source.  Equal or less than string length.
+ * @param   cchMinWidth         The minimum field with, padd with spaces to
+ *                              reach this.
+ */
+DECLINLINE(char *) rtLogStPNCpyPad2(char *pszDst, const char *pszSrc, size_t cchSrc, size_t cchMinWidth)
+{
+    Assert(pszSrc);
+    Assert(strlen(pszSrc) >= cchSrc);
+
+    memcpy(pszDst, pszSrc, cchSrc);
+    pszDst += cchSrc;
+    do
+        *pszDst++ = ' ';
+    while (cchSrc++ < cchMinWidth);
+
+    return pszDst;
+}
+
+
 
 /**
@@ -3916 +3942 @@
                     const unsigned fGrp = pLogger->afGroups[pArgs->iGroup != ~0U ? pArgs->iGroup : 0];
                     const char *pszGroup;
-                    size_t cch;
+                    size_t cchGroup;
                     switch (pArgs->fFlags & fGrp)
                     {
-                        case 0:                         pszGroup = "--------";  cch = sizeof("--------") - 1; break;
-                        case RTLOGGRPFLAGS_ENABLED:     pszGroup = "enabled" ;  cch = sizeof("enabled" ) - 1; break;
-                        case RTLOGGRPFLAGS_LEVEL_1:     pszGroup = "level 1" ;  cch = sizeof("level 1" ) - 1; break;
-                        case RTLOGGRPFLAGS_LEVEL_2:     pszGroup = "level 2" ;  cch = sizeof("level 2" ) - 1; break;
-                        case RTLOGGRPFLAGS_LEVEL_3:     pszGroup = "level 3" ;  cch = sizeof("level 3" ) - 1; break;
-                        case RTLOGGRPFLAGS_LEVEL_4:     pszGroup = "level 4" ;  cch = sizeof("level 4" ) - 1; break;
-                        case RTLOGGRPFLAGS_LEVEL_5:     pszGroup = "level 5" ;  cch = sizeof("level 5" ) - 1; break;
-                        case RTLOGGRPFLAGS_LEVEL_6:     pszGroup = "level 6" ;  cch = sizeof("level 6" ) - 1; break;
-                        case RTLOGGRPFLAGS_LEVEL_7:     pszGroup = "level 7" ;  cch = sizeof("level 7" ) - 1; break;
-                        case RTLOGGRPFLAGS_LEVEL_8:     pszGroup = "level 8" ;  cch = sizeof("level 8" ) - 1; break;
-                        case RTLOGGRPFLAGS_LEVEL_9:     pszGroup = "level 9" ;  cch = sizeof("level 9" ) - 1; break;
-                        case RTLOGGRPFLAGS_LEVEL_10:    pszGroup = "level 10";  cch = sizeof("level 10") - 1; break;
-                        case RTLOGGRPFLAGS_LEVEL_11:    pszGroup = "level 11";  cch = sizeof("level 11") - 1; break;
-                        case RTLOGGRPFLAGS_LEVEL_12:    pszGroup = "level 12";  cch = sizeof("level 12") - 1; break;
-                        case RTLOGGRPFLAGS_FLOW:        pszGroup = "flow"    ;  cch = sizeof("flow"    ) - 1; break;
-                        case RTLOGGRPFLAGS_WARN:        pszGroup = "warn"    ;  cch = sizeof("warn"    ) - 1; break;
-                        default:                        pszGroup = "????????";  cch = sizeof("????????") - 1; break;
+                        case 0:                         pszGroup = "--------";  cchGroup = sizeof("--------") - 1; break;
+                        case RTLOGGRPFLAGS_ENABLED:     pszGroup = "enabled" ;  cchGroup = sizeof("enabled" ) - 1; break;
+                        case RTLOGGRPFLAGS_LEVEL_1:     pszGroup = "level 1" ;  cchGroup = sizeof("level 1" ) - 1; break;
+                        case RTLOGGRPFLAGS_LEVEL_2:     pszGroup = "level 2" ;  cchGroup = sizeof("level 2" ) - 1; break;
+                        case RTLOGGRPFLAGS_LEVEL_3:     pszGroup = "level 3" ;  cchGroup = sizeof("level 3" ) - 1; break;
+                        case RTLOGGRPFLAGS_LEVEL_4:     pszGroup = "level 4" ;  cchGroup = sizeof("level 4" ) - 1; break;
+                        case RTLOGGRPFLAGS_LEVEL_5:     pszGroup = "level 5" ;  cchGroup = sizeof("level 5" ) - 1; break;
+                        case RTLOGGRPFLAGS_LEVEL_6:     pszGroup = "level 6" ;  cchGroup = sizeof("level 6" ) - 1; break;
+                        case RTLOGGRPFLAGS_LEVEL_7:     pszGroup = "level 7" ;  cchGroup = sizeof("level 7" ) - 1; break;
+                        case RTLOGGRPFLAGS_LEVEL_8:     pszGroup = "level 8" ;  cchGroup = sizeof("level 8" ) - 1; break;
+                        case RTLOGGRPFLAGS_LEVEL_9:     pszGroup = "level 9" ;  cchGroup = sizeof("level 9" ) - 1; break;
+                        case RTLOGGRPFLAGS_LEVEL_10:    pszGroup = "level 10";  cchGroup = sizeof("level 10") - 1; break;
+                        case RTLOGGRPFLAGS_LEVEL_11:    pszGroup = "level 11";  cchGroup = sizeof("level 11") - 1; break;
+                        case RTLOGGRPFLAGS_LEVEL_12:    pszGroup = "level 12";  cchGroup = sizeof("level 12") - 1; break;
+                        case RTLOGGRPFLAGS_FLOW:        pszGroup = "flow"    ;  cchGroup = sizeof("flow"    ) - 1; break;
+                        case RTLOGGRPFLAGS_WARN:        pszGroup = "warn"    ;  cchGroup = sizeof("warn"    ) - 1; break;
+                        default:                        pszGroup = "????????";  cchGroup = sizeof("????????") - 1; break;
                     }
-                    psz = rtLogStPNCpyPad(psz, pszGroup, 16, 8);
+                    psz = rtLogStPNCpyPad2(psz, pszGroup, RT_MIN(cchGroup, 16), 8);
                 }
 #define CCH_PREFIX_16   CCH_PREFIX_15 + 17

trunk/src/VBox/Runtime/common/table/avlpv.cpp

@@ -26 +26 @@
 
 #ifndef NOFILEID
-static const char szFileId[] = "Id: kAVLPVInt.c,v 1.5 2003/02/13 02:02:35 bird Exp $";
+/*static const char szFileId[] = "Id: kAVLPVInt.c,v 1.5 2003/02/13 02:02:35 bird Exp $";*/
 #endif
 

trunk/src/VBox/Runtime/include/internal/initterm.h

@@ -49 +49 @@
 DECLHIDDEN(void) rtR0TermNative(void);
 
+# ifdef RT_OS_LINUX
+/* in alloc-r0drv0-linux.c */
+DECLHIDDEN(void) rtR0MemExecCleanup(void);
+# endif
+
 #endif /* IN_RING0 */
 

trunk/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c

@@ -62 +62 @@
 # include <iprt/errcore.h>
 #endif
+
+#include "internal/initterm.h"
 
 

trunk/src/VBox/Runtime/r0drv/linux/initterm-r0drv-linux.c

@@ -45 +45 @@
 static DECLARE_TASK_QUEUE(g_rtR0LnxWorkQueue);
 #endif
-
-
-/*********************************************************************************************************************************
-*   Internal Functions                                                                                                           *
-*********************************************************************************************************************************/
-/* in alloc-r0drv0-linux.c */
-DECLHIDDEN(void) rtR0MemExecCleanup(void);
 
 

trunk/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c

@@ -140 +140 @@
     {
         default:
-            AssertMsgFailed(("%#x %d\n", fProt, fKernel));
+            AssertMsgFailed(("%#x %d\n", fProt, fKernel)); RT_FALL_THRU();
         case RTMEM_PROT_NONE:
             return PAGE_NONE;

trunk/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c

@@ -545 +545 @@
 
             default:
-                AssertMsgFailed(("%d\n", enmState));
+                AssertMsgFailed(("%d\n", enmState)); RT_FALL_THRU();
             case RTTIMERLNXSTATE_STARTING:
             case RTTIMERLNXSTATE_MP_STARTING:
@@ -597 +597 @@
             case RTTIMERLNXSTATE_CB_RESTARTING:
             case RTTIMERLNXSTATE_CB_DESTROYING:
-                AssertMsgFailed(("%d\n", enmState));
+                AssertMsgFailed(("%d\n", enmState)); RT_FALL_THRU();
             default:
                 return false;