Removes trailing spaces. Removes tabs.

[vlc] / activex / dataobject.h

diff --git a/activex/dataobject.h b/activex/dataobject.h
index 8921a6319096f529ebaf19a0b1268464e22d5a79..062fcdd25f63970e79082625a0283f23d63503e8 100644 (file)
--- a/activex/dataobject.h
+++ b/activex/dataobject.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef __DATAOBJECT_H__
@@ -37,9 +37,10 @@ public:
     // IUnknown methods
     STDMETHODIMP QueryInterface(REFIID riid, void **ppv)
     {
-        if( (NULL != ppv)
-         && (IID_IUnknown == riid) 
-         && (IID_IDataObject == riid) ) {
+        if( NULL == ppv)
+            return E_POINTER;
+        if( (IID_IUnknown == riid)
+         || (IID_IDataObject == riid) ) {
             AddRef();
             *ppv = reinterpret_cast<LPVOID>(this);
             return NOERROR;