From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Sun, 13 Feb 2005 23:51:46 +0000 (+0000)
Subject: Kill the useless xbt_free (was define'd to free)
X-Git-Tag: v3.3~4335
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/2995193b7e30d03c04917852c4c0b26d26646273?ds=sidebyside

Kill the useless xbt_free (was define'd to free)


git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@1016 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/src/amok/Bandwidth/bandwidth.c b/src/amok/Bandwidth/bandwidth.c
index 84ba662de5..88f2fec2c3 100644
--- a/src/amok/Bandwidth/bandwidth.c
+++ b/src/amok/Bandwidth/bandwidth.c
@@ -149,7 +149,7 @@ xbt_error_t amok_bw_test(gras_socket_t peer,
 	    xbt_error_name(errcode),gras_socket_peer_name(peer),request_ack->host.port);
     return errcode;
   }
-  xbt_free(request_ack);
+  free(request_ack);
   INFO0("Got ACK");
 
   *sec=gras_os_time();
diff --git a/src/amok/base.c b/src/amok/base.c
index 0e4ab79264..c17ffb22a8 100644
--- a/src/amok/base.c
+++ b/src/amok/base.c
@@ -41,8 +41,8 @@ amok_remoterr_t amok_remoterr_new_va(xbt_error_t param_errcode,
 
 void amok_remoterr_free(amok_remoterr_t *err) {
    if (err && *err) {
-      if ((*err)->msg) xbt_free((*err)->msg);
-      xbt_free(*err);
+      if ((*err)->msg) free((*err)->msg);
+      free(*err);
       err=NULL;
    }
 }
diff --git a/src/gras/DataDesc/cbps.c b/src/gras/DataDesc/cbps.c
index 7cb4252123..9ce129b4f3 100644
--- a/src/gras/DataDesc/cbps.c
+++ b/src/gras/DataDesc/cbps.c
@@ -29,7 +29,7 @@ typedef struct s_gras_cbps {
 static void free_string(void *d);
 
 static void free_string(void *d){
-  xbt_free(*(void**)d);
+  free(*(void**)d);
 }
 
 gras_cbps_t gras_cbps_new(void) {
@@ -57,7 +57,7 @@ void gras_cbps_free(gras_cbps_t *state) {
   xbt_dynar_free( &( (*state)->frames  ) );
   xbt_dynar_free( &( (*state)->globals ) );
 
-  xbt_free(*state);
+  free(*state);
   *state = NULL;
 }
 
@@ -138,7 +138,7 @@ gras_cbps_v_pop (gras_cbps_t            ps,
     *ddt = var->type;  
   data    = var->data;
   
-  xbt_free(var);
+  free(var);
   
   xbt_dynar_pop(ps->frames, &frame);
   {
@@ -150,7 +150,7 @@ gras_cbps_v_pop (gras_cbps_t            ps,
       _name = xbt_dynar_get_as(frame, l, char*);
       if (!strcmp(name, _name)) {
 	xbt_dynar_remove_at(frame, l, &_name);
-	xbt_free(_name);
+	free(_name);
 	break;
       }
     }
@@ -276,9 +276,9 @@ gras_cbps_block_end(gras_cbps_t ps) {
       xbt_dynar_free_container(&varstack); /*already empty, save a test ;) */
     }
     
-    if (var->data) xbt_free(var->data);
-    xbt_free(var);
-    xbt_free(name);
+    if (var->data) free(var->data);
+    free(var);
+    free(name);
   }
   xbt_dynar_free_container(&frame);/* we just emptied it */
   DEBUG0("<<< Block end");
diff --git a/src/gras/DataDesc/ddt_create.c b/src/gras/DataDesc/ddt_create.c
index 84cc1023db..b44d608f1c 100644
--- a/src/gras/DataDesc/ddt_create.c
+++ b/src/gras/DataDesc/ddt_create.c
@@ -117,8 +117,8 @@ void gras_dd_cat_field_free(void *f) {
   XBT_IN;
   if (field) {
     if (field->name) 
-      xbt_free(field->name);
-    xbt_free(field);
+      free(field->name);
+    free(field);
   }
   XBT_OUT;
 }
@@ -550,7 +550,7 @@ gras_datadesc_type_t
   sprintf(name,"%s[]*",element_type->name);
   res = gras_datadesc_ref(name,res);
 
-  xbt_free(name);
+  free(name);
 
   return res;
 }
@@ -687,8 +687,8 @@ void gras_datadesc_free(gras_datadesc_type_t *type) {
     /* datadesc was invalid. Killing it is like euthanasy, I guess */
     break;
   }
-  xbt_free((*type)->name);
-  xbt_free(*type);
+  free((*type)->name);
+  free(*type);
   type=NULL;
 }
 
diff --git a/src/gras/DataDesc/ddt_exchange.c b/src/gras/DataDesc/ddt_exchange.c
index 2b4ff84b10..376752f600 100644
--- a/src/gras/DataDesc/ddt_exchange.c
+++ b/src/gras/DataDesc/ddt_exchange.c
@@ -63,7 +63,7 @@ gras_dd_recv_int(gras_socket_t sock, int r_arch, int *i) {
     TRY(gras_trp_chunk_recv(sock, (char*)ptr, int_type->size[r_arch]));
     if (r_arch != GRAS_THISARCH)
       TRY(gras_dd_convert_elm(int_type,1,r_arch, ptr,i));
-    xbt_free(ptr);
+    free(ptr);
   }
   DEBUG1("recv_int(%d)",*i);
 
@@ -114,7 +114,7 @@ gras_dd_alloc_ref(xbt_dict_t  refs,
     DEBUG2("Insert %p under %p",*(void**)ptr, *(void**)r_ref);
 
     if (detect_cycle)
-       xbt_dict_set_ext(refs,(const char *) r_ref, r_len, ptr, xbt_free_fct);
+       xbt_dict_set_ext(refs,(const char *) r_ref, r_len, ptr, free);
   }
   return no_error;
 }
@@ -393,7 +393,7 @@ gras_datadesc_recv_rec(gras_socket_t         sock,
       TRY(gras_trp_chunk_recv(sock, (char*)ptr, type->size[r_arch]));
       if (r_arch != GRAS_THISARCH)
 	TRY(gras_dd_convert_elm(type,1,r_arch, ptr,l_data));
-      xbt_free(ptr);
+      free(ptr);
     }
     break;
 
@@ -484,7 +484,7 @@ gras_datadesc_recv_rec(gras_socket_t         sock,
       VERB1("Not receiving data remotely referenced @%p since it's NULL",
 	    *(void **)r_ref);
       *(void**)l_data = NULL;
-      xbt_free(r_ref);
+      free(r_ref);
       break;
     }
          
@@ -542,7 +542,7 @@ gras_datadesc_recv_rec(gras_socket_t         sock,
     } else {
       return errcode;
     }
-    xbt_free(r_ref);
+    free(r_ref);
     break;
   }
 
@@ -580,7 +580,7 @@ gras_datadesc_recv_rec(gras_socket_t         sock,
 				sub_type->size[r_arch] * count));
 	if (r_arch != GRAS_THISARCH)
 	  TRY(gras_dd_convert_elm(sub_type,count,r_arch, ptr,l_data));
-	xbt_free(ptr);
+	free(ptr);
       }
     } else if (sub_type->category_code == e_gras_datadesc_type_cat_array &&
 	       sub_type->category.array_data.fixed_size > 0 &&
@@ -604,7 +604,7 @@ gras_datadesc_recv_rec(gras_socket_t         sock,
 				subsub_type->size[r_arch] * count*array_data.fixed_size));
 	if (r_arch != GRAS_THISARCH)
 	  TRY(gras_dd_convert_elm(subsub_type,count*array_data.fixed_size,r_arch, ptr,l_data));
-	xbt_free(ptr);
+	free(ptr);
       }
       
        
@@ -932,7 +932,7 @@ gras_datadesc_gen_recv_rec(gras_socket_t         sock,
       TRY(gras_trp_chunk_recv(sock, (char*)ptr, type->size[r_arch]));
       if (r_arch != GRAS_THISARCH)
 	TRY(gras_dd_convert_elm(type,1,r_arch, ptr,l_data));
-      xbt_free(ptr);
+      free(ptr);
     }
     break;
 
@@ -1023,7 +1023,7 @@ gras_datadesc_gen_recv_rec(gras_socket_t         sock,
       VERB1("Not receiving data remotely referenced @%p since it's NULL",
 	    *(void **)r_ref);
       *(void**)l_data = NULL;
-      xbt_free(r_ref);
+      free(r_ref);
       break;
     }
          
@@ -1081,7 +1081,7 @@ gras_datadesc_gen_recv_rec(gras_socket_t         sock,
     } else {
       return errcode;
     }
-    xbt_free(r_ref);
+    free(r_ref);
     break;
   }
 
@@ -1119,7 +1119,7 @@ gras_datadesc_gen_recv_rec(gras_socket_t         sock,
 				sub_type->size[r_arch] * count));
 	if (r_arch != GRAS_THISARCH)
 	  TRY(gras_dd_convert_elm(sub_type,count,r_arch, ptr,l_data));
-	xbt_free(ptr);
+	free(ptr);
       }
     } else if (sub_type->category_code == e_gras_datadesc_type_cat_array &&
 	       sub_type->category.array_data.fixed_size > 0 &&
@@ -1143,7 +1143,7 @@ gras_datadesc_gen_recv_rec(gras_socket_t         sock,
 				subsub_type->size[r_arch] * count*array_data.fixed_size));
 	if (r_arch != GRAS_THISARCH)
 	  TRY(gras_dd_convert_elm(subsub_type,count*array_data.fixed_size,r_arch, ptr,l_data));
-	xbt_free(ptr);
+	free(ptr);
       }
       
        
diff --git a/src/gras/DataDesc/ddt_parse.c b/src/gras/DataDesc/ddt_parse.c
index c60dcc015d..c034d63084 100644
--- a/src/gras/DataDesc/ddt_parse.c
+++ b/src/gras/DataDesc/ddt_parse.c
@@ -115,7 +115,7 @@ static void change_to_fixed_array(xbt_dynar_t dynar, long int size) {
   DEBUG2("Array specification (size=%ld, elm='%s'), change pushed type",
 	 size,former.type_name);
   sprintf(array.type_name,"%s[%ld]",former.type_name,size);
-  xbt_free(former.type_name);
+  free(former.type_name);
 
   array.type = gras_datadesc_array_fixed(array.type_name, former.type, size); /* redeclaration are ignored */
   array.name = former.name;
@@ -132,7 +132,7 @@ static void change_to_ref(xbt_dynar_t dynar) {
   ref.type_name=(char*)xbt_malloc(strlen(former.type->name)+2);
   DEBUG1("Ref specification (elm='%s'), change pushed type", former.type_name);
   sprintf(ref.type_name,"%s*",former.type_name);
-  xbt_free(former.type_name);
+  free(former.type_name);
 
   ref.type = gras_datadesc_ref(ref.type_name, former.type); /* redeclaration are ignored */
   ref.name = former.name;
@@ -151,7 +151,7 @@ static void change_to_ref_pop_array(xbt_dynar_t dynar) {
   ref.type_name = (char*)strdup(ref.type->name);
   ref.name = former.name;
 
-  xbt_free(former.type_name);
+  free(former.type_name);
 
   xbt_dynar_push(dynar,&ref);
   XBT_OUT;
@@ -365,14 +365,14 @@ static xbt_error_t parse_statement(char	 *definition,
 
 	DEBUG2("Anotation: %s=%s",keyname,keyval);
 	if (!strcmp(keyname,"size")) {
-	  xbt_free(keyname);
+	  free(keyname);
 	  if (!identifier.tm.is_ref)
 	    PARSE_ERROR0("Size annotation for a field not being a reference");
 	  identifier.tm.is_ref--;
 
 	  if (!strcmp(keyval,"1")) {
 	    change_to_ref(identifiers);
-	    xbt_free(keyval);
+	    free(keyval);
 	    continue;
 	  } else {
 	    char *p;
@@ -383,7 +383,7 @@ static xbt_error_t parse_statement(char	 *definition,
 	    if (fixed) {
 	      change_to_fixed_array(identifiers,atoi(keyval));
 	      change_to_ref(identifiers);
-	      xbt_free(keyval);
+	      free(keyval);
 	      continue;
 
 	    } else {
@@ -479,8 +479,8 @@ static gras_datadesc_type_t parse_struct(char *definition) {
 
       VERB2("Append field '%s' to %p",field.name, (void*)struct_type);      
       gras_datadesc_struct_append(struct_type, field.name, field.type);
-      xbt_free(field.name);
-      xbt_free(field.type_name);
+      free(field.name);
+      free(field.type_name);
 
     }
     xbt_dynar_reset(identifiers);
@@ -491,7 +491,7 @@ static gras_datadesc_type_t parse_struct(char *definition) {
       DEBUG1("struct_type=%p",(void*)struct_type);
       VERB2("Push field '%s' into size stack of %p", name, (void*)struct_type);
       gras_datadesc_cb_field_push(struct_type, name);
-      xbt_free(name);
+      free(name);
     }
     xbt_dynar_reset(fields_to_push);
   }
@@ -599,7 +599,7 @@ gras_datadesc_parse(const char            *name,
 
   gras_ddt_parse_pointer_string_close();
   VERB0("end of _gras_ddt_type_parse()");
-  xbt_free(definition);
+  free(definition);
   /* register it under the name provided as symbol */
   if (strcmp(res->name,name)) {
     ERROR2("In GRAS_DEFINE_TYPE, the provided symbol (here %s) must be the C type name (here %s)",
diff --git a/src/gras/Msg/msg.c b/src/gras/Msg/msg.c
index cb358b3415..dca2f9037a 100644
--- a/src/gras/Msg/msg.c
+++ b/src/gras/Msg/msg.c
@@ -84,8 +84,8 @@ gras_msg_exit(void) {
 void gras_msgtype_free(void *t) {
   gras_msgtype_t msgtype=(gras_msgtype_t)t;
   if (msgtype) {
-    xbt_free(msgtype->name);
-    xbt_free(msgtype);
+    free(msgtype->name);
+    free(msgtype);
   }
 }
 
@@ -188,7 +188,7 @@ gras_msgtype_t gras_msgtype_by_namev(const char      *name,
   if (!res) 
      WARN1("msgtype_by_name(%s) returns NULL",namev);
   if (name != namev) 
-    xbt_free(namev);
+    free(namev);
   
   return res;
 }
@@ -262,7 +262,7 @@ gras_msg_recv(gras_socket_t    sock,
 	   "Got error %s while retrieving the type associated to messages '%s'",
 	   xbt_error_name(errcode),msg_name);
   /* FIXME: Survive unknown messages */
-  xbt_free(msg_name);
+  free(msg_name);
 
   *payload_size=gras_datadesc_size((*msgtype)->ctn_type);
   xbt_assert2(*payload_size > 0,
@@ -316,7 +316,7 @@ gras_msg_wait(double           timeout,
     if (msg.type->code == msgt_want->code) {
       *expeditor = msg.expeditor;
       memcpy(payload, msg.payload, msg.payload_size);
-      xbt_free(msg.payload);
+      free(msg.payload);
       xbt_dynar_cursor_rm(pd->msg_queue, &cpt);
       VERB0("The waited message was queued");
       return no_error;
@@ -328,7 +328,7 @@ gras_msg_wait(double           timeout,
     TRY(gras_msg_recv(*expeditor, &msgt_got, &payload_got, &payload_size_got));
     if (msgt_got->code == msgt_want->code) {
       memcpy(payload, payload_got, payload_size_got);
-      xbt_free(payload_got);
+      free(payload_got);
       VERB0("Got waited message");
       return no_error;
     }
@@ -430,7 +430,7 @@ gras_msg_handle(double timeOut) {
           cpt+1,cb,msgtype->name);
     if ((*cb)(expeditor,payload)) {
       /* cb handled the message */
-      xbt_free(payload);
+      free(payload);
       return no_error;
     }
   }
@@ -445,7 +445,7 @@ gras_cbl_free(void *data){
   gras_cblist_t *list=*(void**)data;
   if (list) {
     xbt_dynar_free(&( list->cbs ));
-    xbt_free(list);
+    free(list);
   }
 }
 
diff --git a/src/gras/Transport/transport.c b/src/gras/Transport/transport.c
index a1788a2b91..fd7e4d4c91 100644
--- a/src/gras/Transport/transport.c
+++ b/src/gras/Transport/transport.c
@@ -31,8 +31,8 @@ gras_trp_plugin_new(const char *name, gras_trp_setup_t setup) {
   switch (errcode) {
   case mismatch_error:
     /* SG plugin return mismatch when in RL mode (and vice versa) */
-    xbt_free(plug->name);
-    xbt_free(plug);
+    free(plug->name);
+    free(plug);
     break;
 
   case no_error:
@@ -121,11 +121,11 @@ void gras_trp_plugin_free(void *p) {
       plug->exit(plug);
     } else if (plug->data) {
       DEBUG1("Plugin %s lacks exit(). Free data anyway.",plug->name);
-      xbt_free(plug->data);
+      free(plug->data);
     }
 
-    xbt_free(plug->name);
-    xbt_free(plug);
+    free(plug->name);
+    free(plug);
   }
 }
 
@@ -203,7 +203,7 @@ gras_socket_server_ext(unsigned short port,
 	 sock->accepting?'y':'n');
 
   if (errcode != no_error) {
-    xbt_free(sock);
+    free(sock);
     return errcode;
   }
 
@@ -252,7 +252,7 @@ gras_socket_client_ext(const char *host,
 	 sock->accepting?'y':'n');
 
   if (errcode != no_error) {
-    xbt_free(sock);
+    free(sock);
     return errcode;
   }
 
@@ -302,8 +302,8 @@ void gras_socket_close(gras_socket_t sock) {
 
 	/* free the memory */
 	if (sock->peer_name)
-	  xbt_free(sock->peer_name);
-	xbt_free(sock);
+	  free(sock->peer_name);
+	free(sock);
 	return;
       }
     }
@@ -391,7 +391,7 @@ xbt_error_t gras_socket_raw_send(gras_socket_t peer,
 	  exp_sofar,exp_size,msg_size,
 	  gras_socket_peer_name(peer), gras_socket_peer_port(peer));
 	     
-  xbt_free(chunk);
+  free(chunk);
   return no_error;/* gras_socket_raw_exchange(peer,1,timeout,expSize,msgSize);    */
 }
 
@@ -415,7 +415,7 @@ xbt_error_t gras_socket_raw_recv(gras_socket_t peer,
 	  exp_sofar,exp_size,msg_size,
 	  gras_socket_peer_name(peer), gras_socket_peer_port(peer));
 
-  xbt_free(chunk);
+  free(chunk);
   return no_error;/* gras_socket_raw_exchange(peer,0,timeout,expSize,msgSize);    */
 }
 
diff --git a/src/gras/Transport/transport_plugin_buf.c b/src/gras/Transport/transport_plugin_buf.c
index dc3d81b70e..5294c51763 100644
--- a/src/gras/Transport/transport_plugin_buf.c
+++ b/src/gras/Transport/transport_plugin_buf.c
@@ -163,10 +163,10 @@ void gras_trp_buf_socket_close(gras_socket_t sock){
   if (data->in.size || data->out.size)
     gras_trp_buf_flush(sock);
   if (data->in.data)
-    xbt_free(data->in.data);
+    free(data->in.data);
   if (data->out.data)
-    xbt_free(data->out.data);
-  xbt_free(data);
+    free(data->out.data);
+  free(data);
 
   super->socket_close(sock);
 }
diff --git a/src/gras/Transport/transport_plugin_sg.c b/src/gras/Transport/transport_plugin_sg.c
index 44dbade782..6e7725c4ca 100644
--- a/src/gras/Transport/transport_plugin_sg.c
+++ b/src/gras/Transport/transport_plugin_sg.c
@@ -208,7 +208,7 @@ void gras_trp_sg_socket_close(gras_socket_t sock){
   xbt_assert0(hd,"Please run gras_process_init on each process");
 
   if (sock->data)
-    xbt_free(sock->data);
+    free(sock->data);
 
   if (sock->incoming) {
     /* server mode socket. Un register it from 'OS' tables */
@@ -280,8 +280,8 @@ xbt_error_t gras_trp_sg_chunk_recv(gras_socket_t sock,
 	   MSG_host_get_name(sock_data->to_host),
 	   MSG_host_get_name(MSG_host_self()), sock_data->to_chan);
   memcpy(data,task_data->data,size);
-  xbt_free(task_data->data);
-  xbt_free(task_data);
+  free(task_data->data);
+  free(task_data);
 
   if (MSG_task_destroy(task) != MSG_OK)
     RAISE0(unknown_error,"Error in MSG_task_destroy()");
diff --git a/src/gras/Transport/transport_plugin_tcp.c b/src/gras/Transport/transport_plugin_tcp.c
index 6a4b64d6d1..00994e046e 100644
--- a/src/gras/Transport/transport_plugin_tcp.c
+++ b/src/gras/Transport/transport_plugin_tcp.c
@@ -89,7 +89,7 @@ xbt_error_t gras_trp_tcp_setup(gras_trp_plugin_t *plug) {
 
 void gras_trp_tcp_exit(gras_trp_plugin_t *plug) {
   DEBUG1("Exit plugin TCP (free %p)", plug->data);
-  xbt_free(plug->data);
+  free(plug->data);
 }
 
 xbt_error_t gras_trp_tcp_socket_client(gras_trp_plugin_t *self,
@@ -436,13 +436,13 @@ xbt_error_t gras_socket_raw_exchange(gras_socket_t peer,
 	 }
 	 if (res_last == 0) {
 	   /* No progress done, bail out */
-	   xbt_free(chunk);
+	   free(chunk);
 	   RAISE0(unknown_error,"Not exchanged a single byte, bailing out");
 	 }
       }
    }
    
-   xbt_free(chunk);
+   free(chunk);
    return no_error;
 }
 
diff --git a/src/msg/global.c b/src/msg/global.c
index 54e39b9c8a..4ef88f4261 100644
--- a/src/msg/global.c
+++ b/src/msg/global.c
@@ -531,7 +531,7 @@ MSG_error_t MSG_clean(void)
     fclose(msg_global->paje_output);
     msg_global->paje_output = NULL;
   }
-  xbt_free(msg_global);
+  free(msg_global);
   surf_finalize();
 
   return MSG_OK;
diff --git a/src/msg/host.c b/src/msg/host.c
index c2d6a76acf..a6cc623bf5 100644
--- a/src/msg/host.c
+++ b/src/msg/host.c
@@ -132,17 +132,17 @@ void __MSG_host_destroy(m_host_t host)
 
   for (i = 0; i < msg_global->max_channel; i++)
     xbt_fifo_free(simdata->mbox[i]);
-  xbt_free(simdata->mbox);
-  xbt_free(simdata->sleeping);
+  free(simdata->mbox);
+  free(simdata->sleeping);
   xbt_assert0((xbt_fifo_size(simdata->process_list)==0),
 	      "Some process are still running on this host");
   xbt_fifo_free(simdata->process_list);
 
-  xbt_free(simdata);
+  free(simdata);
 
   /* Clean host structure */
-  xbt_free(host->name);
-  xbt_free(host);
+  free(host->name);
+  free(host);
 
   return;
 }
diff --git a/src/msg/m_process.c b/src/msg/m_process.c
index 50bd95c025..3c603a0e43 100644
--- a/src/msg/m_process.c
+++ b/src/msg/m_process.c
@@ -49,9 +49,9 @@ static void MSG_process_cleanup(void *arg)
   xbt_fifo_remove(msg_global->process_list, arg);
   xbt_fifo_remove(msg_global->process_to_run, arg);
   xbt_fifo_remove(((m_process_t) arg)->simdata->host->simdata->process_list, arg);
-  xbt_free(((m_process_t) arg)->name);
-  xbt_free(((m_process_t) arg)->simdata);
-  xbt_free(arg);
+  free(((m_process_t) arg)->name);
+  free(((m_process_t) arg)->simdata);
+  free(arg);
 }
 
 /** \ingroup m_process_management
diff --git a/src/msg/task.c b/src/msg/task.c
index 2cec867ab3..89a21ac1df 100644
--- a/src/msg/task.c
+++ b/src/msg/task.c
@@ -113,7 +113,7 @@ MSG_error_t MSG_task_destroy(m_task_t task)
   xbt_assert0((xbt_dynar_length(task->simdata->sleeping)==0), 
 	      "Task still used. There is a problem. Cannot destroy it now!");
 
-  if(task->name) xbt_free(task->name);
+  if(task->name) free(task->name);
 
   xbt_dynar_free(&(task->simdata->sleeping));
 
@@ -123,8 +123,8 @@ MSG_error_t MSG_task_destroy(m_task_t task)
   if(action) action->resource_type->common_public->action_free(action);
 
 
-  xbt_free(task->simdata);
-  xbt_free(task);
+  free(task->simdata);
+  free(task);
 
   return MSG_OK;
 }
diff --git a/src/surf/cpu.c b/src/surf/cpu.c
index 463d81ff6d..cd3024a830 100644
--- a/src/surf/cpu.c
+++ b/src/surf/cpu.c
@@ -16,8 +16,8 @@ xbt_dict_t cpu_set = NULL;
 
 static void cpu_free(void *cpu)
 {
-  xbt_free(((cpu_Cas01_t)cpu)->name);
-  xbt_free(cpu);
+  free(((cpu_Cas01_t)cpu)->name);
+  free(cpu);
 }
 
 static cpu_Cas01_t cpu_new(char *name, double power_scale,
@@ -109,7 +109,7 @@ static void action_free(surf_action_t action)
   xbt_swag_remove(action, action->state_set);
   if(((surf_action_cpu_Cas01_t)action)->variable)
     lmm_variable_free(maxmin_system, ((surf_action_cpu_Cas01_t)action)->variable);
-  xbt_free(action);
+  free(action);
 
   return;
 }
@@ -283,11 +283,11 @@ static void finalize(void)
   xbt_swag_free(surf_cpu_resource->common_public->states.
 		failed_action_set);
   xbt_swag_free(surf_cpu_resource->common_public->states.done_action_set);
-  xbt_free(surf_cpu_resource->common_public);
-  xbt_free(surf_cpu_resource->common_private);
-  xbt_free(surf_cpu_resource->extension_public);
+  free(surf_cpu_resource->common_public);
+  free(surf_cpu_resource->common_private);
+  free(surf_cpu_resource->extension_public);
 
-  xbt_free(surf_cpu_resource);
+  free(surf_cpu_resource);
   surf_cpu_resource = NULL;
 }
 
diff --git a/src/surf/maxmin.c b/src/surf/maxmin.c
index 45665905fe..7d5dbf0e99 100644
--- a/src/surf/maxmin.c
+++ b/src/surf/maxmin.c
@@ -49,7 +49,7 @@ void lmm_system_free(lmm_system_t sys)
   while ((cnst = extract_constraint(sys)))
     lmm_cnst_free(sys, cnst);
 
-  xbt_free(sys);
+  free(sys);
 }
 
 void lmm_variable_disable(lmm_system_t sys, lmm_variable_t var)
@@ -74,8 +74,8 @@ static void lmm_var_free(lmm_system_t sys, lmm_variable_t var)
 
   lmm_variable_disable(sys, var);
   memset(var->cnsts,0,var->cnsts_size*sizeof(s_lmm_element_t));
-  xbt_free(var->cnsts);
-  xbt_free(var);
+  free(var->cnsts);
+  free(var);
 }
 
 static void lmm_cnst_free(lmm_system_t sys, lmm_constraint_t cnst)
@@ -83,7 +83,7 @@ static void lmm_cnst_free(lmm_system_t sys, lmm_constraint_t cnst)
 /*   xbt_assert0(xbt_swag_size(&(cnst->element_set)), */
 /* 	      "This list should be empty!"); */
   remove_active_constraint(sys, cnst);
-  xbt_free(cnst);
+  free(cnst);
 }
 
 lmm_constraint_t lmm_constraint_new(lmm_system_t sys, void *id,
diff --git a/src/surf/network.c b/src/surf/network.c
index 22d234aa76..848b796c40 100644
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -32,8 +32,8 @@ static void create_routing_table(void)
 
 static void network_link_free(void *nw_link)
 {
-  xbt_free(((network_link_CM02_t)nw_link)->name);
-  xbt_free(nw_link);
+  free(((network_link_CM02_t)nw_link)->name);
+  free(nw_link);
 }
 
 static network_link_CM02_t network_link_new(char *name,
@@ -73,8 +73,8 @@ static network_link_CM02_t network_link_new(char *name,
 
 static void network_card_free(void *nw_card)
 {
-  xbt_free(((network_card_CM02_t)nw_card)->name);
-  xbt_free(nw_card);
+  free(((network_card_CM02_t)nw_card)->name);
+  free(nw_card);
 }
 
 static int network_card_new(const char *card_name)
@@ -101,9 +101,9 @@ static void route_new(int src_id, int dst_id, char **links, int nb_link)
   link_list = (ROUTE(src_id, dst_id) = xbt_new0(network_link_CM02_t, nb_link));
   for (i = 0; i < nb_link; i++) {
     xbt_dict_get(network_link_set, links[i], (void *) &(link_list[i]));
-    xbt_free(links[i]);
+    free(links[i]);
   }
-  xbt_free(links);
+  free(links);
 }
 
 static void parse_network_link(void)
@@ -213,7 +213,7 @@ static void action_free(surf_action_t action)
   xbt_swag_remove(action, action->state_set);
   if(((surf_action_network_CM02_t)action)->variable)
     lmm_variable_free(maxmin_system, ((surf_action_network_CM02_t)action)->variable);
-  xbt_free(action);
+  free(action);
 
   return;
 }
@@ -446,19 +446,19 @@ static void finalize(void)
 		failed_action_set);
   xbt_swag_free(surf_network_resource->common_public->states.
 		done_action_set);
-  xbt_free(surf_network_resource->common_public);
-  xbt_free(surf_network_resource->common_private);
-  xbt_free(surf_network_resource->extension_public);
+  free(surf_network_resource->common_public);
+  free(surf_network_resource->common_private);
+  free(surf_network_resource->extension_public);
 
-  xbt_free(surf_network_resource);
+  free(surf_network_resource);
   surf_network_resource = NULL;
 
   for (i = 0; i < card_number; i++) 
     for (j = 0; j < card_number; j++) 
-      xbt_free(ROUTE(i,j));
-  xbt_free(routing_table);
+      free(ROUTE(i,j));
+  free(routing_table);
   routing_table = NULL;
-  xbt_free(routing_table_size);
+  free(routing_table_size);
   routing_table_size = NULL;
   card_number = 0;
 }
diff --git a/src/surf/network_dassf.c b/src/surf/network_dassf.c
index 23471c91a5..4443248521 100644
--- a/src/surf/network_dassf.c
+++ b/src/surf/network_dassf.c
@@ -31,8 +31,8 @@ static void create_routing_table(void)
 
 static void network_link_free(void *nw_link)
 {
-  xbt_free(((network_link_DASSF_t)nw_link)->name);
-  xbt_free(nw_link);
+  free(((network_link_DASSF_t)nw_link)->name);
+  free(nw_link);
 }
 
 static network_link_DASSF_t network_link_new(char *name,
@@ -72,8 +72,8 @@ static network_link_DASSF_t network_link_new(char *name,
 
 static void network_card_free(void *nw_card)
 {
-  xbt_free(((network_card_DASSF_t)nw_card)->name);
-  xbt_free(nw_card);
+  free(((network_card_DASSF_t)nw_card)->name);
+  free(nw_card);
 }
 
 static int network_card_new(const char *card_name)
@@ -100,9 +100,9 @@ static void route_new(int src_id, int dst_id, char **links, int nb_link)
   link_list = (ROUTE(src_id, dst_id) = xbt_new0(network_link_DASSF_t, nb_link));
   for (i = 0; i < nb_link; i++) {
     xbt_dict_get(network_link_set, links[i], (void *) &(link_list[i]));
-    xbt_free(links[i]);
+    free(links[i]);
   }
-  xbt_free(links);
+  free(links);
 }
 
 static void parse_network_link(void)
@@ -212,7 +212,7 @@ static void action_free(surf_action_t action)
   xbt_swag_remove(action, action->state_set);
   if(((surf_action_network_DASSF_t)action)->variable)
     lmm_variable_free(maxmin_system, ((surf_action_network_DASSF_t)action)->variable);
-  xbt_free(action);
+  free(action);
 
   return;
 }
@@ -445,19 +445,19 @@ static void finalize(void)
 		failed_action_set);
   xbt_swag_free(surf_network_resource->common_public->states.
 		done_action_set);
-  xbt_free(surf_network_resource->common_public);
-  xbt_free(surf_network_resource->common_private);
-  xbt_free(surf_network_resource->extension_public);
+  free(surf_network_resource->common_public);
+  free(surf_network_resource->common_private);
+  free(surf_network_resource->extension_public);
 
-  xbt_free(surf_network_resource);
+  free(surf_network_resource);
   surf_network_resource = NULL;
 
   for (i = 0; i < card_number; i++) 
     for (j = 0; j < card_number; j++) 
-      xbt_free(ROUTE(i,j));
-  xbt_free(routing_table);
+      free(ROUTE(i,j));
+  free(routing_table);
   routing_table = NULL;
-  xbt_free(routing_table_size);
+  free(routing_table_size);
   routing_table_size = NULL;
   card_number = 0;
 }
diff --git a/src/surf/surf.c b/src/surf/surf.c
index 2ff094e8a3..422baf9efa 100644
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -89,7 +89,7 @@ e_surf_action_state_t surf_action_get_state(surf_action_t action)
 void surf_action_free(surf_action_t * action)
 {
   (*action)->resource_type->common_public->action_cancel(*action);
-  xbt_free(*action);
+  free(*action);
   *action = NULL;
 }
 
@@ -206,7 +206,7 @@ void surf_finalize(void)
   tmgr_finalize();
   surf_parse_lex_destroy();
   if(path_name) {
-    xbt_free(path_name);
+    free(path_name);
     path_name = NULL;
   }
 }
diff --git a/src/surf/trace_mgr.c b/src/surf/trace_mgr.c
index 403465a5ce..1dc603d626 100644
--- a/src/surf/trace_mgr.c
+++ b/src/surf/trace_mgr.c
@@ -27,7 +27,7 @@ tmgr_history_t tmgr_history_new(void)
 
   h = xbt_new0(s_tmgr_history_t, 1);
 
-  h->heap = xbt_heap_new(8, xbt_free);	/* Why 8 ? Well, why not... */
+  h->heap = xbt_heap_new(8, free);	/* Why 8 ? Well, why not... */
 
   return h;
 }
@@ -35,7 +35,7 @@ tmgr_history_t tmgr_history_new(void)
 void tmgr_history_free(tmgr_history_t h)
 {
   xbt_heap_free(h->heap);
-  xbt_free(h);
+  free(h);
 }
 
 tmgr_trace_t tmgr_trace_new(const char *filename)
@@ -115,7 +115,7 @@ void tmgr_trace_free(tmgr_trace_t trace)
   if (!trace)
     return;
   xbt_dynar_free(&(trace->event_list));
-  xbt_free(trace);
+  free(trace);
 }
 
 tmgr_trace_event_t tmgr_history_add_trace(tmgr_history_t h,
@@ -177,7 +177,7 @@ tmgr_trace_event_t tmgr_history_get_next_event_leq(tmgr_history_t h,
     xbt_heap_push(h->heap, trace_event, event_date + event->delta);
     trace_event->idx = 0;
   } else {			/* We don't need this trace_event anymore */
-    xbt_free(trace_event);
+    free(trace_event);
   }
 
   return trace_event;
diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index 636ed1e2c1..fcf77019e3 100644
--- a/src/surf/workstation.c
+++ b/src/surf/workstation.c
@@ -32,8 +32,8 @@ static workstation_CLM03_t workstation_new(const char *name,
 
 static void workstation_free(void *workstation)
 {
-  xbt_free(((workstation_CLM03_t)workstation)->name);
-  xbt_free(workstation);
+  free(((workstation_CLM03_t)workstation)->name);
+  free(workstation);
 }
 
 static void create_workstations(void)
@@ -186,11 +186,11 @@ static void finalize(void)
 		failed_action_set);
   xbt_swag_free(surf_workstation_resource->common_public->states.done_action_set);
 
-  xbt_free(surf_workstation_resource->common_public);
-  xbt_free(surf_workstation_resource->common_private);
-  xbt_free(surf_workstation_resource->extension_public);
+  free(surf_workstation_resource->common_public);
+  free(surf_workstation_resource->common_private);
+  free(surf_workstation_resource->extension_public);
 
-  xbt_free(surf_workstation_resource);
+  free(surf_workstation_resource);
   surf_workstation_resource = NULL;
 }
 
diff --git a/src/surf/workstation_KCCFLN05.c b/src/surf/workstation_KCCFLN05.c
index 6f816ddc71..94af7170ca 100644
--- a/src/surf/workstation_KCCFLN05.c
+++ b/src/surf/workstation_KCCFLN05.c
@@ -26,10 +26,10 @@ s_route_KCCFLN05_t *routing_table = NULL;
 /************ workstation creation *********/
 static void workstation_free(void *workstation)
 {
-  xbt_free(((workstation_KCCFLN05_t)workstation)->name);
+  free(((workstation_KCCFLN05_t)workstation)->name);
   xbt_dynar_free(&(((workstation_KCCFLN05_t)workstation)->incomming_communications));
   xbt_dynar_free(&(((workstation_KCCFLN05_t)workstation)->outgoing_communications));
-  xbt_free(workstation);
+  free(workstation);
 }
 
 static workstation_KCCFLN05_t workstation_new(const char *name,
@@ -185,8 +185,8 @@ static void create_routing_table(void)
 
 static void network_link_free(void *nw_link)
 {
-  xbt_free(((network_link_KCCFLN05_t)nw_link)->name);
-  xbt_free(nw_link);
+  free(((network_link_KCCFLN05_t)nw_link)->name);
+  free(nw_link);
 }
 
 static network_link_KCCFLN05_t network_link_new(char *name,
@@ -255,9 +255,9 @@ static void route_new(int src_id, int dst_id, char **links, int nb_link,
   link_list = route->links = xbt_new0(network_link_KCCFLN05_t, nb_link);
   for (i = 0; i < nb_link; i++) {
     xbt_dict_get(network_link_set, links[i], (void *) &(link_list[i]));
-    xbt_free(links[i]);
+    free(links[i]);
   }
-  xbt_free(links);
+  free(links);
   route->impact_on_src=impact_on_src;
   route->impact_on_dst=impact_on_src;
   route->impact_on_src_with_other_recv=impact_on_src_with_other_recv; 
@@ -380,7 +380,7 @@ static void action_network_KCCFLN05_free(surf_action_t action)
     }
   }
 
-  xbt_free(action);
+  free(action);
 }
 
 static double share_network_KCCFLN05_resources(double now)
@@ -525,7 +525,7 @@ static void action_cpu_KCCFLN05_free(surf_action_t action)
   xbt_swag_remove(action, action->state_set);
   if(((surf_action_cpu_KCCFLN05_t)action)->variable)
     lmm_variable_free(maxmin_system_cpu_KCCFLN05, ((surf_action_cpu_KCCFLN05_t)action)->variable);
-  xbt_free(action);
+  free(action);
 }
 
 static void action_cpu_KCCFLN05_change_state(surf_action_t action,
@@ -794,11 +794,11 @@ static void cpu_KCCFLN05_finalize(void)
   xbt_swag_free(surf_cpu_resource->common_public->states.
 		failed_action_set);
   xbt_swag_free(surf_cpu_resource->common_public->states.done_action_set);
-  xbt_free(surf_cpu_resource->common_public);
-  xbt_free(surf_cpu_resource->common_private);
-  xbt_free(surf_cpu_resource->extension_public);
+  free(surf_cpu_resource->common_public);
+  free(surf_cpu_resource->common_private);
+  free(surf_cpu_resource->extension_public);
 
-  xbt_free(surf_cpu_resource);
+  free(surf_cpu_resource);
   surf_cpu_resource = NULL;
 
   if (maxmin_system_cpu_KCCFLN05) {
@@ -876,17 +876,17 @@ static void network_KCCFLN05_finalize(void)
 		failed_action_set);
   xbt_swag_free(surf_network_resource->common_public->states.
 		done_action_set);
-  xbt_free(surf_network_resource->common_public);
-  xbt_free(surf_network_resource->common_private);
-  xbt_free(surf_network_resource->extension_public);
+  free(surf_network_resource->common_public);
+  free(surf_network_resource->common_private);
+  free(surf_network_resource->extension_public);
 
-  xbt_free(surf_network_resource);
+  free(surf_network_resource);
   surf_network_resource = NULL;
 
   for (i = 0; i < nb_workstation; i++) 
     for (j = 0; j < nb_workstation; j++) 
-      xbt_free(ROUTE(i,j).links);
-  xbt_free(routing_table);
+      free(ROUTE(i,j).links);
+  free(routing_table);
   routing_table = NULL;
   nb_workstation = 0;
 
@@ -956,11 +956,11 @@ static void workstation_KCCFLN05_finalize(void)
   xbt_swag_free(surf_workstation_resource->common_public->states.failed_action_set);
   xbt_swag_free(surf_workstation_resource->common_public->states.done_action_set);
 
-  xbt_free(surf_workstation_resource->common_public);
-  xbt_free(surf_workstation_resource->common_private);
-  xbt_free(surf_workstation_resource->extension_public);
+  free(surf_workstation_resource->common_public);
+  free(surf_workstation_resource->common_private);
+  free(surf_workstation_resource->extension_public);
 
-  xbt_free(surf_workstation_resource);
+  free(surf_workstation_resource);
   surf_workstation_resource = NULL;
 }
 
diff --git a/src/xbt/config.c b/src/xbt/config.c
index 571a57081c..49271b178e 100644
--- a/src/xbt/config.c
+++ b/src/xbt/config.c
@@ -50,13 +50,13 @@ void xbt_cfg_str_free(void *d);
 void xbt_cfg_host_free(void *d);
 
 void xbt_cfg_str_free(void *d){
-  xbt_free(*(void**)d);
+  free(*(void**)d);
 }
 void xbt_cfg_host_free(void *d){
   xbt_host_t *h=(xbt_host_t*) *(void**)d; 
   if (h) {
-    if (h->name) xbt_free(h->name);
-    xbt_free(h);
+    if (h->name) free(h->name);
+    free(h);
   }
 }
 
@@ -180,7 +180,7 @@ void xbt_cfgelm_free(void *data) {
 
   if (!c) return;
   xbt_dynar_free(&(c->content));
-  xbt_free(c);
+  free(c);
 }
 
 /*----[ Registering stuff ]-----------------------------------------------*/
@@ -276,7 +276,7 @@ xbt_cfg_register_str(xbt_cfg_t cfg,const char *entry) {
     ERROR3("%s%s%s",
 	  "Invalid config element descriptor: ",entry,
 	  "; Should be <name>:<min nb>_to_<max nb>_<type>");
-    xbt_free(entrycpy);
+    free(entrycpy);
     xbt_abort();
   }
   *(tok++)='\0';
@@ -284,7 +284,7 @@ xbt_cfg_register_str(xbt_cfg_t cfg,const char *entry) {
   min=strtol(tok, &tok, 10);
   if (!tok) {
     ERROR1("Invalid minimum in config element descriptor %s",entry);
-    xbt_free(entrycpy);
+    free(entrycpy);
     xbt_abort();
   }
 
@@ -292,7 +292,7 @@ xbt_cfg_register_str(xbt_cfg_t cfg,const char *entry) {
     ERROR3("%s%s%s",
 	  "Invalid config element descriptor: ",entry,
 	  "; Should be <name>:<min nb>_to_<max nb>_<type>");
-    xbt_free(entrycpy);
+    free(entrycpy);
     xbt_abort();
   }
   tok += strlen("_to_");
@@ -300,7 +300,7 @@ xbt_cfg_register_str(xbt_cfg_t cfg,const char *entry) {
   max=strtol(tok, &tok, 10);
   if (!tok) {
     ERROR1("Invalid maximum in config element descriptor %s",entry);
-    xbt_free(entrycpy);
+    free(entrycpy);
     xbt_abort();
   }
 
@@ -308,7 +308,7 @@ xbt_cfg_register_str(xbt_cfg_t cfg,const char *entry) {
     ERROR3("%s%s%s",
 	  "Invalid config element descriptor: ",entry,
 	  "; Should be <name>:<min nb>_to_<max nb>_<type>");
-    xbt_free(entrycpy);
+    free(entrycpy);
     xbt_abort();
   }
 
@@ -319,13 +319,13 @@ xbt_cfg_register_str(xbt_cfg_t cfg,const char *entry) {
     ERROR3("%s%s%s",
 	  "Invalid type in config element descriptor: ",entry,
 	  "; Should be one of 'string', 'int', 'host' or 'double'.");
-    xbt_free(entrycpy);
+    free(entrycpy);
     xbt_abort();
   }
 
   xbt_cfg_register(cfg,entrycpy,type,min,max);
 
-  xbt_free(entrycpy); /* strdup'ed by dict mechanism, but cannot be const */
+  free(entrycpy); /* strdup'ed by dict mechanism, but cannot be const */
   return no_error;
 }
 
@@ -566,7 +566,7 @@ xbt_cfg_set_parse(xbt_cfg_t cfg, const char *options) {
     
     val=strchr(name,':');
     if (!val) {
-      xbt_free(optionlist_cpy);
+      free(optionlist_cpy);
       xbt_assert1(FALSE,
 	     "Malformated option: '%s'; Should be of the form 'name:value'",
 		  name);
@@ -581,11 +581,11 @@ xbt_cfg_set_parse(xbt_cfg_t cfg, const char *options) {
       break;
     case mismatch_error:
       ERROR1("No registrated variable corresponding to '%s'.",name);
-      xbt_free(optionlist_cpy);
+      free(optionlist_cpy);
       return mismatch_error;
       break;
     default:
-      xbt_free(optionlist_cpy);
+      free(optionlist_cpy);
       return errcode;
     }
 
@@ -593,7 +593,7 @@ xbt_cfg_set_parse(xbt_cfg_t cfg, const char *options) {
     case xbt_cfgelm_string:
       errcode = xbt_cfg_set_string(cfg, name, val);
       if (errcode != no_error) {
-	 xbt_free(optionlist_cpy);
+	 free(optionlist_cpy);
          return errcode;
       }
       break;
@@ -601,7 +601,7 @@ xbt_cfg_set_parse(xbt_cfg_t cfg, const char *options) {
     case xbt_cfgelm_int:
       i=strtol(val, &val, 0);
       if (val==NULL) {
-	xbt_free(optionlist_cpy);	
+	free(optionlist_cpy);	
 	xbt_assert1(FALSE,
 		     "Value of option %s not valid. Should be an integer",
 		     name);
@@ -609,7 +609,7 @@ xbt_cfg_set_parse(xbt_cfg_t cfg, const char *options) {
 
       errcode = xbt_cfg_set_int(cfg,name,i);
       if (errcode != no_error) {
-	 xbt_free(optionlist_cpy);
+	 free(optionlist_cpy);
 	 return errcode;
       }
       break;
@@ -617,7 +617,7 @@ xbt_cfg_set_parse(xbt_cfg_t cfg, const char *options) {
     case xbt_cfgelm_double:
       d=strtod(val, &val);
       if (val==NULL) {
-	xbt_free(optionlist_cpy);	
+	free(optionlist_cpy);	
 	xbt_assert1(FALSE,
 	       "Value of option %s not valid. Should be a double",
 	       name);
@@ -625,7 +625,7 @@ xbt_cfg_set_parse(xbt_cfg_t cfg, const char *options) {
 
       errcode = xbt_cfg_set_double(cfg,name,d);
       if (errcode != no_error) {
-	 xbt_free(optionlist_cpy);
+	 free(optionlist_cpy);
 	 return errcode;
       }
       break;
@@ -634,7 +634,7 @@ xbt_cfg_set_parse(xbt_cfg_t cfg, const char *options) {
       str=val;
       val=strchr(val,':');
       if (!val) {
-	xbt_free(optionlist_cpy);	
+	free(optionlist_cpy);	
 	xbt_assert1(FALSE,
 	    "Value of option %s not valid. Should be an host (machine:port)",
 	       name);
@@ -643,7 +643,7 @@ xbt_cfg_set_parse(xbt_cfg_t cfg, const char *options) {
       *(val++)='\0';
       i=strtol(val, &val, 0);
       if (val==NULL) {
-	xbt_free(optionlist_cpy);	
+	free(optionlist_cpy);	
 	xbt_assert1(FALSE,
 	    "Value of option %s not valid. Should be an host (machine:port)",
 	       name);
@@ -651,18 +651,18 @@ xbt_cfg_set_parse(xbt_cfg_t cfg, const char *options) {
 
       errcode = xbt_cfg_set_host(cfg,name,str,i);
       if (errcode != no_error) {
-	 xbt_free(optionlist_cpy);
+	 free(optionlist_cpy);
 	 return errcode;
       }
       break;      
 
     default: 
-      xbt_free(optionlist_cpy);
+      free(optionlist_cpy);
       RAISE1(unknown_error,"Type of config element %s is not valid.",name);
     }
     
   }
-  xbt_free(optionlist_cpy);
+  free(optionlist_cpy);
   return no_error;
 }
 
diff --git a/src/xbt/context.c b/src/xbt/context.c
index 5695fecfbd..89b3315f2b 100644
--- a/src/xbt/context.c
+++ b/src/xbt/context.c
@@ -77,7 +77,7 @@ static void __xbt_context_yield(xbt_context_t context)
 
 static void xbt_context_destroy(xbt_context_t context)
 {
-  xbt_free(context);
+  free(context);
 
   return;
 }
@@ -128,8 +128,8 @@ static void *__context_wrapper(void *c)
   (context->code) (context->argc,context->argv);
 
   for(i=0;i<context->argc; i++) 
-    if(context->argv[i]) xbt_free(context->argv[i]);
-  if(context->argv) xbt_free(context->argv);
+    if(context->argv[i]) free(context->argv[i]);
+  if(context->argv) free(context->argv);
 
   if(context->cleanup_func)
     context->cleanup_func(context->cleanup_arg);
@@ -256,8 +256,8 @@ void xbt_context_free(xbt_context_t context)
 
   xbt_swag_remove(context, context_living);  
   for(i=0;i<context->argc; i++) 
-    if(context->argv[i]) xbt_free(context->argv[i]);
-  if(context->argv) xbt_free(context->argv);
+    if(context->argv[i]) free(context->argv[i]);
+  if(context->argv) free(context->argv);
   
   if(context->cleanup_func)
     context->cleanup_func(context->cleanup_arg);
diff --git a/src/xbt/dict.c b/src/xbt/dict.c
index 2f4e3a8ab5..e477c8e17f 100644
--- a/src/xbt/dict.c
+++ b/src/xbt/dict.c
@@ -46,7 +46,7 @@ xbt_dict_free(xbt_dict_t *dict)  {
       xbt_dictelm_free( &( (*dict)->head ) );
       (*dict)->head = NULL;
     }
-    xbt_free(*dict);
+    free(*dict);
     *dict=NULL;
   }
 }
diff --git a/src/xbt/dict_cursor.c b/src/xbt/dict_cursor.c
index 3dc52dc01a..4861777509 100644
--- a/src/xbt/dict_cursor.c
+++ b/src/xbt/dict_cursor.c
@@ -64,7 +64,7 @@ xbt_dict_cursor_free(xbt_dict_cursor_t *cursor) {
   if (*cursor) {
     xbt_dynar_free(&((*cursor)->keys));
     xbt_dynar_free(&((*cursor)->key_lens));
-    xbt_free(*cursor);
+    free(*cursor);
     *cursor = NULL;
   }
 }
diff --git a/src/xbt/dict_elm.c b/src/xbt/dict_elm.c
index b78d452eb1..40b6a4c206 100644
--- a/src/xbt/dict_elm.c
+++ b/src/xbt/dict_elm.c
@@ -160,14 +160,14 @@ xbt_dictelm_free(s_xbt_dictelm_t **pp_elm)  {
     xbt_dynar_free(&(p_elm->sub));
 
     if (p_elm->key) {
-      xbt_free(p_elm->key);
+      free(p_elm->key);
     }
 
     if (p_elm->free_f && p_elm->content) {
       p_elm->free_f(p_elm->content);
     }
 
-    xbt_free(p_elm);
+    free(p_elm);
     *pp_elm = NULL;
   }
 }
@@ -468,7 +468,7 @@ _xbt_dictelm_set_rec(s_xbt_dictelm_t     *p_head,
     CDEBUG0(dict_add, "--> Change the value of head");
 
     _xbt_dictelm_change_value(p_head, data, free_f);
-    xbt_free(key); /* Keep the key used in the tree */
+    free(key); /* Keep the key used in the tree */
 
     return;
   }
@@ -500,7 +500,7 @@ _xbt_dictelm_set_rec(s_xbt_dictelm_t     *p_head,
       CDEBUG1(dict_add, "-> Change the value of the child %p", (void*)p_child);
       _xbt_dictelm_change_value(p_child, data, free_f);
 
-      xbt_free(key);
+      free(key);
 
       return;
     }
@@ -793,14 +793,14 @@ _collapse_if_need(xbt_dictelm_t head,
 
   head->content  = child->content;
   head->free_f = child->free_f;
-  xbt_free(head->key);
+  free(head->key);
   head->key      = child->key;
   head->key_len  = child->key_len;
 
   xbt_dynar_free_container(&(head->sub)) ;
 
   head->sub = child->sub;
-  xbt_free(child);
+  free(child);
 }
 
 /**
@@ -957,7 +957,7 @@ _xbt_dictelm_dump_rec(xbt_dictelm_t  head,
 
       printf("%.*s|(%d)", key_len-offset, key_string + offset, offset);
 
-      xbt_free(key_string);
+      free(key_string);
     }
 
   }
diff --git a/src/xbt/dynar.c b/src/xbt/dynar.c
index fc66a87458..7090ea8b82 100644
--- a/src/xbt/dynar.c
+++ b/src/xbt/dynar.c
@@ -76,7 +76,7 @@ _xbt_dynar_expand(xbt_dynar_t const dynar,
     if (old_data) {
       memcpy(new_data, old_data, used_length);
       _xbt_clear_mem(old_data, old_length);
-      xbt_free(old_data);
+      free(old_data);
     }
 
     _xbt_clear_mem(new_data + used_length, new_length - used_length);
@@ -157,12 +157,12 @@ xbt_dynar_free_container(xbt_dynar_t *dynar) {
 
     if ((*dynar)->data) {
       _xbt_clear_mem((*dynar)->data, (*dynar)->size);
-      xbt_free((*dynar)->data);
+      free((*dynar)->data);
     }
 
     _xbt_clear_mem(*dynar, sizeof(s_xbt_dynar_t));
 
-    xbt_free(*dynar);
+    free(*dynar);
     *dynar=NULL;
   }
 }
@@ -182,7 +182,7 @@ xbt_dynar_reset(xbt_dynar_t const dynar) {
   }
 
   if (dynar->data)
-    xbt_free(dynar->data);
+    free(dynar->data);
 
   dynar->size = 0;
   dynar->used = 0;
@@ -535,7 +535,7 @@ void xbt_dynar_cursor_rm(xbt_dynar_t dynar,
       dst=xbt_malloc(dynar->elmsize);
       xbt_dynar_remove_at(dynar,(*cursor)--,dst);
       (dynar->free_f)(dst);
-      xbt_free(dst);
+      free(dst);
     } else {
       DEBUG0("Ok, we dont care about the element without free function");
       xbt_dynar_remove_at(dynar,(*cursor)--,NULL);
diff --git a/src/xbt/heap.c b/src/xbt/heap.c
index 2ff78913c5..49e28e40f9 100644
--- a/src/xbt/heap.c
+++ b/src/xbt/heap.c
@@ -50,8 +50,8 @@ void xbt_heap_free(xbt_heap_t H)
   if (H->free)
     for (i = 0; i < H->count; i++)
       H->free(H->items[i].content);
-  xbt_free(H->items);
-  xbt_free(H);
+  free(H->items);
+  free(H);
   return;
 }
 
diff --git a/src/xbt/log.c b/src/xbt/log.c
index 2a4b4e5b44..680da6d789 100644
--- a/src/xbt/log.c
+++ b/src/xbt/log.c
@@ -322,8 +322,8 @@ static xbt_dynar_t xbt_log_settings=NULL;
 static void _free_setting(void *s) {
   xbt_log_setting_t set=(xbt_log_setting_t)s;
   if (set) {
-    xbt_free(set->catname);
-/*    xbt_free(set); FIXME: uncommenting this leads to segfault when more than one chunk is passed as gras-log */
+    free(set->catname);
+/*    free(set); FIXME: uncommenting this leads to segfault when more than one chunk is passed as gras-log */
   }
 }
 
@@ -560,7 +560,7 @@ static void _xbt_log_parse_setting(const char*        control_string,
     } else {
       xbt_assert1(FALSE,"Unknown priority name: %s",eq+1);
     }
-    xbt_free(neweq);
+    free(neweq);
   } else {
     char buff[512];
     snprintf(buff,min(512,eq - dot - 1),"%s",dot+1);
@@ -681,12 +681,12 @@ void xbt_log_control_set(const char* control_string) {
       set = xbt_new(s_xbt_log_setting_t,1);
     } else {
       DEBUG0("Apply directly");
-      xbt_free(set->catname);
+      free(set->catname);
       xbt_log_threshold_set(cat,set->thresh);
     }
   }
-  xbt_free(set);
-  xbt_free(cs);
+  free(set);
+  free(cs);
 } 
 
 void xbt_log_appender_set(xbt_log_category_t cat, xbt_log_appender_t app) {
diff --git a/src/xbt/set.c b/src/xbt/set.c
index 1323a3fdba..e97eed9b99 100644
--- a/src/xbt/set.c
+++ b/src/xbt/set.c
@@ -41,7 +41,7 @@ void  xbt_set_free(xbt_set_t *set) {
   if (*set) {
     xbt_dict_free ( &( (*set)->dict  ) );
     xbt_dynar_free( &( (*set)->dynar ) );
-    xbt_free(*set);
+    free(*set);
     *set = NULL;
   }
 }
@@ -192,7 +192,7 @@ int          xbt_set_cursor_get_or_free (xbt_set_cursor_t *curs,
   cursor=*curs;
 
   if (! xbt_dynar_cursor_get( cursor->set->dynar,&(cursor->val),elm) ) {
-    xbt_free(cursor);
+    free(cursor);
     *curs=NULL;
     return FALSE;    
   } 
diff --git a/src/xbt/swag.c b/src/xbt/swag.c
index 4b4fdd3c33..6971730eb5 100644
--- a/src/xbt/swag.c
+++ b/src/xbt/swag.c
@@ -58,7 +58,7 @@ xbt_swag_t xbt_swag_new(size_t offset)
  */
 void xbt_swag_free(xbt_swag_t swag)
 {
-  xbt_free(swag);
+  free(swag);
 }
 
 /** Creates a new swag.
diff --git a/tools/gras/stub_generator.c b/tools/gras/stub_generator.c
index ee2a1ab9b1..97a6b798f4 100644
--- a/tools/gras/stub_generator.c
+++ b/tools/gras/stub_generator.c
@@ -156,7 +156,7 @@ static void generate_sim(char *project)
   }
   fprintf(OUT, "%s", SIM_MAIN_POSTEMBULE);
   fclose(OUT);
-  xbt_free(filename);
+  free(filename);
 }
 
 static void generate_rl(char *project)
@@ -178,7 +178,7 @@ static void generate_rl(char *project)
     fprintf(OUT, RL_CODE, key,key);
     fprintf(OUT, "\n%s\n",warning);
     fclose(OUT);
-    xbt_free(filename);
+    free(filename);
   }
 }
 
@@ -271,6 +271,6 @@ int main(int argc, char *argv[])
   generate_rl(project_name);
   generate_makefile(project_name, deployment_file);
 
-  xbt_free(warning);
+  free(warning);
   return 0;
 }