Forgot header with OSX prefix

[wxWidgets.git] / src / common / log.cpp

diff --git a/src/common/log.cpp b/src/common/log.cpp
index bbd0c5829223b746c5425ef9dc91ac8af0699dd6..9f4134f41b7815861dc0874b2a8c367e3651d1dd 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -63,6 +63,30 @@
     #include "wx/msw/private.h" // includes windows.h
 #endif
 
     #include "wx/msw/private.h" // includes windows.h
 #endif
 

+#if wxUSE_THREADS
+
+// define static functions providing access to the critical sections we use
+// instead of just using static critical section variables as log functions may
+// be used during static initialization and while this is certainly not
+// advisable it's still better to not crash (as we'd do if we used a yet
+// uninitialized critical section) if it happens
+
+static inline wxCriticalSection& GetTraceMaskCS()
+{
+    static wxCriticalSection s_csTrace;
+
+    return s_csTrace;
+}
+
+static inline wxCriticalSection& GetPreviousLogCS()
+{
+    static wxCriticalSection s_csPrev;
+
+    return s_csPrev;
+}
+
+#endif // wxUSE_THREADS
+

 // ----------------------------------------------------------------------------
 // non member functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // non member functions
 // ----------------------------------------------------------------------------


@@ -159,7 +183,7 @@ IMPLEMENT_LOG_FUNCTION(Status)
 void wxSafeShowMessage(const wxString& title, const wxString& text)
 {
 #ifdef __WINDOWS__
 void wxSafeShowMessage(const wxString& title, const wxString& text)
 {
 #ifdef __WINDOWS__

-    ::MessageBox(NULL, text.wx_str(), title.wx_str(), MB_OK | MB_ICONSTOP);
+    ::MessageBox(NULL, text.t_str(), title.t_str(), MB_OK | MB_ICONSTOP);

 #else
     wxFprintf(stderr, wxS("%s: %s\n"), title.c_str(), text.c_str());
     fflush(stderr);
 #else
     wxFprintf(stderr, wxS("%s: %s\n"), title.c_str(), text.c_str());
     fflush(stderr);


@@ -461,7 +485,7 @@ void WXDLLIMPEXP_BASE wxVLogSysError(unsigned long err, const wxString& format,
 
 unsigned wxLog::LogLastRepeatIfNeeded()
 {
 
 unsigned wxLog::LogLastRepeatIfNeeded()
 {

-    wxCRIT_SECT_LOCKER(lock, ms_prevCS);
+    wxCRIT_SECT_LOCKER(lock, GetPreviousLogCS());

 
     return LogLastRepeatIfNeededUnlocked();
 }
 
     return LogLastRepeatIfNeededUnlocked();
 }


@@ -515,7 +539,7 @@ void wxLog::OnLog(wxLogLevel level, const wxString& szString, time_t t)
         {
             if ( GetRepetitionCounting() )
             {
         {
             if ( GetRepetitionCounting() )
             {

-                wxCRIT_SECT_LOCKER(lock, ms_prevCS);
+                wxCRIT_SECT_LOCKER(lock, GetPreviousLogCS());

 
                 if ( szString == ms_prevString )
                 {
 
                 if ( szString == ms_prevString )
                 {


@@ -620,14 +644,14 @@ void wxLog::DoCreateOnDemand()
 
 void wxLog::AddTraceMask(const wxString& str)
 {
 
 void wxLog::AddTraceMask(const wxString& str)
 {

-    wxCRIT_SECT_LOCKER(lock, ms_traceCS);
+    wxCRIT_SECT_LOCKER(lock, GetTraceMaskCS());

 
     ms_aTraceMasks.push_back(str);
 }
 
 void wxLog::RemoveTraceMask(const wxString& str)
 {
 
     ms_aTraceMasks.push_back(str);
 }
 
 void wxLog::RemoveTraceMask(const wxString& str)
 {

-    wxCRIT_SECT_LOCKER(lock, ms_traceCS);
+    wxCRIT_SECT_LOCKER(lock, GetTraceMaskCS());

 
     int index = ms_aTraceMasks.Index(str);
     if ( index != wxNOT_FOUND )
 
     int index = ms_aTraceMasks.Index(str);
     if ( index != wxNOT_FOUND )


@@ -636,7 +660,7 @@ void wxLog::RemoveTraceMask(const wxString& str)
 
 void wxLog::ClearTraceMasks()
 {
 
 void wxLog::ClearTraceMasks()
 {

-    wxCRIT_SECT_LOCKER(lock, ms_traceCS);
+    wxCRIT_SECT_LOCKER(lock, GetTraceMaskCS());

 
     ms_aTraceMasks.Clear();
 }
 
     ms_aTraceMasks.Clear();
 }


@@ -733,7 +757,7 @@ void wxLog::Flush()
 
 /*static*/ bool wxLog::IsAllowedTraceMask(const wxString& mask)
 {
 
 /*static*/ bool wxLog::IsAllowedTraceMask(const wxString& mask)
 {

-    wxCRIT_SECT_LOCKER(lock, ms_traceCS);
+    wxCRIT_SECT_LOCKER(lock, GetTraceMaskCS());

 
     for ( wxArrayString::iterator it = ms_aTraceMasks.begin(),
                                   en = ms_aTraceMasks.end();
 
     for ( wxArrayString::iterator it = ms_aTraceMasks.begin(),
                                   en = ms_aTraceMasks.end();


@@ -924,7 +948,7 @@ wxLogInterposer::wxLogInterposer()
 wxLogInterposerTemp::wxLogInterposerTemp()
                 : wxLogChain(this)
 {
 wxLogInterposerTemp::wxLogInterposerTemp()
                 : wxLogChain(this)
 {

-       DetachOldLog();
+    DetachOldLog();

 }
 
 #ifdef __VISUALC__
 }
 
 #ifdef __VISUALC__


@@ -939,17 +963,13 @@ wxLogInterposerTemp::wxLogInterposerTemp()
 // static variables
 // ----------------------------------------------------------------------------
 
 // static variables
 // ----------------------------------------------------------------------------
 

-#if wxUSE_THREADS
-wxCriticalSection wxLog::ms_prevCS,
-                  wxLog::ms_traceCS;
-#endif // wxUSE_THREADS

 bool            wxLog::ms_bRepetCounting = false;
 wxString        wxLog::ms_prevString;
 unsigned int    wxLog::ms_prevCounter = 0;
 time_t          wxLog::ms_prevTimeStamp= 0;
 wxLogLevel      wxLog::ms_prevLevel;
 
 bool            wxLog::ms_bRepetCounting = false;
 wxString        wxLog::ms_prevString;
 unsigned int    wxLog::ms_prevCounter = 0;
 time_t          wxLog::ms_prevTimeStamp= 0;
 wxLogLevel      wxLog::ms_prevLevel;
 

-wxLog          *wxLog::ms_pLogger      = (wxLog *)NULL;
+wxLog          *wxLog::ms_pLogger      = NULL;

 bool            wxLog::ms_doLog        = true;
 bool            wxLog::ms_bAutoCreate  = true;
 bool            wxLog::ms_bVerbose     = false;
 bool            wxLog::ms_doLog        = true;
 bool            wxLog::ms_bAutoCreate  = true;
 bool            wxLog::ms_bVerbose     = false;


@@ -1048,8 +1068,7 @@ const wxChar *wxSysErrorMsg(unsigned long nErrCode)
 #if !defined(__SMARTPHONE__) /* of WinCE */
     if( lpMsgBuf != 0 )
     {
 #if !defined(__SMARTPHONE__) /* of WinCE */
     if( lpMsgBuf != 0 )
     {

-        wxStrncpy(s_szBuf, (const wxChar *)lpMsgBuf, WXSIZEOF(s_szBuf) - 1);
-        s_szBuf[WXSIZEOF(s_szBuf) - 1] = wxS('\0');
+        wxStrlcpy(s_szBuf, (const wxChar *)lpMsgBuf, WXSIZEOF(s_szBuf));

 
         LocalFree(lpMsgBuf);
 
 
         LocalFree(lpMsgBuf);