From 9c48389f74dce0ad0549ee280a98e6bf25a3435c Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Wed, 28 May 2014 12:03:07 +0200 Subject: [PATCH] collapse if statements --- datastore.cpp | 35 ++++++++++------------------------- 1 file changed, 10 insertions(+), 25 deletions(-) diff --git a/datastore.cpp b/datastore.cpp index a32276da6..9bf2bfafc 100644 --- a/datastore.cpp +++ b/datastore.cpp @@ -98,40 +98,25 @@ int main(const int argc, const char *argv[]) { SimpleLogger().Write() << "spring-cleaning all shared memory regions"; // 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; }