Remove unused variable.

[simgrid.git] / src / msg / msg_actions.c

diff --git a/src/msg/msg_actions.c b/src/msg/msg_actions.c
index 3ef50ad..4218ab1 100644 (file)
--- a/src/msg/msg_actions.c
+++ b/src/msg/msg_actions.c
@@ -4,7 +4,9 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "msg/private.h"
+#include "simgrid_config.h" //For getline, keep that include first
+
+#include "msg_private.h"
 #include "xbt/str.h"
 #include "xbt/dynar.h"
 #include "xbt/replay_trace_reader.h"
@@ -55,11 +57,11 @@ static int MSG_action_runner(int argc, char *argv[])
 
     while ((evt = action_get_action(argv[0]))) {
       msg_action_fun function = xbt_dict_get(action_funs, evt[1]);
-      (*function) (evt);
+      function(evt);
       free(evt);
     }
   } else {                      // Should have got my trace file in argument
-    xbt_assert1(argc >= 2,
+    xbt_assert(argc >= 2,
                 "No '%s' agent function provided, no simulation-wide trace file provided to MSG_action_trace_run(), "
                 "and no process-wide trace file provided in deployment file. Aborting.",
                 argv[0]
@@ -68,7 +70,7 @@ static int MSG_action_runner(int argc, char *argv[])
     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);
+        function(evt);
         free(evt);
       } else {
         XBT_WARN("%s: Ignore trace element not for me",
@@ -82,8 +84,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);
 }
 
@@ -96,19 +98,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)
@@ -169,12 +170,12 @@ MSG_error_t MSG_action_trace_run(char *path)
 
   if (path) {
     action_fp = fopen(path, "r");
-    xbt_assert2(action_fp != NULL, "Cannot open %s: %s", path,
+    xbt_assert(action_fp != NULL, "Cannot open %s: %s", path,
                 strerror(errno));
   }
   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.");
 
@@ -184,12 +185,11 @@ MSG_error_t MSG_action_trace_run(char *path)
     }
   }
 
-  if (action_line)
-    free(action_line);
+  free(action_line);
   if (path)
     fclose(action_fp);
   xbt_dict_free(&action_queues);
-  action_queues = xbt_dict_new();
+  action_queues = xbt_dict_new_homogeneous(NULL);
 
   return res;
 }