remove warnings 2

[simgrid.git] / src / msg / msg_io.c

diff --git a/src/msg/msg_io.c b/src/msg/msg_io.c
index 5049e0f..b15cdb5 100644 (file)
--- a/src/msg/msg_io.c
+++ b/src/msg/msg_io.c
@@ -25,12 +25,12 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_io, msg,
  * \param ptr buffer to where the data is copied
  * \param size of each element
  * \param nmemb is the number of elements of data to read
- * \param stream to read
+ * \param fd is a the file descriptor
  * \return the number of items successfully read
  */
-size_t MSG_file_read(void* ptr, size_t size, size_t nmemb,  msg_file_t stream)
+size_t MSG_file_read(void* ptr, size_t size, size_t nmemb, msg_file_t fd)
 {
-  return simcall_file_read(ptr, size, nmemb, stream->simdata->smx_file);
+  return simcall_file_read(ptr, size, nmemb, fd->simdata->smx_file);
 }
 
 /** \ingroup msg_file_management
@@ -39,12 +39,12 @@ size_t MSG_file_read(void* ptr, size_t size, size_t nmemb,  msg_file_t stream)
  * \param ptr buffer from where the data is copied
  * \param size of each element
  * \param nmemb is the number of elements of data to write
- * \param stream to write
+ * \param fd is a the file descriptor
  * \return the number of items successfully write
  */
-size_t MSG_file_write(const void* ptr, size_t size, size_t nmemb, msg_file_t stream)
+size_t MSG_file_write(const void* ptr, size_t size, size_t nmemb, msg_file_t fd)
 {
-  return simcall_file_write(ptr, size, nmemb, stream->simdata->smx_file);
+  return simcall_file_write(ptr, size, nmemb, fd->simdata->smx_file);
 }
 
 /** \ingroup msg_file_management
@@ -58,7 +58,7 @@ size_t MSG_file_write(const void* ptr, size_t size, size_t nmemb, msg_file_t str
 msg_file_t MSG_file_open(const char* mount, const char* path)
 {
   msg_file_t file = xbt_new(s_msg_file_t,1);
-  file->name = strdup(path);
+  file->name = xbt_strdup(path);
   file->simdata = xbt_new0(s_simdata_file_t,1);
   file->simdata->smx_file = simcall_file_open(mount, path);
   return file;
@@ -87,11 +87,7 @@ int MSG_file_close(msg_file_t fd)
  */
 int MSG_file_unlink(msg_file_t fd)
 {
-  int res = simcall_file_unlink(fd->simdata->smx_file);
-  free(fd->name);
-  xbt_free(fd->simdata);
-  xbt_free(fd);
-  return res;
+  return simcall_file_unlink(fd->simdata->smx_file);
 }
 
 /** \ingroup msg_file_management