Changeset 62448 in vbox for trunk/src/VBox/Runtime/generic

Timestamp:

Jul 22, 2016 2:51:49 PM (9 years ago)

Author:

vboxsync

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

109001

Message:

IPRT: More MSC level 4 warning fixes.

Location:

trunk/src/VBox/Runtime/generic

Files:

• RTPathIsSame-generic.cpp (modified) (1 diff)
• critsectrw-generic.cpp (modified) (4 diffs)
• env-generic.cpp (modified) (1 diff)
• semrw-generic.cpp (modified) (1 diff)
• timerlr-generic.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/generic/RTPathIsSame-generic.cpp

@@ -52 +52 @@
      * If the files exist, try use the attributes.
      */
-    RTFSOBJINFO ObjInfo1, ObjInfo2;
+    RTFSOBJINFO ObjInfo1;
     int rc = RTPathQueryInfoEx(pszPath1, &ObjInfo1, RTFSOBJATTRADD_UNIX, RTPATH_F_ON_LINK);
     if (RT_SUCCESS(rc))
+    {
+        RTFSOBJINFO ObjInfo2;
         rc = RTPathQueryInfoEx(pszPath2, &ObjInfo2, RTFSOBJATTRADD_UNIX, RTPATH_F_ON_LINK);
-    if (RT_SUCCESS(rc))
-    {
-        if ((ObjInfo1.Attr.fMode & RTFS_TYPE_MASK) != (ObjInfo2.Attr.fMode & RTFS_TYPE_MASK))
-            return false;
-        if (ObjInfo1.Attr.u.Unix.INodeIdDevice       != ObjInfo2.Attr.u.Unix.INodeIdDevice)
-            return false;
-        if (ObjInfo1.Attr.u.Unix.INodeId             != ObjInfo2.Attr.u.Unix.INodeId)
-            return false;
-        if (ObjInfo1.Attr.u.Unix.GenerationId        != ObjInfo2.Attr.u.Unix.GenerationId)
-            return false;
-        if (   ObjInfo1.Attr.u.Unix.INodeIdDevice != 0
-            && ObjInfo1.Attr.u.Unix.INodeId       != 0)
-            return true;
+        if (RT_SUCCESS(rc))
+        {
+            if ((ObjInfo1.Attr.fMode & RTFS_TYPE_MASK) != (ObjInfo2.Attr.fMode & RTFS_TYPE_MASK))
+                return false;
+            if (ObjInfo1.Attr.u.Unix.INodeIdDevice       != ObjInfo2.Attr.u.Unix.INodeIdDevice)
+                return false;
+            if (ObjInfo1.Attr.u.Unix.INodeId             != ObjInfo2.Attr.u.Unix.INodeId)
+                return false;
+            if (ObjInfo1.Attr.u.Unix.GenerationId        != ObjInfo2.Attr.u.Unix.GenerationId)
+                return false;
+            if (   ObjInfo1.Attr.u.Unix.INodeIdDevice != 0
+                && ObjInfo1.Attr.u.Unix.INodeId       != 0)
+                return true;
+        }
     }
 

trunk/src/VBox/Runtime/generic/critsectrw-generic.cpp

@@ -575 +575 @@
         uint32_t cNestings = ASMAtomicIncU32(&pThis->cWriteRecursions); NOREF(cNestings);
 
+#ifdef IPRT_WITH_DTRACE
         if (IPRT_CRITSECTRW_EXCL_ENTERED_ENABLED())
         {
@@ -582 +583 @@
                                          (uint32_t)((u64State & RTCSRW_CNT_WR_MASK) >> RTCSRW_CNT_WR_SHIFT));
         }
+#endif
         return VINF_SUCCESS;
     }
@@ -879 +881 @@
 #endif
         uint32_t cNestings = ASMAtomicDecU32(&pThis->cWriteRecursions); NOREF(cNestings);
+#ifdef IPRT_WITH_DTRACE
         if (IPRT_CRITSECTRW_EXCL_LEAVING_ENABLED())
         {
@@ -886 +889 @@
                                          (uint32_t)((u64State & RTCSRW_CNT_WR_MASK) >> RTCSRW_CNT_WR_SHIFT));
         }
+#endif
     }
 

trunk/src/VBox/Runtime/generic/env-generic.cpp

@@ -235 +235 @@
     const char * const *papszEnv;
 #ifdef RTENV_HAVE_WENVIRON
-    PCRTUTF16 const * papwszEnv;
+    PCRTUTF16 const * papwszEnv = NULL;
 #endif
     PRTENVINTERNAL pIntEnvToClone;

trunk/src/VBox/Runtime/generic/semrw-generic.cpp

@@ -203 +203 @@
              */
             ASMAtomicWriteU32(&pThis->u32Magic, ~RTSEMRW_MAGIC);
-            pThis->cReads = ~0;
+            pThis->cReads = UINT32_MAX;
 
             /*

trunk/src/VBox/Runtime/generic/timerlr-generic.cpp

@@ -262 +262 @@
         ASMAtomicWriteU64(&pThis->u64NextTS, u64Now);
         ASMAtomicWriteU64(&pThis->u64NanoInterval, u64NanoInterval);
-        int rc = RTSemEventSignal(pThis->hEvent);
+        RTSemEventSignal(pThis->hEvent);
     }