less indirect calls to get_instance in examples (actor to engine)

[simgrid.git] / examples / cpp / dht-chord / s4u-dht-chord.cpp

diff --git a/examples/cpp/dht-chord/s4u-dht-chord.cpp b/examples/cpp/dht-chord/s4u-dht-chord.cpp
index 8723799..8b4ae5f 100644 (file)
--- a/examples/cpp/dht-chord/s4u-dht-chord.cpp
+++ b/examples/cpp/dht-chord/s4u-dht-chord.cpp
@@ -22,16 +22,14 @@ int main(int argc, char* argv[])
   while (not strncmp(options[0], "-", 1)) {
     unsigned int length = strlen("-nb_bits=");
     if (not strncmp(options[0], "-nb_bits=", length) && strlen(options[0]) > length) {
-      nb_bits = static_cast<int>(xbt_str_parse_int(options[0] + length, "Invalid nb_bits parameter: %s"));
+      nb_bits = static_cast<int>(xbt_str_parse_int(options[0] + length, "Invalid nb_bits parameter"));
       XBT_DEBUG("Set nb_bits to %d", nb_bits);
     } else {
       length = strlen("-timeout=");
-      if (not strncmp(options[0], "-timeout=", length) && strlen(options[0]) > length) {
-        timeout = static_cast<int>(xbt_str_parse_int(options[0] + length, "Invalid timeout parameter: %s"));
-        XBT_DEBUG("Set timeout to %d", timeout);
-      } else {
-        xbt_die("Invalid chord option '%s'", options[0]);
-      }
+      xbt_assert(strncmp(options[0], "-timeout=", length) == 0 && strlen(options[0]) > length,
+                 "Invalid chord option '%s'", options[0]);
+      timeout = static_cast<int>(xbt_str_parse_int(options[0] + length, "Invalid timeout parameter"));
+      XBT_DEBUG("Set timeout to %d", timeout);
     }
     options++;
   }