X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d2d9f8b0f434e881d124d81f655fc9ebb6f31199..8870e4a485d50ed72f249b345c8338dd6ef1b7f7:/src/msg/msg_actions.c

diff --git a/src/msg/msg_actions.c b/src/msg/msg_actions.c
index 97d3c4c05e..92f9288816 100644
--- a/src/msg/msg_actions.c
+++ b/src/msg/msg_actions.c
@@ -56,8 +56,9 @@ static int MSG_action_runner(int argc, char *argv[])
   if (action_fp) {              // A unique trace file
 
     while ((evt = action_get_action(argv[0]))) {
-      msg_action_fun function = xbt_dict_get(action_funs, evt[1]);
-      (*function) (evt);
+      msg_action_fun function =
+        (msg_action_fun)xbt_dict_get(action_funs, evt[1]);
+      function(evt);
       free(evt);
     }
   } else {                      // Should have got my trace file in argument
@@ -69,8 +70,9 @@ static int MSG_action_runner(int argc, char *argv[])
     xbt_replay_trace_reader_t reader = xbt_replay_trace_reader_new(argv[1]);
     while ((evt=xbt_replay_trace_reader_get(reader))) {
       if (!strcmp(argv[0],evt[0])) {
-        msg_action_fun function = xbt_dict_get(action_funs, evt[1]);
-        (*function) (evt);
+        msg_action_fun function =
+          (msg_action_fun)xbt_dict_get(action_funs, evt[1]);
+        function(evt);
         free(evt);
       } else {
         XBT_WARN("%s: Ignore trace element not for me",
@@ -84,8 +86,8 @@ static int MSG_action_runner(int argc, char *argv[])
 
 void _MSG_action_init()
 {
-  action_funs = xbt_dict_new();
-  action_queues = xbt_dict_new();
+  action_funs = xbt_dict_new_homogeneous(NULL);
+  action_queues = xbt_dict_new_homogeneous(NULL);
   MSG_function_register_default(MSG_action_runner);
 }
 
@@ -98,19 +100,18 @@ void _MSG_action_exit()
 
 static const char **action_get_action(char *name)
 {
-  ssize_t read;
   xbt_dynar_t evt = NULL;
   char *evtname = NULL;
 
   xbt_dynar_t myqueue = xbt_dict_get_or_null(action_queues, name);
-  if (myqueue == NULL || xbt_dynar_length(myqueue) == 0) {      // nothing stored for me. Read the file further
+  if (myqueue == NULL || xbt_dynar_is_empty(myqueue)) {      // nothing stored for me. Read the file further
 
     if (action_fp == NULL) {    // File closed now. There's nothing more to read. I'm out of here
       goto todo_done;
     }
     // Read lines until I reach something for me (which breaks in loop body)
     // or end of file reached
-    while ((read = getline(&action_line, &action_len, action_fp)) != -1) {
+    while (getline(&action_line, &action_len, action_fp) != -1) {
       // cleanup and split the string I just read
       char *comment = strchr(action_line, '#');
       if (comment != NULL)
@@ -176,7 +177,7 @@ MSG_error_t MSG_action_trace_run(char *path)
   }
   res = MSG_main();
 
-  if (xbt_dict_size(action_queues)) {
+  if (!xbt_dict_is_empty(action_queues)) {
     XBT_WARN
         ("Not all actions got consumed. If the simulation ended successfully (without deadlock), you may want to add new processes to your deployment file.");
 
@@ -190,7 +191,7 @@ MSG_error_t MSG_action_trace_run(char *path)
   if (path)
     fclose(action_fp);
   xbt_dict_free(&action_queues);
-  action_queues = xbt_dict_new();
+  action_queues = xbt_dict_new_homogeneous(NULL);
 
   return res;
 }