Changeset 14579 in vbox for trunk/src/VBox/Main/include

Timestamp:

Nov 25, 2008 3:59:35 PM (16 years ago)

Author:

vboxsync

Message:

Main: VirtualBoxBase::addCaller() now returns E_ACCESSDENIED. Also replaced E_UNEXPECTED with E_FAIL in all Assert* statements (for consistency).

Location:

trunk/src/VBox/Main/include

Files:

• ProgressImpl.h (modified) (1 diff)
• VirtualBoxBase.h (modified) (4 diffs)

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

@@ -298 +298 @@
         /* Enclose the state transition NotReady->InInit->Ready */
         AutoInitSpan autoInitSpan (this);
-        AssertReturn (autoInitSpan.isOk(), E_UNEXPECTED);
+        AssertReturn (autoInitSpan.isOk(), E_FAIL);
 
         mProgresses = ProgressVector (aFirstProgress, aLastProgress);

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

@@ -366 +366 @@
  *
  *  When this object is not ready, the macro sets error info and returns
- *  E_UNEXPECTED (the translatable error message is defined in null context).
+ *  E_ACCESSDENIED (the translatable error message is defined in null context).
  *  Otherwise, the macro does nothing.
  *
@@ -376 +376 @@
     do { \
         if (!isReady()) \
-            return setError (E_UNEXPECTED, tr ("The object is not ready")); \
+            return setError (E_ACCESSDENIED, tr ("The object is not ready")); \
     } while (0)
 
@@ -767 +767 @@
      * {
      *     AutoInitSpan autoInitSpan (this);
-     *     AssertReturn (autoInitSpan.isOk(), E_UNEXPECTED);
+     *     AssertReturn (autoInitSpan.isOk(), E_FAIL);
      *     ...
      *     if (FAILED (rc))
@@ -863 +863 @@
      * {
      *     AutoReinitSpan autoReinitSpan (this);
-     *     AssertReturn (autoReinitSpan.isOk(), E_UNEXPECTED);
+     *     AssertReturn (autoReinitSpan.isOk(), E_FAIL);
      *     ...
      *     if (FAILED (rc))