Use CATCH_ANONYMOUS whenever possible, and remove unused variables.

[simgrid.git] / src / xbt / ex.c

diff --git a/src/xbt/ex.c b/src/xbt/ex.c
index ade191bd8b02bca5d72472730552ca34ad99fa24..32124571218cd5d7f27d80ac23829c933675b5c2 100644 (file)
--- a/src/xbt/ex.c
+++ b/src/xbt/ex.c
@@ -251,7 +251,7 @@ XBT_TEST_UNIT("controlflow", test_controlflow, "basic nested control flow")
       if (n != 2)
         xbt_test_fail("M2: n=%d (!= 2)", n);
       n++;
-      THROW0(unknown_error, 0, "something");
+      THROWF(unknown_error, 0, "something");
     }
     CATCH(ex) {
       if (n != 3)
@@ -264,9 +264,9 @@ XBT_TEST_UNIT("controlflow", test_controlflow, "basic nested control flow")
       if (n != 5)
         xbt_test_fail("M2: n=%d (!= 5)", n);
       n++;
-      THROW0(unknown_error, 0, "something");
+      THROWF(unknown_error, 0, "something");
     }
-    CATCH(ex) {
+    CATCH_ANONYMOUS {
       if (n != 6)
         xbt_test_fail("M3: n=%d (!= 6)", n);
       n++;
@@ -290,7 +290,7 @@ XBT_TEST_UNIT("value", test_value, "exception value passing")
   xbt_ex_t ex;
 
   TRY {
-    THROW0(unknown_error, 2, "toto");
+    THROWF(unknown_error, 2, "toto");
   }
   CATCH(ex) {
     xbt_test_add("exception value passing");
@@ -314,7 +314,7 @@ XBT_TEST_UNIT("variables", test_variables, "variable value preservation")
   TRY {
     r2 = 5678;
     v2 = 5678;
-    THROW0(unknown_error, 0, "toto");
+    THROWF(unknown_error, 0, "toto");
   } CATCH(ex) {
     xbt_test_add("variable preservation");
     if (r1 != 1234)
@@ -340,7 +340,7 @@ XBT_TEST_UNIT("cleanup", test_cleanup, "cleanup handling")
   c = 0;
   TRY {
     v1 = 5678;
-    THROW0(1, 2, "blah");
+    THROWF(1, 2, "blah");
   } TRY_CLEANUP {
     if (v1 != 5678)
       xbt_test_fail("v1 = %d (!= 5678)", v1);
@@ -397,7 +397,7 @@ static void bad_example(void)
     if (cp1 != NULL)
       free(cp1);
   }
-  CATCH(ex) {
+  CATCH_ANONYMOUS {
     printf("cp3=%s", cp3);
     RETHROW;
   }
@@ -411,7 +411,6 @@ typedef struct {
 static void good_example(void)
 {
   global_context_t *global_context = malloc(sizeof(global_context_t));
-  xbt_ex_t ex;
 
   /* GOOD_EXAMPLE */
   {                             /*01 */
@@ -434,7 +433,7 @@ static void good_example(void)
         free(cp2);
       /*05 cp1 was given away */
     }
-    CATCH(ex) {
+    CATCH_ANONYMOUS {
       /*05 global context untouched */
       RETHROW;
     }