Replace "switch" statement by "if" (Sonar).

diff --git a/examples/s4u/platform-failures/s4u-platform-failures.cpp b/examples/s4u/platform-failures/s4u-platform-failures.cpp
index f52f8d6..77741db 100644 (file)
--- a/examples/s4u/platform-failures/s4u-platform-failures.cpp
+++ b/examples/s4u/platform-failures/s4u-platform-failures.cpp
@@ -34,13 +34,9 @@ static int master(int argc, char* argv[])
       delete payload;
       XBT_INFO("Mmh. Got timeouted while speaking to '%s'. Nevermind. Let's keep going!", mailbox->get_cname());
     } catch (xbt_ex& e) {
-      switch (e.category) {
-        case network_error:
-          XBT_INFO("Mmh. Something went wrong with '%s'. Nevermind. Let's keep going!", mailbox->get_cname());
-          break;
-        default:
-          xbt_die("Unexpected behavior");
-      }
+      if (e.category != network_error)
+        xbt_die("Unexpected behavior");
+      XBT_INFO("Mmh. Something went wrong with '%s'. Nevermind. Let's keep going!", mailbox->get_cname());
       delete payload;
     }
   }
@@ -61,13 +57,9 @@ static int master(int argc, char* argv[])
       XBT_INFO("Mmh. Got timeouted while speaking to '%s'. Nevermind. Let's keep going!", mailbox->get_cname());
     } catch (xbt_ex& e) {
       delete payload;
-      switch (e.category) {
-        case network_error:
-          XBT_INFO("Mmh. Something went wrong with '%s'. Nevermind. Let's keep going!", mailbox->get_cname());
-          break;
-        default:
-          xbt_die("Unexpected behavior");
-      }
+      if (e.category != network_error)
+        xbt_die("Unexpected behavior");
+      XBT_INFO("Mmh. Something went wrong with '%s'. Nevermind. Let's keep going!", mailbox->get_cname());
     }
   }
 
@@ -109,13 +101,9 @@ static int worker(int argc, char* argv[])
       delete payload;
       return -1;
     } catch (xbt_ex& e) {
-      switch (e.category) {
-        case network_error:
-          XBT_INFO("Mmh. Something went wrong. Nevermind. Let's keep going!");
-          break;
-        default:
-          xbt_die("Unexpected behavior. Category: %s", xbt_ex_catname(e.category));
-      }
+      if (e.category != network_error)
+        xbt_die("Unexpected behavior. Category: %s", xbt_ex_catname(e.category));
+      XBT_INFO("Mmh. Something went wrong. Nevermind. Let's keep going!");
     }
   }
   return 0;

diff --git a/src/msg/msg_gos.cpp b/src/msg/msg_gos.cpp
index d393195..d77e1b7 100644 (file)
--- a/src/msg/msg_gos.cpp
+++ b/src/msg/msg_gos.cpp
@@ -522,14 +522,10 @@ int MSG_comm_testany(xbt_dynar_t comms)
     status         = MSG_TIMEOUT;
   }
   catch (xbt_ex& e) {
-    switch (e.category) {
-      case network_error:
-        finished_index = e.value;
-        status = MSG_TRANSFER_FAILURE;
-        break;
-      default:
-        throw;
-    }
+    if (e.category != network_error)
+      throw;
+    finished_index = e.value;
+    status         = MSG_TRANSFER_FAILURE;
   }
 
   if (finished_index != -1) {