No need to lock on request pop.

[simgrid.git] / src / gras / DataDesc / ddt_create.c

diff --git a/src/gras/DataDesc/ddt_create.c b/src/gras/DataDesc/ddt_create.c
index 77c19a5..dabc75c 100644 (file)
--- a/src/gras/DataDesc/ddt_create.c
+++ b/src/gras/DataDesc/ddt_create.c
@@ -175,7 +175,7 @@ gras_datadesc_type_t gras_datadesc_struct(const char *name)
     /* FIXME: Check that field redefinition matches */
     xbt_assert1(res->category_code == e_gras_datadesc_type_cat_struct,
                 "Redefinition of type %s does not match", name);
-    VERB1("Discarding redefinition of %s", name);
+    DEBUG1("Discarding redefinition of %s", name);
     return res;
   }
   res = gras_ddt_new(name);
@@ -208,7 +208,7 @@ gras_datadesc_struct_append(gras_datadesc_type_t struct_type,
               name, struct_type->name);
   XBT_IN3("(%s %s.%s;)", field_type->name, struct_type->name, name);
   if (struct_type->category.struct_data.closed) {
-    VERB1
+    DEBUG1
         ("Ignoring request to add field to struct %s (closed. Redefinition?)",
          struct_type->name);
     return;
@@ -427,7 +427,7 @@ gras_datadesc_ref(const char *name, gras_datadesc_type_t referenced_type)
                 "Redefinition of %s does not match", name);
     xbt_assert1(res->category.ref_data.selector == NULL,
                 "Redefinition of %s does not match", name);
-    VERB1("Discarding redefinition of %s", name);
+    DEBUG1("Discarding redefinition of %s", name);
     return res;
   }
 
@@ -694,7 +694,7 @@ gras_datadesc_dynar(gras_datadesc_type_t elm_t, void_f_pvoid_t free_func)
   char *buffname;
   gras_datadesc_type_t res;
 
-  asprintf(&buffname, "s_xbt_dynar_of_%s", elm_t->name);
+  buffname = bprintf("s_xbt_dynar_of_%s", elm_t->name);
 
   res = gras_datadesc_struct(buffname);
 
@@ -724,7 +724,7 @@ gras_datadesc_dynar(gras_datadesc_type_t elm_t, void_f_pvoid_t free_func)
 
   /* build a ref to it */
   free(buffname);
-  asprintf(&buffname, "xbt_dynar_of_%s", elm_t->name);
+  buffname = bprintf("xbt_dynar_of_%s", elm_t->name);
   res = gras_datadesc_ref(buffname, res);
   free(buffname);
   return res;
@@ -758,7 +758,7 @@ gras_datadesc_matrix(gras_datadesc_type_t elm_t,
   char *buffname;
   gras_datadesc_type_t res;
 
-  asprintf(&buffname, "s_xbt_matrix_t(%s)", elm_t->name);
+  buffname = bprintf("s_xbt_matrix_t(%s)", elm_t->name);
   res = gras_datadesc_struct(buffname);
 
   gras_datadesc_struct_append(res, "lines",
@@ -783,7 +783,7 @@ gras_datadesc_matrix(gras_datadesc_type_t elm_t,
 
   /* build a ref to it */
   free(buffname);
-  asprintf(&buffname, "xbt_matrix_t(%s)", elm_t->name);
+  buffname = bprintf("xbt_matrix_t(%s)", elm_t->name);
   res = gras_datadesc_ref(buffname, res);
   free(buffname);
   return res;