summaryrefslogtreecommitdiffstats
path: root/Source/cmSystemTools.cxx
diff options
context:
space:
mode:
authorVitaly Stakhovsky <vvs31415@gitlab.org>2019-05-29 12:15:40 (GMT)
committerBrad King <brad.king@kitware.com>2019-05-29 13:56:08 (GMT)
commit57cedb18c097a7231223b8a4279534216cad1b93 (patch)
tree9a33bf86cbcc6b4ca49c90c3cb77d4fe86daa26e /Source/cmSystemTools.cxx
parent7c39a9c6b6e2463b9fefc7516faeb48c2cbbd997 (diff)
downloadCMake-57cedb18c097a7231223b8a4279534216cad1b93.zip
CMake-57cedb18c097a7231223b8a4279534216cad1b93.tar.gz
CMake-57cedb18c097a7231223b8a4279534216cad1b93.tar.bz2
cmSystemTools: std::string parameters for tar functions
Diffstat (limited to 'Source/cmSystemTools.cxx')
-rw-r--r--Source/cmSystemTools.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 2453aea..ef29217 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1529,7 +1529,7 @@ bool cmSystemTools::IsPathToFramework(const std::string& path)
cmHasLiteralSuffix(path, ".framework"));
}
-bool cmSystemTools::CreateTar(const char* outFileName,
+bool cmSystemTools::CreateTar(const std::string& outFileName,
const std::vector<std::string>& files,
cmTarCompression compressType, bool verbose,
std::string const& mtime,
@@ -1537,7 +1537,7 @@ bool cmSystemTools::CreateTar(const char* outFileName,
{
#if defined(CMAKE_BUILD_WITH_CMAKE)
std::string cwd = cmSystemTools::GetCurrentWorkingDirectory();
- cmsys::ofstream fout(outFileName, std::ios::out | std::ios::binary);
+ cmsys::ofstream fout(outFileName.c_str(), std::ios::out | std::ios::binary);
if (!fout) {
std::string e = "Cannot open output file \"";
e += outFileName;
@@ -1757,7 +1757,7 @@ bool copy_data(struct archive* ar, struct archive* aw)
# endif
}
-bool extract_tar(const char* outFileName,
+bool extract_tar(const std::string& outFileName,
const std::vector<std::string>& files, bool verbose,
bool extract)
{
@@ -1783,7 +1783,7 @@ bool extract_tar(const char* outFileName,
}
}
- int r = cm_archive_read_open_file(a, outFileName, 10240);
+ int r = cm_archive_read_open_file(a, outFileName.c_str(), 10240);
if (r) {
ArchiveError("Problem with archive_read_open_file(): ", a);
archive_write_free(ext);
@@ -1878,7 +1878,7 @@ bool extract_tar(const char* outFileName,
}
#endif
-bool cmSystemTools::ExtractTar(const char* outFileName,
+bool cmSystemTools::ExtractTar(const std::string& outFileName,
const std::vector<std::string>& files,
bool verbose)
{
@@ -1892,7 +1892,7 @@ bool cmSystemTools::ExtractTar(const char* outFileName,
#endif
}
-bool cmSystemTools::ListTar(const char* outFileName,
+bool cmSystemTools::ListTar(const std::string& outFileName,
const std::vector<std::string>& files,
bool verbose)
{