diff options
| author | Brad King <brad.king@kitware.com> | 2014-05-15 13:38:30 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-05-15 14:24:21 (GMT) |
| commit | 73b13f56413cac74d90a2ab1938add3bbe740ecb (patch) | |
| tree | 9cfad78062b4804f73d5efab6cce30f5fe836504 /Source/cmSystemTools.cxx | |
| parent | 7577a542dfa0aac045b97bfe4440241583c62e3a (diff) | |
| download | CMake-73b13f56413cac74d90a2ab1938add3bbe740ecb.zip CMake-73b13f56413cac74d90a2ab1938add3bbe740ecb.tar.gz CMake-73b13f56413cac74d90a2ab1938add3bbe740ecb.tar.bz2 | |
cmSystemTools: Rename ErrorCallback to MessageCallback
Clarify that it is the callback for the cmSystemTools::Message API.
Rename callback clients too.
Diffstat (limited to 'Source/cmSystemTools.cxx')
| -rw-r--r-- | Source/cmSystemTools.cxx | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index c38a99c..f61d75d 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -121,10 +121,9 @@ bool cmSystemTools::s_FatalErrorOccured = false; bool cmSystemTools::s_DisableMessages = false; bool cmSystemTools::s_ForceUnixPaths = false; -void (*cmSystemTools::s_ErrorCallback)(const char*, const char*, - bool&, void*); +cmSystemTools::MessageCallback cmSystemTools::s_MessageCallback; void (*cmSystemTools::s_StdoutCallback)(const char*, int len, void*); -void* cmSystemTools::s_ErrorCallbackClientData = 0; +void* cmSystemTools::s_MessageCallbackClientData; void* cmSystemTools::s_StdoutCallbackClientData = 0; bool (*cmSystemTools::s_InterruptCallback)(void*); void* cmSystemTools::s_InterruptCallbackClientData = 0; @@ -254,10 +253,10 @@ bool cmSystemTools::GetInterruptFlag() return false; } -void cmSystemTools::SetErrorCallback(ErrorCallback f, void* clientData) +void cmSystemTools::SetMessageCallback(MessageCallback f, void* clientData) { - s_ErrorCallback = f; - s_ErrorCallbackClientData = clientData; + s_MessageCallback = f; + s_MessageCallbackClientData = clientData; } void cmSystemTools::SetStdoutCallback(StdoutCallback f, void* clientData) @@ -305,10 +304,10 @@ void cmSystemTools::Message(const char* m1, const char *title) { return; } - if(s_ErrorCallback) + if(s_MessageCallback) { - (*s_ErrorCallback)(m1, title, s_DisableMessages, - s_ErrorCallbackClientData); + (*s_MessageCallback)(m1, title, s_DisableMessages, + s_MessageCallbackClientData); return; } else |