X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d18a2c38d1b8ab12e529771945100be0b24f0288..49e9f443f655fd07cc8ed1e4ad6ce329ded0fdc3:/src/mc/remote/Channel.cpp

diff --git a/src/mc/remote/Channel.cpp b/src/mc/remote/Channel.cpp
index 60d59894bf..57f8942a4c 100644
--- a/src/mc/remote/Channel.cpp
+++ b/src/mc/remote/Channel.cpp
@@ -33,23 +33,23 @@ int Channel::send(const void* message, size_t size) const
     }
   }
 
-  if (is_valid_MessageType(*(int*)message)) {
-    XBT_DEBUG("Sending %s (%lu bytes sent)", to_c_str(*(MessageType*)message), size);
+  if (is_valid_MessageType(*static_cast<const int*>(message))) {
+    XBT_DEBUG("Sending %s (%zu bytes sent)", to_c_str(*static_cast<const MessageType*>(message)), size);
   } else {
-    XBT_DEBUG("Sending bytes directly (from address %p) (%lu bytes sent)", message, size);
+    XBT_DEBUG("Sending bytes directly (from address %p) (%zu bytes sent)", message, size);
   }
 
   return 0;
 }
 
-ssize_t Channel::receive(void* message, size_t size, bool block) const
+ssize_t Channel::receive(void* message, size_t size) const
 {
-  ssize_t res = recv(this->socket_, message, size, block ? 0 : MSG_DONTWAIT);
+  ssize_t res = recv(this->socket_, message, size, 0);
   if (res != -1) {
-    if (is_valid_MessageType(*(int*)message)) {
-      XBT_DEBUG("Receive %s (requested %lu; received %lu)", to_c_str(*(MessageType*)message), size, res);
+    if (is_valid_MessageType(*static_cast<int*>(message))) {
+      XBT_DEBUG("Receive %s (requested %zu; received %zd)", to_c_str(*static_cast<MessageType*>(message)), size, res);
     } else {
-      XBT_DEBUG("Receive %lu bytes", res);
+      XBT_DEBUG("Receive %zd bytes", res);
     }
   } else {
     XBT_ERROR("Channel::receive failure: %s", strerror(errno));