X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c773c39f8623155553cfba2919317250e003adb4..b8df87e176f27b25534f27d7e240defa32ca35bc:/src/surf/surf_interface.cpp?ds=sidebyside

diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp
index 61081b2719..b351d93a92 100644
--- a/src/surf/surf_interface.cpp
+++ b/src/surf/surf_interface.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2019. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -31,7 +31,6 @@ std::vector<simgrid::kernel::resource::Model*> all_existing_models; /* to destro
 
 simgrid::trace_mgr::future_evt_set future_evt_set;
 std::vector<std::string> surf_path;
-std::vector<simgrid::s4u::Host*> host_that_restart;
 /**  set of hosts for which one want to be notified if they ever restart. */
 std::set<std::string> watched_hosts;
 extern std::map<std::string, simgrid::surf::StorageType*> storage_types;
@@ -127,11 +126,11 @@ double surf_get_clock()
 }
 
 /* returns whether #file_path is a absolute file path. Surprising, isn't it ? */
-static bool is_absolute_file_path(const char* file_path)
+static bool is_absolute_file_path(std::string file_path)
 {
 #ifdef _WIN32
   WIN32_FIND_DATA wfd = {0};
-  HANDLE hFile        = FindFirstFile(file_path, &wfd);
+  HANDLE hFile        = FindFirstFile(file_path.c_str(), &wfd);
 
   if (INVALID_HANDLE_VALUE == hFile)
     return false;
@@ -139,7 +138,7 @@ static bool is_absolute_file_path(const char* file_path)
   FindClose(hFile);
   return true;
 #else
-  return (file_path[0] == '/');
+  return (file_path.c_str()[0] == '/');
 #endif
 }
 
@@ -148,7 +147,7 @@ std::ifstream* surf_ifsopen(std::string name)
   xbt_assert(not name.empty());
 
   std::ifstream* fs = new std::ifstream();
-  if (is_absolute_file_path(name.c_str())) { /* don't mess with absolute file names */
+  if (is_absolute_file_path(name)) { /* don't mess with absolute file names */
     fs->open(name.c_str(), std::ifstream::in);
   }
 
@@ -166,14 +165,12 @@ std::ifstream* surf_ifsopen(std::string name)
   return fs;
 }
 
-FILE *surf_fopen(const char *name, const char *mode)
+FILE* surf_fopen(std::string name, const char* mode)
 {
   FILE *file = nullptr;
 
-  xbt_assert(name);
-
   if (is_absolute_file_path(name)) /* don't mess with absolute file names */
-    return fopen(name, mode);
+    return fopen(name.c_str(), mode);
 
   /* search relative files in the path */
   for (auto const& path_elm : surf_path) {