Changeset 14972 in vbox for trunk/src/VBox/Main/HostFloppyDriveImpl.cpp

Timestamp:

Dec 4, 2008 12:10:37 PM (16 years ago)

Author:

vboxsync

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

40340

Message:

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

The mega commit that implements Main-wide usage of new CheckCom*
macros, mostly CheckComArgNotNull, CheckComArgStrNotEmptyOrNull,
CheckComArgOutSafeArrayPointerValid, CheckComArgExpr.
Note that some methods incorrectly returned E_INVALIDARG where they
should have returned E_POINTER and vice versa. If any higher level
function tests these, they will behave differently now...

Special thanks to: vi macros, making it easy to semi-automatically
find and replace several hundred instances of if (!aName) ...

File:

• trunk/src/VBox/Main/HostFloppyDriveImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/HostFloppyDriveImpl.cpp

@@ -90 +90 @@
 STDMETHODIMP HostFloppyDrive::COMGETTER(Name) (BSTR *aName)
 {
-    if (!aName)
-        return E_POINTER;
+    CheckComArgOutPointerValid(aName);
 
     AutoCaller autoCaller (this);
@@ -105 +104 @@
 STDMETHODIMP HostFloppyDrive::COMGETTER(Description) (BSTR *aDescription)
 {
-    if (!aDescription)
-        return E_POINTER;
+    CheckComArgOutPointerValid(aDescription);
 
     AutoCaller autoCaller (this);
@@ -120 +118 @@
 STDMETHODIMP HostFloppyDrive::COMGETTER(Udi) (BSTR *aUdi)
 {
-    if (!aUdi)
-        return E_POINTER;
+    CheckComArgOutPointerValid(aUdi);
 
     AutoCaller autoCaller (this);