Revert "Those files should not be in git."

[simgrid.git] / src / gras / Msg / rl_msg.c

diff --git a/src/gras/Msg/rl_msg.c b/src/gras/Msg/rl_msg.c
index fead6df..d395371 100644 (file)
--- a/src/gras/Msg/rl_msg.c
+++ b/src/gras/Msg/rl_msg.c
@@ -36,7 +36,7 @@ void gras_msg_send_ext(gras_socket_t sock,
   static gras_datadesc_type_t ulong_type = NULL;
   char c_kind = (char) kind;
 
-  xbt_assert0(msgtype, "Cannot send the NULL message");
+  xbt_assert(msgtype, "Cannot send the NULL message");
 
   if (!string_type) {
     string_type = gras_datadesc_by_name("string");
@@ -99,7 +99,7 @@ void gras_msg_recv(gras_socket_t sock, gras_msg_t msg)
   char *msg_name = NULL;
   char c_kind;
 
-  xbt_assert1(!gras_socket_is_meas(sock),
+  xbt_assert(!gras_socket_is_meas(sock),
               "Asked to receive a message on the measurement socket %p",
               sock);
   if (!string_type) {
@@ -117,7 +117,7 @@ void gras_msg_recv(gras_socket_t sock, gras_msg_t msg)
     gras_trp_recv(sock, &c_kind, 1);
     msg->kind = (e_gras_msg_kind_t) c_kind;
   }
-  CATCH(e) {
+  CATCH_ANONYMOUS {
     RETHROWF
         ("Exception caught while trying to get the message header: %s");
   }
@@ -155,7 +155,8 @@ void gras_msg_recv(gras_socket_t sock, gras_msg_t msg)
   TRY {
     msg->type =
         (gras_msgtype_t) xbt_set_get_by_name(_gras_msgtype_set, msg_name);
-  } CATCH(e) {
+  }
+  CATCH(e) {
     /* FIXME: Survive unknown messages */
     if (e.category == not_found_error) {
       xbt_ex_free(e);
@@ -180,7 +181,7 @@ void gras_msg_recv(gras_socket_t sock, gras_msg_t msg)
     /* answer to RPC */
     if (msg->type->answer_type) {
       msg->payl_size = gras_datadesc_size(msg->type->answer_type);
-      xbt_assert2(msg->payl_size > 0,
+      xbt_assert(msg->payl_size > 0,
                   "%s %s",
                   "Dynamic array as payload is forbided for now (FIXME?).",
                   "Reference to dynamic array is allowed.");
@@ -194,7 +195,7 @@ void gras_msg_recv(gras_socket_t sock, gras_msg_t msg)
     /* regular message */
     if (msg->type->ctn_type) {
       msg->payl_size = gras_datadesc_size(msg->type->ctn_type);
-      xbt_assert2(msg->payl_size > 0,
+      xbt_assert(msg->payl_size > 0,
                   "%s %s",
                   "Dynamic array as payload is forbided for now (FIXME?).",
                   "Reference to dynamic array is allowed.");