collapse if statements

This commit is contained in:
Dennis Luxen 2014-05-28 12:03:07 +02:00
parent acefb5a5f3
commit 9c48389f74

View File

@ -98,40 +98,25 @@ int main(const int argc, const char *argv[])
{ {
SimpleLogger().Write() << "spring-cleaning all shared memory regions"; SimpleLogger().Write() << "spring-cleaning all shared memory regions";
// find all existing shmem regions and remove them. // find all existing shmem regions and remove them.
if (SharedMemory::RegionExists(DATA_1)) if (SharedMemory::RegionExists(DATA_1) && !SharedMemory::Remove(DATA_1))
{ {
if (!SharedMemory::Remove(DATA_1)) SimpleLogger().Write(logWARNING) << "could not delete DATA_1";
{
SimpleLogger().Write(logWARNING) << "could not delete DATA_1";
}
} }
if (SharedMemory::RegionExists(LAYOUT_1)) if (SharedMemory::RegionExists(LAYOUT_1) && !SharedMemory::Remove(LAYOUT_1))
{ {
if (!SharedMemory::Remove(LAYOUT_1)) SimpleLogger().Write(logWARNING) << "could not delete LAYOUT_1";
{
SimpleLogger().Write(logWARNING) << "could not delete LAYOUT_1";
}
} }
if (SharedMemory::RegionExists(DATA_2)) if (SharedMemory::RegionExists(DATA_2) && !SharedMemory::Remove(DATA_2))
{ {
if (!SharedMemory::Remove(DATA_2)) SimpleLogger().Write(logWARNING) << "could not delete DATA_2";
{
SimpleLogger().Write(logWARNING) << "could not delete DATA_2";
}
} }
if (SharedMemory::RegionExists(LAYOUT_2)) if (SharedMemory::RegionExists(LAYOUT_2) && !SharedMemory::Remove(LAYOUT_2))
{ {
if (!SharedMemory::Remove(LAYOUT_2)) SimpleLogger().Write(logWARNING) << "could not delete LAYOUT_2";
{
SimpleLogger().Write(logWARNING) << "could not delete LAYOUT_2";
}
} }
if (SharedMemory::RegionExists(CURRENT_REGIONS)) if (SharedMemory::RegionExists(CURRENT_REGIONS) && !SharedMemory::Remove(CURRENT_REGIONS))
{ {
if (!SharedMemory::Remove(CURRENT_REGIONS)) SimpleLogger().Write(logWARNING) << "could not delete CURRENT_REGIONS";
{
SimpleLogger().Write(logWARNING) << "could not delete CURRENT_REGIONS";
}
} }
return 0; return 0;
} }