Simplify a bit the way the exceptions are handled

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@1589 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/gras/DataDesc/ddt_exchange.c b/src/gras/DataDesc/ddt_exchange.c
index f72411f..e675b78 100644 (file)
--- a/src/gras/DataDesc/ddt_exchange.c
+++ b/src/gras/DataDesc/ddt_exchange.c
@@ -260,12 +260,10 @@ gras_datadesc_send_rec(gras_socket_t         sock,
       else 
        reference_is_to_send = 1;
     } CATCH(e) {
       else 
        reference_is_to_send = 1;
     } CATCH(e) {

-      if (e.category == mismatch_error) {
-       reference_is_to_send = 1;
-       xbt_ex_free(e);
-      } else {
+      if (e.category != mismatch_error)

        RETHROW;
        RETHROW;

-      }
+      reference_is_to_send = 1;
+      xbt_ex_free(e);

     }
 
     if (reference_is_to_send) {
     }
 
     if (reference_is_to_send) {


@@ -512,12 +510,10 @@ gras_datadesc_recv_rec(gras_socket_t         sock,
       else 
        reference_is_to_recv = 1;
     } CATCH(e) {
       else 
        reference_is_to_recv = 1;
     } CATCH(e) {

-      if (e.category == mismatch_error) {
-       reference_is_to_recv = 1;
-       xbt_ex_free(e);
-      } else {
-       RETHROW;
-      }
+      if (e.category != mismatch_error)
+        RETHROW;
+      reference_is_to_recv = 1;
+      xbt_ex_free(e);

     }
     if (reference_is_to_recv) {
       int subsubcount = 0;
     }
     if (reference_is_to_recv) {
       int subsubcount = 0;