From cdab1fefaf41fe170f2382758e507aa2e34521e0 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Thu, 8 Oct 2020 15:26:16 +0200 Subject: [PATCH 1/1] Prefer std::string for C++ API. --- include/simgrid/plugins/file_system.h | 4 ++-- src/plugins/file_system/s4u_FileSystem.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/simgrid/plugins/file_system.h b/include/simgrid/plugins/file_system.h index 73fa2ffad8..de471b4586 100644 --- a/include/simgrid/plugins/file_system.h +++ b/include/simgrid/plugins/file_system.h @@ -142,8 +142,8 @@ public: /** Rename a file. WARNING: It is forbidden to move the file to another mount point */ void move(const std::string& fullpath) const; - int remote_copy(sg_host_t host, const char* fullpath); - int remote_move(sg_host_t host, const char* fullpath); + int remote_copy(sg_host_t host, const std::string& fullpath); + int remote_move(sg_host_t host, const std::string& fullpath); int unlink() const; /** Remove a file from the contents of a disk */ void dump() const; diff --git a/src/plugins/file_system/s4u_FileSystem.cpp b/src/plugins/file_system/s4u_FileSystem.cpp index 516b680a63..46b3e48020 100644 --- a/src/plugins/file_system/s4u_FileSystem.cpp +++ b/src/plugins/file_system/s4u_FileSystem.cpp @@ -389,7 +389,7 @@ int File::unlink() const } } -int File::remote_copy(sg_host_t host, const char* fullpath) +int File::remote_copy(sg_host_t host, const std::string& fullpath) { /* Find the host where the file is physically located and read it */ Host* src_host = nullptr; @@ -432,7 +432,7 @@ int File::remote_copy(sg_host_t host, const char* fullpath) /* Mount point found, retrieve the host the storage is attached to */ dst_host = storage_dest->get_host(); } else { - XBT_WARN("Can't find mount point for '%s' on destination host '%s'", fullpath, host->get_cname()); + XBT_WARN("Can't find mount point for '%s' on destination host '%s'", fullpath.c_str(), host->get_cname()); return -1; } } @@ -451,7 +451,7 @@ int File::remote_copy(sg_host_t host, const char* fullpath) } if (dst_disk == nullptr) { - XBT_WARN("Can't find mount point for '%s' on destination host '%s'", fullpath, host->get_cname()); + XBT_WARN("Can't find mount point for '%s' on destination host '%s'", fullpath.c_str(), host->get_cname()); return -1; } } @@ -475,7 +475,7 @@ int File::remote_copy(sg_host_t host, const char* fullpath) return 0; } -int File::remote_move(sg_host_t host, const char* fullpath) +int File::remote_move(sg_host_t host, const std::string& fullpath) { int res = remote_copy(host, fullpath); unlink(); -- 2.20.1