cosmetic: remove nullity test on free() and delete

[vlc] / modules / video_filter / atmo / AtmoConfig.cpp

diff --git a/modules/video_filter/atmo/AtmoConfig.cpp b/modules/video_filter/atmo/AtmoConfig.cpp
index 1249bebd343ff42b49ba96d81f1da9759ed4a2fd..48d4fb86abd0955214c4512f1bface01fa7249d2 100644 (file)
--- a/modules/video_filter/atmo/AtmoConfig.cpp
+++ b/modules/video_filter/atmo/AtmoConfig.cpp
@@ -64,11 +64,10 @@ CAtmoConfig::CAtmoConfig()
 }
 
 CAtmoConfig::~CAtmoConfig() {
-   // and finally cleanup...
-   clearAllChannelMappings();
+    // and finally cleanup...
+    clearAllChannelMappings();
 #if !defined (WIN32)
-   if(m_devicename)
-      free(m_devicename);
+    free( m_devicename );
 #endif
 }
 
@@ -234,9 +233,8 @@ void CAtmoConfig::AddChannelAssignment(tChannelAssignment *ta) {
 }
 
 void CAtmoConfig::SetChannelAssignment(int index, tChannelAssignment *ta) {
-     if(m_ChannelAssignments[index]!=NULL)
-        delete m_ChannelAssignments[index];
-     m_ChannelAssignments[index] = ta;
+    delete m_ChannelAssignments[index];
+    m_ChannelAssignments[index] = ta;
 }
 
 CAtmoZoneDefinition *CAtmoConfig::getZoneDefinition(int zoneIndex) {