X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f25af1e2829458e33a3a0b74c75865c89dff5f9e..ec63b14f8fcd0a88515e4260e00c41b77c0274cc:/examples/gras/replay/xbt_workload.c?ds=sidebyside

diff --git a/examples/gras/replay/xbt_workload.c b/examples/gras/replay/xbt_workload.c
index f3a8a79855..f0ba47a6e6 100644
--- a/examples/gras/replay/xbt_workload.c
+++ b/examples/gras/replay/xbt_workload.c
@@ -29,7 +29,7 @@ xbt_workload_elm_t xbt_workload_elm_parse(char *line)
 
   xbt_dynar_t w = xbt_str_split(line, " ");
 
-  if (xbt_dynar_length(w) == 0) {
+  if (xbt_dynar_is_empty(w)) {
     free(res);
     xbt_dynar_free(&w);
     return NULL;
@@ -71,12 +71,9 @@ void xbt_workload_elm_free(xbt_workload_elm_t cmd)
 {
   if (!cmd)
     return;
-  if (cmd->who)
-    free(cmd->who);
-  if (cmd->comment)
-    free(cmd->comment);
-  if (cmd->str_arg)
-    free(cmd->str_arg);
+  free(cmd->who);
+  free(cmd->comment);
+  free(cmd->str_arg);
   free(cmd);
 }
 
@@ -157,7 +154,7 @@ xbt_dynar_t xbt_workload_parse_file(char *filename)
 {
   FILE *file_in;
   file_in = fopen(filename, "r");
-  xbt_assert1(file_in, "cannot open tracefile '%s'", filename);
+  xbt_assert(file_in, "cannot open tracefile '%s'", filename);
   char *str_in = xbt_str_from_file(file_in);
   fclose(file_in);
   xbt_dynar_t in = xbt_str_split(str_in, "\n");
@@ -181,32 +178,32 @@ xbt_dynar_t xbt_workload_parse_file(char *filename)
 
 void xbt_workload_declare_datadesc(void)
 {
-  gras_datadesc_type_t ddt;
-
-  ddt = gras_datadesc_struct("s_xbt_workload_elm_t");
-  gras_datadesc_struct_append(ddt, "who", gras_datadesc_by_name("string"));
-  gras_datadesc_struct_append(ddt, "comment",
-                              gras_datadesc_by_name("string"));
-  gras_datadesc_struct_append(ddt, "action", gras_datadesc_by_name("int"));
-  gras_datadesc_struct_append(ddt, "date",
-                              gras_datadesc_by_name("double"));
-  gras_datadesc_struct_append(ddt, "d_arg",
-                              gras_datadesc_by_name("double"));
-  gras_datadesc_struct_append(ddt, "str_arg",
-                              gras_datadesc_by_name("string"));
-  gras_datadesc_struct_close(ddt);
-
-  gras_datadesc_ref("xbt_workload_elm_t", ddt);
-
-  ddt = gras_datadesc_struct("s_xbt_workload_data_chunk_t");
-  gras_datadesc_struct_append(ddt, "size", gras_datadesc_by_name("int"));
-  gras_datadesc_cb_field_push(ddt, "size");
-  gras_datadesc_struct_append(ddt, "chunk",
-                              gras_datadesc_ref_pop_arr
-                              (gras_datadesc_by_name("char")));
-  gras_datadesc_struct_close(ddt);
-
-  gras_datadesc_ref("xbt_workload_data_chunk_t", ddt);
+  xbt_datadesc_type_t ddt;
+
+  ddt = xbt_datadesc_struct("s_xbt_workload_elm_t");
+  xbt_datadesc_struct_append(ddt, "who", xbt_datadesc_by_name("string"));
+  xbt_datadesc_struct_append(ddt, "comment",
+                              xbt_datadesc_by_name("string"));
+  xbt_datadesc_struct_append(ddt, "action", xbt_datadesc_by_name("int"));
+  xbt_datadesc_struct_append(ddt, "date",
+                              xbt_datadesc_by_name("double"));
+  xbt_datadesc_struct_append(ddt, "d_arg",
+                              xbt_datadesc_by_name("double"));
+  xbt_datadesc_struct_append(ddt, "str_arg",
+                              xbt_datadesc_by_name("string"));
+  xbt_datadesc_struct_close(ddt);
+
+  xbt_datadesc_ref("xbt_workload_elm_t", ddt);
+
+  ddt = xbt_datadesc_struct("s_xbt_workload_data_chunk_t");
+  xbt_datadesc_struct_append(ddt, "size", xbt_datadesc_by_name("int"));
+  xbt_datadesc_cb_field_push(ddt, "size");
+  xbt_datadesc_struct_append(ddt, "chunk",
+                              xbt_datadesc_ref_pop_arr
+                              (xbt_datadesc_by_name("char")));
+  xbt_datadesc_struct_close(ddt);
+
+  xbt_datadesc_ref("xbt_workload_data_chunk_t", ddt);
 }