mirror of
https://github.com/Kitware/CMake.git
synced 2025-10-15 20:46:37 +08:00
cmSystemTools::Error(): remove const char* overload
This commit is contained in:

committed by
Brad King

parent
01b6a2c4ee
commit
e884b1b693
@@ -447,7 +447,8 @@ int cmCTestScriptHandler::ExtractVariables()
|
||||
if (updateVal) {
|
||||
if (this->UpdateCmd.empty()) {
|
||||
cmSystemTools::Error(
|
||||
updateVar, " specified without specifying CTEST_CVS_COMMAND.");
|
||||
std::string(updateVar) +
|
||||
" specified without specifying CTEST_CVS_COMMAND.");
|
||||
return 12;
|
||||
}
|
||||
this->ExtraUpdates.emplace_back(updateVal);
|
||||
|
@@ -83,7 +83,7 @@ cmCursesCacheEntryComposite::cmCursesCacheEntryComposite(
|
||||
break;
|
||||
}
|
||||
case cmStateEnums::UNINITIALIZED:
|
||||
cmSystemTools::Error("Found an undefined variable: ", key.c_str());
|
||||
cmSystemTools::Error("Found an undefined variable: " + key);
|
||||
break;
|
||||
default:
|
||||
// TODO : put warning message here
|
||||
|
@@ -167,8 +167,8 @@ void CCONV cmAddLinkDirectoryForTarget(void* arg, const char* tgt,
|
||||
cmTarget* t = mf->FindLocalNonAliasTarget(tgt);
|
||||
if (!t) {
|
||||
cmSystemTools::Error(
|
||||
"Attempt to add link directories to non-existent target: ", tgt,
|
||||
" for directory ", d);
|
||||
"Attempt to add link directories to non-existent target: " +
|
||||
std::string(tgt) + " for directory " + std::string(d));
|
||||
return;
|
||||
}
|
||||
t->InsertLinkDirectory(d, mf->GetBacktrace());
|
||||
|
@@ -308,8 +308,7 @@ bool cmCacheManager::SaveCache(const std::string& path, cmMessenger* messenger)
|
||||
if (!ce.Initialized) {
|
||||
/*
|
||||
// This should be added in, but is not for now.
|
||||
cmSystemTools::Error("Cache entry \"", (*i).first.c_str(),
|
||||
"\" is uninitialized");
|
||||
cmSystemTools::Error("Cache entry \"" + i.first + "\" is uninitialized");
|
||||
*/
|
||||
} else if (t != cmStateEnums::INTERNAL) {
|
||||
// Format is key:type=value
|
||||
|
@@ -1798,10 +1798,10 @@ int cmGlobalGenerator::Build(
|
||||
output += "\n";
|
||||
if (workdir.Failed()) {
|
||||
cmSystemTools::SetRunCommandHideConsole(hideconsole);
|
||||
cmSystemTools::Error("Failed to change directory: ",
|
||||
std::strerror(workdir.GetLastResult()));
|
||||
output += "Failed to change directory: ";
|
||||
output += std::strerror(workdir.GetLastResult());
|
||||
std::string err = "Failed to change directory: ";
|
||||
err += std::strerror(workdir.GetLastResult());
|
||||
cmSystemTools::Error(err);
|
||||
output += err;
|
||||
output += "\n";
|
||||
return 1;
|
||||
}
|
||||
|
@@ -44,7 +44,7 @@ void cmInstallExportAndroidMKGenerator::GenerateScript(std::ostream& os)
|
||||
std::ostringstream e;
|
||||
e << "INSTALL(EXPORT) given unknown export \"" << ExportSet->GetName()
|
||||
<< "\"";
|
||||
cmSystemTools::Error(e.str().c_str());
|
||||
cmSystemTools::Error(e.str());
|
||||
return;
|
||||
}
|
||||
|
||||
|
@@ -501,8 +501,11 @@ void cmLocalUnixMakefileGenerator3::WriteMakeRule(
|
||||
{
|
||||
// Make sure there is a target.
|
||||
if (target.empty()) {
|
||||
cmSystemTools::Error("No target for WriteMakeRule! called with comment: ",
|
||||
comment);
|
||||
std::string err("No target for WriteMakeRule! called with comment: ");
|
||||
if (comment) {
|
||||
err += comment;
|
||||
}
|
||||
cmSystemTools::Error(err);
|
||||
return;
|
||||
}
|
||||
|
||||
|
@@ -249,26 +249,6 @@ std::string cmSystemTools::TrimWhitespace(const std::string& s)
|
||||
return std::string(start, stop + 1);
|
||||
}
|
||||
|
||||
void cmSystemTools::Error(const char* m1, const char* m2, const char* m3,
|
||||
const char* m4)
|
||||
{
|
||||
std::string message = "CMake Error: ";
|
||||
if (m1) {
|
||||
message += m1;
|
||||
}
|
||||
if (m2) {
|
||||
message += m2;
|
||||
}
|
||||
if (m3) {
|
||||
message += m3;
|
||||
}
|
||||
if (m4) {
|
||||
message += m4;
|
||||
}
|
||||
cmSystemTools::s_ErrorOccured = true;
|
||||
cmSystemTools::Message(message, "Error");
|
||||
}
|
||||
|
||||
void cmSystemTools::Error(const std::string& m)
|
||||
{
|
||||
std::string message = "CMake Error: " + m;
|
||||
@@ -1746,6 +1726,16 @@ void list_item_verbose(FILE* out, struct archive_entry* entry)
|
||||
fflush(out);
|
||||
}
|
||||
|
||||
void ArchiveError(const char* m1, struct archive* a)
|
||||
{
|
||||
std::string message(m1);
|
||||
const char* m2 = archive_error_string(a);
|
||||
if (m2) {
|
||||
message += m2;
|
||||
}
|
||||
cmSystemTools::Error(message);
|
||||
}
|
||||
|
||||
bool la_diagnostic(struct archive* ar, __LA_SSIZE_T r)
|
||||
{
|
||||
// See archive.h definition of ARCHIVE_OK for return values.
|
||||
@@ -1815,8 +1805,7 @@ bool extract_tar(const char* outFileName, bool verbose, bool extract)
|
||||
struct archive_entry* entry;
|
||||
int r = cm_archive_read_open_file(a, outFileName, 10240);
|
||||
if (r) {
|
||||
cmSystemTools::Error("Problem with archive_read_open_file(): ",
|
||||
archive_error_string(a));
|
||||
ArchiveError("Problem with archive_read_open_file(): ", a);
|
||||
archive_write_free(ext);
|
||||
archive_read_close(a);
|
||||
return false;
|
||||
@@ -1827,8 +1816,7 @@ bool extract_tar(const char* outFileName, bool verbose, bool extract)
|
||||
break;
|
||||
}
|
||||
if (r != ARCHIVE_OK) {
|
||||
cmSystemTools::Error("Problem with archive_read_next_header(): ",
|
||||
archive_error_string(a));
|
||||
ArchiveError("Problem with archive_read_next_header(): ", a);
|
||||
break;
|
||||
}
|
||||
if (verbose) {
|
||||
@@ -1846,8 +1834,7 @@ bool extract_tar(const char* outFileName, bool verbose, bool extract)
|
||||
if (extract) {
|
||||
r = archive_write_disk_set_options(ext, ARCHIVE_EXTRACT_TIME);
|
||||
if (r != ARCHIVE_OK) {
|
||||
cmSystemTools::Error("Problem with archive_write_disk_set_options(): ",
|
||||
archive_error_string(ext));
|
||||
ArchiveError("Problem with archive_write_disk_set_options(): ", ext);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -1858,8 +1845,7 @@ bool extract_tar(const char* outFileName, bool verbose, bool extract)
|
||||
}
|
||||
r = archive_write_finish_entry(ext);
|
||||
if (r != ARCHIVE_OK) {
|
||||
cmSystemTools::Error("Problem with archive_write_finish_entry(): ",
|
||||
archive_error_string(ext));
|
||||
ArchiveError("Problem with archive_write_finish_entry(): ", ext);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -1871,8 +1857,7 @@ bool extract_tar(const char* outFileName, bool verbose, bool extract)
|
||||
}
|
||||
# endif
|
||||
else {
|
||||
cmSystemTools::Error("Problem with archive_write_header(): ",
|
||||
archive_error_string(ext));
|
||||
ArchiveError("Problem with archive_write_header(): ", ext);
|
||||
cmSystemTools::Error("Current file: " +
|
||||
cm_archive_entry_pathname(entry));
|
||||
break;
|
||||
|
@@ -100,8 +100,6 @@ public:
|
||||
/**
|
||||
* Display an error message.
|
||||
*/
|
||||
static void Error(const char* m, const char* m2 = nullptr,
|
||||
const char* m3 = nullptr, const char* m4 = nullptr);
|
||||
static void Error(const std::string& m);
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user