Fix miscasted logging arguments

[simgrid.git] / src / gras / Transport / transport.c

diff --git a/src/gras/Transport/transport.c b/src/gras/Transport/transport.c
index 46629df..13b466e 100644 (file)
--- a/src/gras/Transport/transport.c
+++ b/src/gras/Transport/transport.c
@@ -109,9 +109,11 @@ gras_error_t gras_trp_socket_new(int incoming,
 
   if (! (sock=malloc(sizeof(gras_socket_t))) )
     RAISE_MALLOC;
+  DEBUG1("Create a new socket (%p)", sock);
 
   sock->plugin = NULL;
   sock->sd     = -1;
+  sock->data   = NULL;
 
   sock->incoming  = incoming ? 1:0;
   sock->outgoing  = incoming ? 0:1;
@@ -123,7 +125,8 @@ gras_error_t gras_trp_socket_new(int incoming,
   sock->raw = 0;
 
   *dst = sock;
-  return no_error;
+
+  return gras_dynar_push(gras_socketset_get(),dst);
 }
 
 
@@ -165,13 +168,6 @@ gras_socket_server(unsigned short port,
   }
 
   *dst = sock;
-  /* Register this socket */
-  errcode = gras_dynar_push(gras_socketset_get(),dst);
-  if (errcode != no_error) {
-    free(sock);
-    *dst = NULL;
-    return errcode;
-  }
 
   return no_error;
 }
@@ -196,6 +192,7 @@ gras_socket_client(const char *host,
   TRY(gras_trp_plugin_get_by_name(gras_if_RL() ? "tcp" : "sg",
                                  &trp));
 
+  DEBUG1("Create a client socket from plugin %s",gras_if_RL() ? "tcp" : "sg");
   /* defaults settings */
   TRY(gras_trp_socket_new(0,&sock));
   sock->plugin= trp;
@@ -216,14 +213,7 @@ gras_socket_client(const char *host,
     return errcode;
   }
 
-  /* register socket */
   *dst = sock;
-  errcode = gras_dynar_push(gras_socketset_get(),dst);
-  if (errcode != no_error) {
-    free(sock);
-    *dst = NULL;
-    return errcode;
-  }
 
   return no_error;
 }
@@ -260,7 +250,7 @@ void gras_socket_close(gras_socket_t *sock) {
 gras_error_t
 gras_trp_chunk_send(gras_socket_t *sd,
                    char *data,
-                   size_t size) {
+                   long int size) {
   gras_assert1(sd->outgoing,
               "Socket not suited for data send (outgoing=%c)",
               sd->outgoing?'y':'n');
@@ -277,7 +267,7 @@ gras_trp_chunk_send(gras_socket_t *sd,
 gras_error_t 
 gras_trp_chunk_recv(gras_socket_t *sd,
                    char *data,
-                   size_t size) {
+                   long int size) {
   gras_assert0(sd->incoming,
               "Socket not suited for data receive");
   gras_assert1(sd->plugin->chunk_recv,