Changeset 15178 in vbox for trunk/src/VBox/Main/MediumImpl.cpp

Timestamp:

Dec 9, 2008 2:40:31 PM (16 years ago)

Author:

vboxsync

Message:

#3285: Improve error handling API to include unique error numbers
Document

• IMedium::getSnapshotIds
• IMedium::lockRead
• IMedium::unlockRead
• IMedium::lockWrite
• IMedium::unlockWrite
• IMedium::close

File:

• trunk/src/VBox/Main/MediumImpl.cpp (modified) (11 diffs)

trunk/src/VBox/Main/MediumImpl.cpp

@@ -238 +238 @@
                                          ComSafeGUIDArrayOut (aSnapshotIds))
 {
-    if (Guid (aMachineId).isEmpty())
-        return E_INVALIDARG;
-    if (ComSafeGUIDArrayOutIsNull (aSnapshotIds))
-        return E_POINTER;
+    CheckComArgExpr(aMachineId, Guid (aMachineId).isEmpty() == false);
+    CheckComArgSafeArrayNotNull(aSnapshotIds);
 
     AutoCaller autoCaller (this);
@@ -372 +370 @@
         default:
         {
-            rc = setError (E_FAIL,
+            rc = setError (VBOX_E_INVALID_OBJECT_STATE,
                 tr ("Medium '%ls' is not locked for reading"),
                 m.locationFull.raw());
@@ -451 +449 @@
         default:
         {
-            rc = setError (E_FAIL,
+            rc = setError (VBOX_E_INVALID_OBJECT_STATE,
                 tr ("Medium '%ls' is not locked for writing"),
                 m.locationFull.raw());
@@ -497 +495 @@
 
     if (m.backRefs.size() != 0)
-        return setError (E_FAIL,
+        return setError (VBOX_E_OBJECT_IN_USE,
             tr ("Medium '%ls' is attached to %d virtual machines"),
                 m.locationFull.raw(), m.backRefs.size());
@@ -855 +853 @@
         case MediaState_NotCreated:
         {
-            rc = setError (E_FAIL,
+            rc = setError (VBOX_E_INVALID_OBJECT_STATE,
                 tr ("Storage for the medium '%ls' is not created"),
                 m.locationFull.raw());
@@ -862 +860 @@
         case MediaState_Created:
         {
-            rc = setError (E_FAIL,
+            rc = setError (VBOX_E_INVALID_OBJECT_STATE,
                 tr ("Storage for the medium '%ls' is already created"),
                 m.locationFull.raw());
@@ -869 +867 @@
         case MediaState_LockedRead:
         {
-            rc = setError (E_FAIL,
+            rc = setError (VBOX_E_INVALID_OBJECT_STATE,
                 tr ("Medium '%ls' is locked for reading by another task"),
                 m.locationFull.raw());
@@ -876 +874 @@
         case MediaState_LockedWrite:
         {
-            rc = setError (E_FAIL,
+            rc = setError (VBOX_E_INVALID_OBJECT_STATE,
                 tr ("Medium '%ls' is locked for writing by another task"),
                 m.locationFull.raw());
@@ -885 +883 @@
             /* be in sync with Console::powerUpThread() */
             if (!m.lastAccessError.isEmpty())
-                rc = setError (E_FAIL,
+                rc = setError (VBOX_E_INVALID_OBJECT_STATE,
                     tr ("Medium '%ls' is not accessible. %ls"),
                     m.locationFull.raw(), m.lastAccessError.raw());
             else
-                rc = setError (E_FAIL,
+                rc = setError (VBOX_E_INVALID_OBJECT_STATE,
                     tr ("Medium '%ls' is not accessible"),
                     m.locationFull.raw());
@@ -896 +894 @@
         case MediaState_Creating:
         {
-            rc = setError (E_FAIL,
+            rc = setError (VBOX_E_INVALID_OBJECT_STATE,
                 tr ("Storage for the medium '%ls' is being created"),
                 m.locationFull.raw(), m.lastAccessError.raw());
@@ -903 +901 @@
         case MediaState_Deleting:
         {
-            rc = setError (E_FAIL,
+            rc = setError (VBOX_E_INVALID_OBJECT_STATE,
                 tr ("Storage for the medium '%ls' is being deleted"),
                 m.locationFull.raw(), m.lastAccessError.raw());