Rewrite/simplify the C++ flag declaration

[simgrid.git] / src / xbt / xbt_replay.c

diff --git a/src/xbt/xbt_replay.c b/src/xbt/xbt_replay.c
index 0532a81..2aa0ce2 100644 (file)
--- a/src/xbt/xbt_replay.c
+++ b/src/xbt/xbt_replay.c
@@ -152,13 +152,11 @@ int xbt_replay_action_runner(int argc, char *argv[])
     char **evt;
     while ((evt = action_get_action(argv[0]))) {
       char* lowername = str_tolower (evt[1]);
-      action_fun function =
-        (action_fun)xbt_dict_get(xbt_action_funs, lowername);
+      action_fun function = (action_fun)xbt_dict_get(xbt_action_funs, lowername);
       xbt_free(lowername);
       TRY{
         function((const char **)evt);
-      }
-      CATCH(e) {
+      } CATCH(e) {
         free(evt);
         xbt_die("Replay error :\n %s", e.msg);
       }
@@ -170,8 +168,7 @@ int xbt_replay_action_runner(int argc, char *argv[])
     const char **evt;
     xbt_assert(argc >= 2,
                 "No '%s' agent function provided, no simulation-wide trace file provided, "
-                "and no process-wide trace file provided in deployment file. Aborting.",
-                argv[0]
+                "and no process-wide trace file provided in deployment file. Aborting.", argv[0]
         );
     xbt_replay_reader_t reader = xbt_replay_reader_new(argv[1]);
     while ((evt=xbt_replay_reader_get(reader))) {
@@ -181,8 +178,7 @@ int xbt_replay_action_runner(int argc, char *argv[])
         xbt_free(lowername);
         TRY{
           function(evt);
-        }
-        CATCH(e) {
+        } CATCH(e) {
           free(evt);
           xbt_die("Replay error on line %d of file %s :\n %s" , reader->linenum,reader->filename, e.msg);
         }
@@ -196,7 +192,6 @@ int xbt_replay_action_runner(int argc, char *argv[])
   return 0;
 }
 
-
 static char **action_get_action(char *name)
 {
   xbt_dynar_t evt = NULL;
@@ -204,7 +199,6 @@ static char **action_get_action(char *name)
 
   xbt_dynar_t myqueue = xbt_dict_get_or_null(xbt_action_queues, name);
   if (myqueue == NULL || xbt_dynar_is_empty(myqueue)) {      // nothing stored for me. Read the file further
-
     if (xbt_action_fp == NULL) {    // File closed now. There's nothing more to read. I'm out of here
       goto todo_done;
     }
@@ -231,8 +225,7 @@ static char **action_get_action(char *name)
         xbt_dynar_t otherqueue =
             xbt_dict_get_or_null(xbt_action_queues, evtname);
         if (otherqueue == NULL) {       // Damn. Create the queue of that guy
-          otherqueue =
-              xbt_dynar_new(sizeof(xbt_dynar_t), xbt_dynar_free_voidp);
+          otherqueue = xbt_dynar_new(sizeof(xbt_dynar_t), xbt_dynar_free_voidp);
           xbt_dict_set(xbt_action_queues, evtname, otherqueue, NULL);
         }
         xbt_dynar_push(otherqueue, &evt);
@@ -245,7 +238,6 @@ static char **action_get_action(char *name)
     return xbt_dynar_to_array(evt);
   }
 
-
   // I did all my actions for me in the file (either I closed the file, or a colleague did)
   // Let's cleanup before leaving
 todo_done: