convert S4U to my current coding convention

[simgrid.git] / src / s4u / s4u_file.cpp

diff --git a/src/s4u/s4u_file.cpp b/src/s4u/s4u_file.cpp
index dd50829..5da4b49 100644 (file)
--- a/src/s4u/s4u_file.cpp
+++ b/src/s4u/s4u_file.cpp
@@ -4,8 +4,8 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "xbt/log.h"
-#include "msg/msg_private.h"
-#include "msg/msg_mailbox.h"
+#include "src/msg/msg_private.h"
+#include "src/msg/msg_mailbox.h"
 
 #include "simgrid/s4u/actor.hpp"
 #include "simgrid/s4u/comm.hpp"
@@ -22,37 +22,37 @@ namespace simgrid {
 namespace s4u {
 
 File::File(const char*fullpath, void *userdata) {
-       // this cannot fail because we get a xbt_die if the mountpoint does not exist
-       p_inferior = simcall_file_open(fullpath, Host::current()->inferior());
-       p_path = fullpath;
+  // this cannot fail because we get a xbt_die if the mountpoint does not exist
+  inferior_ = simcall_file_open(fullpath, Host::current());
+  path_ = fullpath;
 }
 
 File::~File() {
-       simcall_file_close(p_inferior, Host::current()->inferior());
+  simcall_file_close(inferior_, Host::current());
 }
 
 sg_size_t File::read(sg_size_t size) {
-       return simcall_file_read(p_inferior, size, Host::current()->inferior());
+  return simcall_file_read(inferior_, size, Host::current());
 }
 sg_size_t File::write(sg_size_t size) {
-       return simcall_file_write(p_inferior,size, Host::current()->inferior());
+  return simcall_file_write(inferior_,size, Host::current());
 }
 sg_size_t File::size() {
-       return simcall_file_get_size(p_inferior);
+  return simcall_file_get_size(inferior_);
 }
 
 void File::seek(sg_size_t pos) {
-       simcall_file_seek(p_inferior,pos,SEEK_SET);
+  simcall_file_seek(inferior_,pos,SEEK_SET);
 }
 sg_size_t File::tell() {
-       return simcall_file_tell(p_inferior);
+  return simcall_file_tell(inferior_);
 }
 void File::move(const char*fullpath) {
-       simcall_file_move(p_inferior,fullpath);
+  simcall_file_move(inferior_,fullpath);
 }
 void File::unlink() {
-       sg_host_t attached = Host::current()->inferior(); // FIXME: we should check where this file is attached
-       simcall_file_unlink(p_inferior,attached);
+  sg_host_t attached = Host::current(); // FIXME: we should check where this file is attached
+  simcall_file_unlink(inferior_,attached);
 }
 
 }} // namespace simgrid::s4u