[ros-diffs] [hpoussin] 32535: Don't test if the variable is not NULL if it is always allocated Fix another typo

Author: hpoussin
Date: Fri Feb 29 16:45:19 2008
New Revision: 32535

URL: http://svn.reactos.org/svn/reactos?rev=32535&view=rev
Log:
Don't test if the variable is not NULL if it is always allocated
Fix another typo

Modified:
    trunk/reactos/tools/rbuild/cdfile.cpp
    trunk/reactos/tools/rbuild/compilationunit.cpp
    trunk/reactos/tools/rbuild/installfile.cpp
    trunk/reactos/tools/rbuild/module.cpp

Modified: trunk/reactos/tools/rbuild/cdfile.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/cdfile.cpp?rev...
==============================================================================
--- trunk/reactos/tools/rbuild/cdfile.cpp (original)
+++ trunk/reactos/tools/rbuild/cdfile.cpp Fri Feb 29 16:45:19 2008
@@ -36,10 +36,8 @@

CDFile::~CDFile ()
 {
-	if ( source )
-		delete source;
-	if ( target )
-		delete target;
+	delete source;
+	delete target;
 }

CDFile::CDFile ( const Project& project,

Modified: trunk/reactos/tools/rbuild/compilationunit.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/compilationuni...
==============================================================================
--- trunk/reactos/tools/rbuild/compilationunit.cpp (original)
+++ trunk/reactos/tools/rbuild/compilationunit.cpp Fri Feb 29 16:45:19 2008
@@ -59,8 +59,7 @@
    for ( i = 0; i < files.size (); i++ )
    	delete files[i];

-	if ( default_name )
-		delete default_name;
+	delete default_name;
 }

void

Modified: trunk/reactos/tools/rbuild/installfile.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/installfile.cp...
==============================================================================
--- trunk/reactos/tools/rbuild/installfile.cpp (original)
+++ trunk/reactos/tools/rbuild/installfile.cpp Fri Feb 29 16:45:19 2008
@@ -24,11 +24,8 @@

InstallFile::~InstallFile()
 {
-	if ( source )
-		delete source;
-
-	if ( target )
-		delete source;
+	delete source;
+	delete target;
 }

InstallFile::InstallFile ( const Project& project,

Modified: trunk/reactos/tools/rbuild/module.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?rev...
==============================================================================
--- trunk/reactos/tools/rbuild/module.cpp (original)
+++ trunk/reactos/tools/rbuild/module.cpp Fri Feb 29 16:45:19 2008
@@ -488,14 +488,13 @@
    	delete pch;
    if ( install )
    	delete install;
-	if ( output )
-		delete output;
    if ( metadata )
    	delete metadata;
    if ( bootstrap )
    	delete bootstrap;
    if ( importLibrary )
    	delete importLibrary;
+	delete output;
 }

void
@@ -1598,8 +1597,7 @@

ImportLibrary::~ImportLibrary ()
 {
-	if ( source )
-		delete source;
+	delete source;
 }