Some work to get it ansi compliant, still much to doo

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

diff --git a/src/gras/Transport/transport_plugin_buf.c b/src/gras/Transport/transport_plugin_buf.c
index 22d7ae6742dcfd3999640c370eb87b83b374ec8f..8ed2e025b5daca7e25de413e9ea95e7e4a9f257e 100644 (file)
--- a/src/gras/Transport/transport_plugin_buf.c
+++ b/src/gras/Transport/transport_plugin_buf.c
@@ -15,7 +15,8 @@
 #include "gras_private.h"
 #include "transport_private.h"
 
-GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(trp_buf,transport);
+GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(trp_buf,transport,
+      "Generic buffered transport (works on top of TCP or SG)");
 
 /***
  *** Prototypes 
@@ -67,20 +68,19 @@ struct gras_trp_bufdata_{
 };
 
 gras_error_t gras_trp_buf_init_sock(gras_socket_t *sock) {
-  gras_trp_bufdata_t *data=malloc(sizeof(gras_trp_bufdata_t));
+  gras_trp_bufdata_t *data=gras_new(gras_trp_bufdata_t,1);
   
   GRAS_IN;
   if (!data)
     RAISE_MALLOC;
   data->in.size  = 0;
-  //  data->buffsize = 32 * 1024 - 4; /* default socket buffsize (32k) - headers */ 
   data->buffsize = 100 * 1024 ; /* 100k */ 
 
-  if (!(data->in.data = malloc(data->buffsize)))
+  if (!(data->in.data = (char*)gras_malloc(data->buffsize)))
     RAISE_MALLOC;
   data->in.pos   = 0; /* useless, indeed, since size==pos */
   data->out.size = 0;
-  if (!(data->out.data = malloc(data->buffsize)))
+  if (!(data->out.data = (char*)gras_malloc(data->buffsize)))
     RAISE_MALLOC;
   data->out.pos  = 0;
   sock->bufdata = data;
@@ -94,7 +94,7 @@ gras_error_t gras_trp_buf_init_sock(gras_socket_t *sock) {
 gras_error_t
 gras_trp_buf_setup(gras_trp_plugin_t *plug) {
   gras_error_t errcode;
-  gras_trp_buf_plug_data_t *data =malloc(sizeof(gras_trp_buf_plug_data_t));
+  gras_trp_buf_plug_data_t *data =gras_new(gras_trp_buf_plug_data_t,1);
   if (!data)
     RAISE_MALLOC;
 
@@ -178,7 +178,7 @@ void gras_trp_buf_socket_close(gras_socket_t *sock){
     free(data->out.data);
   free(data);
 
-  return super->socket_close(sock);
+  super->socket_close(sock);
 }
 
 /**