X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6ee7e9c2e455536ab817ae0136acfbb53822eecd..1544c44ae892f12125f1355d83e275d8299418ed:/src/gras/Transport/transport_plugin_file.c

diff --git a/src/gras/Transport/transport_plugin_file.c b/src/gras/Transport/transport_plugin_file.c
index a151d0dc7e..c26b83780e 100644
--- a/src/gras/Transport/transport_plugin_file.c
+++ b/src/gras/Transport/transport_plugin_file.c
@@ -96,7 +96,7 @@ gras_socket_t gras_socket_client_from_file(const char *path)
 {
   gras_socket_t res;
 
-  xbt_assert0(gras_if_RL(), "Cannot use file as socket in the simulator");
+  xbt_assert(gras_if_RL(), "Cannot use file as socket in the simulator");
 
   gras_trp_socket_new(0, &res);
 
@@ -108,7 +108,7 @@ gras_socket_t gras_socket_client_from_file(const char *path)
              S_IRUSR | S_IWUSR | S_IRGRP);
 
     if (res->sd < 0) {
-      THROW2(system_error, 0,
+      THROWF(system_error, 0,
              "Cannot create a client socket from file %s: %s",
              path, strerror(errno));
     }
@@ -138,7 +138,7 @@ gras_socket_t gras_socket_server_from_file(const char *path)
 {
   gras_socket_t res;
 
-  xbt_assert0(gras_if_RL(), "Cannot use file as socket in the simulator");
+  xbt_assert(gras_if_RL(), "Cannot use file as socket in the simulator");
 
   gras_trp_socket_new(1, &res);
 
@@ -149,7 +149,7 @@ gras_socket_t gras_socket_server_from_file(const char *path)
     res->sd = open(path, O_RDONLY | O_BINARY);
 
     if (res->sd < 0) {
-      THROW2(system_error, 0,
+      THROWF(system_error, 0,
              "Cannot create a server socket from file %s: %s",
              path, strerror(errno));
     }
@@ -211,8 +211,8 @@ gras_trp_file_chunk_send_raw(gras_socket_t sock,
                              const char *data, unsigned long int size)
 {
 
-  xbt_assert0(sock->outgoing, "Cannot write on client file socket");
-  xbt_assert0(size >= 0, "Cannot send a negative amount of data");
+  xbt_assert(sock->outgoing, "Cannot write on client file socket");
+  xbt_assert(size >= 0, "Cannot send a negative amount of data");
 
   while (size) {
     int status = 0;
@@ -221,7 +221,7 @@ gras_trp_file_chunk_send_raw(gras_socket_t sock,
     status = write(sock->sd, data, (long int) size);
 
     if (status == -1) {
-      THROW4(system_error, 0, "write(%d,%p,%d) failed: %s",
+      THROWF(system_error, 0, "write(%d,%p,%d) failed: %s",
              sock->sd, data, (int) size, strerror(errno));
     }
 
@@ -229,7 +229,7 @@ gras_trp_file_chunk_send_raw(gras_socket_t sock,
       size -= status;
       data += status;
     } else {
-      THROW0(system_error, 0, "file descriptor closed");
+      THROWF(system_error, 0, "file descriptor closed");
     }
   }
 }
@@ -246,9 +246,9 @@ gras_trp_file_chunk_recv(gras_socket_t sock,
 
   int got = 0;
 
-  xbt_assert0(sock, "Cannot recv on an NULL socket");
-  xbt_assert0(sock->incoming, "Cannot recv on client file socket");
-  xbt_assert0(size >= 0, "Cannot receive a negative amount of data");
+  xbt_assert(sock, "Cannot recv on an NULL socket");
+  xbt_assert(sock->incoming, "Cannot recv on client file socket");
+  xbt_assert(size >= 0, "Cannot receive a negative amount of data");
 
   if (sock->recvd) {
     data[0] = sock->recvd_val;
@@ -264,7 +264,7 @@ gras_trp_file_chunk_recv(gras_socket_t sock,
     XBT_DEBUG("read(%d, %p, %ld);", sock->sd, data + got, size);
 
     if (status < 0) {
-      THROW4(system_error, 0, "read(%d,%p,%d) failed: %s",
+      THROWF(system_error, 0, "read(%d,%p,%d) failed: %s",
              sock->sd, data + got, (int) size, strerror(errno));
     }
 
@@ -272,7 +272,7 @@ gras_trp_file_chunk_recv(gras_socket_t sock,
       size -= status;
       got += status;
     } else {
-      THROW1(system_error, errno, "file descriptor closed after %d bytes",
+      THROWF(system_error, errno, "file descriptor closed after %d bytes",
              got);
     }
   }