From 3d185d84715ba14619d19bcf69422523b8852242 Mon Sep 17 00:00:00 2001 From: mquinson Date: Sun, 7 Aug 2005 09:31:33 +0000 Subject: [PATCH] Simplify a bit exception handling, plus minor cleanups git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@1591 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/gras/Msg/msg.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gras/Msg/msg.c b/src/gras/Msg/msg.c index 88d443fd9f..ab15d331ef 100644 --- a/src/gras/Msg/msg.c +++ b/src/gras/Msg/msg.c @@ -205,7 +205,7 @@ gras_msg_send(gras_socket_t sock, static gras_datadesc_type_t string_type=NULL; if (!msgtype) - THROW0(mismatch_error,0, + THROW0(arg_error,0, "Cannot send the NULL message (did msgtype_by_name fail?)"); if (!string_type) { @@ -248,9 +248,8 @@ gras_msg_recv(gras_socket_t sock, TRY { gras_trp_chunk_recv(sock, header, 6); } CATCH(e) { - THROW2(e.category,e.value, - "Exception caught while trying to get the mesage header on socket %p : %s", - sock,e.msg); + RETHROW1("Exception caught while trying to get the mesage header on socket %p : %s", + sock); } for (cpt=0; cpt<4; cpt++) @@ -482,6 +481,7 @@ gras_msg_handle(double timeOut) { } } + /* FIXME: gras_datadesc_free not implemented => leaking the payload */ THROW1(mismatch_error,0, "Message '%s' refused by all registered callbacks", msgtype->name); } -- 2.20.1