Use CATCH_ANONYMOUS whenever possible, and remove unused variables.

[simgrid.git] / src / gras / Virtu / process.c

diff --git a/src/gras/Virtu/process.c b/src/gras/Virtu/process.c
index 6ac3a17..de2085b 100644 (file)
--- a/src/gras/Virtu/process.c
+++ b/src/gras/Virtu/process.c
@@ -89,7 +89,6 @@ void *gras_libdata_by_name_from_procdata(const char *name,
                                          gras_procdata_t * pd)
 {
   void *res = NULL;
-  xbt_ex_t e;
   if (xbt_set_length(pd->libdata) <
       xbt_dynar_length(_gras_procdata_fabrics)) {
     /* Damn, some new modules were added since procdata_init(). Amok? */
@@ -99,8 +98,8 @@ void *gras_libdata_by_name_from_procdata(const char *name,
   TRY {
     res = xbt_set_get_by_name(pd->libdata, name);
   }
-  CATCH(e) {
-    RETHROW1("Cannot retrieve the libdata associated to %s: %s", name);
+  CATCH_ANONYMOUS {
+    RETHROWF("Cannot retrieve the libdata associated to %s: %s", name);
   }
   return res;
 }
@@ -137,15 +136,15 @@ void gras_procdata_init()
     volatile int found = 0;
 
     if (cursor + 1 <= xbt_set_length(pd->libdata)) {
-      DEBUG2("Skip fabric %d: there is already %ld libdata",
+      XBT_DEBUG("Skip fabric %d: there is already %ld libdata",
              cursor, xbt_set_length(pd->libdata));
       continue;                 /* allow to recall this function to get recently added fabrics */
     }
-    DEBUG2("Go ahead for cursor %d, there is %ld libdata",
+    XBT_DEBUG("Go ahead for cursor %d, there is %ld libdata",
            cursor, xbt_set_length(pd->libdata));
 
-    xbt_assert1(fab.name, "Name of fabric #%d is NULL!", cursor);
-    DEBUG1("Create the procdata for %s", fab.name);
+    xbt_assert(fab.name, "Name of fabric #%d is NULL!", cursor);
+    XBT_DEBUG("Create the procdata for %s", fab.name);
     /* Check for our own errors */
     TRY {
       xbt_set_get_by_name(pd->libdata, fab.name);
@@ -156,14 +155,14 @@ void gras_procdata_init()
       found = 0;
     }
     if (found)
-      THROW1(unknown_error, 0,
+      THROWF(unknown_error, 0,
              "MayDay: two modules use '%s' as libdata name", fab.name);
 
     /* Add the data in place, after some more sanity checking */
     elem = (*(fab.constructor)) ();
     if (elem->name_len && elem->name_len != strlen(elem->name)) {
       elem->name_len = strlen(elem->name);
-      WARN1
+      XBT_WARN
           ("Module '%s' constructor is borken: it does not set elem->name_len",
            fab.name);
     }