Changeset 55956 in vbox

Timestamp:

May 20, 2015 12:14:28 AM (10 years ago)

Author:

vboxsync

Message:

VBox/vd.h: Removed what to me seemed like excessive prediction (RT_UNLIKELY) in VDOpenFlagsToFileOpenFlags. Reordered an if, though, but no RT_LIKELEY.

File:

• trunk/include/VBox/vd.h (modified) (2 diffs)

trunk/include/VBox/vd.h

@@ -265 +265 @@
  *
  * @return  RTFile open flags.
- * @param   uOpenFlags      VD_OPEN_FLAGS_* open flags.
+ * @param   fOpenFlags      VD_OPEN_FLAGS_* open flags.
  * @param   fCreate         Flag that the file should be created.
  */
-DECLINLINE(uint32_t) VDOpenFlagsToFileOpenFlags(unsigned uOpenFlags, bool fCreate)
+DECLINLINE(uint32_t) VDOpenFlagsToFileOpenFlags(unsigned fOpenFlags, bool fCreate)
 {
-    AssertMsg(!((uOpenFlags & VD_OPEN_FLAGS_READONLY) && fCreate), ("Image can't be opened readonly while being created\n"));
-
-    uint32_t fOpen = 0;
-
-    if (RT_UNLIKELY(uOpenFlags & VD_OPEN_FLAGS_READONLY))
-        fOpen |= RTFILE_O_READ | RTFILE_O_DENY_NONE;
+    AssertMsg(!(fOpenFlags & VD_OPEN_FLAGS_READONLY) || !fCreate, ("Image can't be opened readonly while being created\n"));
+
+    uint32_t fOpen;
+    if (fOpenFlags & VD_OPEN_FLAGS_READONLY)
+        fOpen = RTFILE_O_READ | RTFILE_O_DENY_NONE;
     else
     {
-        fOpen |= RTFILE_O_READWRITE;
-
-        if (RT_UNLIKELY(uOpenFlags & VD_OPEN_FLAGS_SHAREABLE))
+        fOpen = RTFILE_O_READWRITE;
+
+        if (fOpenFlags & VD_OPEN_FLAGS_SHAREABLE)
             fOpen |= RTFILE_O_DENY_NONE;
         else
@@ -286 +285 @@
     }
 
-    if (RT_UNLIKELY(fCreate))
+    if (!fCreate)
+        fOpen |= RTFILE_O_OPEN;
+    else
         fOpen |= RTFILE_O_CREATE | RTFILE_O_NOT_CONTENT_INDEXED;
-    else
-        fOpen |= RTFILE_O_OPEN;
 
     return fOpen;