Changeset 36219 in vbox for trunk/include/VBox/HostServices

Timestamp:

Mar 9, 2011 10:57:28 AM (14 years ago)

Author:

vboxsync

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

70433

Message:

Addressed some guest property (transient reset) todos.

File:

• trunk/include/VBox/HostServices/GuestPropertySvc.h (modified) (5 diffs)

trunk/include/VBox/HostServices/GuestPropertySvc.h

@@ -60 +60 @@
 {
     NILFLAG          = 0,
+    /** Transient until VM gets shut down. */
     TRANSIENT        = RT_BIT(1),
     RDONLYGUEST      = RT_BIT(2),
     RDONLYHOST       = RT_BIT(3),
-    /** Transient until VM gets a reset / restarts. */
-    TRANSIENT_RESET  = RT_BIT(4),
+    /** Transient until VM gets a reset / restarts.
+     *  Implies TRANSIENT. */
+    TRANSRESET       = RT_BIT(4),
     READONLY         = RDONLYGUEST | RDONLYHOST,
-    ALLFLAGS         = TRANSIENT | READONLY | TRANSIENT_RESET
+    ALLFLAGS         = TRANSIENT | READONLY | TRANSRESET
 };
 
@@ -87 +89 @@
         case READONLY:
             return "READONLY";
-/** @todo r=bird: TRANSIENT_RESET is inconsistent with the other constants
- *        in that it uses '_' and rather long (RDONLYGUEST would be
- *        READONLY_GUEST if '_' was used). Michael, any suggestions how to
- *        shorten it? */
-        case TRANSIENT_RESET:
-            return "TRANSIENT_RESET";
+        case TRANSRESET:
+            return "TRANSRESET";
         default:
             break;
@@ -115 +113 @@
  * RDONLYGUEST, RDONLYHOST and RDONLY
  */
-/** @todo r=bird: Michael, where to do enforce the "only every return one of
- *        R*"? I cannot see it? */
-/** @todo r=bird: Should TRANSIENT_RESET imply TRANSIENT or not? See
- *        VBoxServicePropCache.cpp.  You've introduced (or maybe just made an
- *        existing one more obvious - see abouve) a buffer overrun in
- *        writeFlags now. */
-enum { MAX_FLAGS_LEN =   sizeof("TRANSIENT_RESET, RDONLYGUEST") };
+enum { MAX_FLAGS_LEN =   sizeof("TRANSRESET","RDONLYGUEST") };
 
 /**
@@ -138 +130 @@
     static const uint32_t s_aFlagList[] =
     {
-        /*
-         * Note: TRANSIENT_RESET must come before TRANSIENT because
-         * otherwise the RTStrNICmp with the flagNameLen parameter would
-         * fail below.
-         */
-        TRANSIENT_RESET, TRANSIENT, READONLY, RDONLYGUEST, RDONLYHOST
+        TRANSIENT, READONLY, RDONLYGUEST, RDONLYHOST, TRANSRESET
     };
     const char *pcszNext = pcszFlags;
@@ -194 +181 @@
     static const uint32_t s_aFlagList[] =
     {
-        TRANSIENT_RESET, TRANSIENT, READONLY, RDONLYGUEST, RDONLYHOST
+        TRANSIENT, READONLY, RDONLYGUEST, RDONLYHOST, TRANSRESET
     };
     char *pszNext = pszFlags;