summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2009-06-24 19:09:50 (GMT)
committerBrad King <brad.king@kitware.com>2009-06-24 19:09:50 (GMT)
commitb64aadc5b045d85f86e5341992a236f45af59086 (patch)
treea38bd901167d3ad0aacf51b50805588e603aa42d
parent031379abe62ce12906a8f6b035dabe39c81f5d17 (diff)
downloadCMake-b64aadc5b045d85f86e5341992a236f45af59086.zip
CMake-b64aadc5b045d85f86e5341992a236f45af59086.tar.gz
CMake-b64aadc5b045d85f86e5341992a236f45af59086.tar.bz2
ENH: Remove unused cmSystemTools::RemoveEscapes
The RemoveEscapes method is no longer used anywhere. All uses of it have been replaced by a real lexer. We can remove the method.
-rw-r--r--Source/cmSystemTools.cxx42
-rw-r--r--Source/cmSystemTools.h8
2 files changed, 1 insertions, 49 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index d907288..de5e31b 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -235,48 +235,6 @@ std::string cmSystemTools::EscapeSpaces(const char* str)
}
}
-
-std::string cmSystemTools::RemoveEscapes(const char* s)
-{
- std::string result = "";
- for(const char* ch = s; *ch; ++ch)
- {
- if(*ch == '\\' && *(ch+1) != ';')
- {
- ++ch;
- switch (*ch)
- {
- case '\\': result.insert(result.end(), '\\'); break;
- case '"': result.insert(result.end(), '"'); break;
- case ' ': result.insert(result.end(), ' '); break;
- case 't': result.insert(result.end(), '\t'); break;
- case 'n': result.insert(result.end(), '\n'); break;
- case 'r': result.insert(result.end(), '\r'); break;
- case '#': result.insert(result.end(), '#'); break;
- case '(': result.insert(result.end(), '('); break;
- case ')': result.insert(result.end(), ')'); break;
- case '0': result.insert(result.end(), '\0'); break;
- case '\0':
- {
- cmSystemTools::Error("Trailing backslash in argument:\n", s);
- return result;
- }
- default:
- {
- std::string chStr(1, *ch);
- cmSystemTools::Error("Invalid escape sequence \\", chStr.c_str(),
- "\nin argument ", s);
- }
- }
- }
- else
- {
- result.insert(result.end(), *ch);
- }
- }
- return result;
-}
-
void cmSystemTools::Error(const char* m1, const char* m2,
const char* m3, const char* m4)
{
diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h
index 0974759..486dcee 100644
--- a/Source/cmSystemTools.h
+++ b/Source/cmSystemTools.h
@@ -59,13 +59,7 @@ public:
///! Escape quotes in a string.
static std::string EscapeQuotes(const char* str);
-
- /**
- * Given a string, replace any escape sequences with the corresponding
- * characters.
- */
- static std::string RemoveEscapes(const char*);
-
+
typedef void (*ErrorCallback)(const char*, const char*, bool&, void*);
/**
* Set the function used by GUI's to display error messages