PATCH: [ 899926 ] Write LogErrorString()s to logfile

diff --git a/Src/DiffWrapper.cpp b/Src/DiffWrapper.cpp
index 5caff5b..0f75284 100644 (file)
--- a/Src/DiffWrapper.cpp
+++ b/Src/DiffWrapper.cpp
@@ -376,8 +376,6 @@ BOOL CDiffWrapper::RunFileDiff()
                {
                        LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
                                strFile1Temp, GetSysError(GetLastError())));
-                       gLog.Write(LOGLEVEL::LERROR, _T("DeleteFile(%s) failed: %s"),
-                               strFile1Temp, GetSysError(GetLastError()));
                }
                strFile1Temp.Empty();
        }
@@ -387,8 +385,6 @@ BOOL CDiffWrapper::RunFileDiff()
                {
                        LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
                                strFile2Temp, GetSysError(GetLastError())));
-                       gLog.Write(LOGLEVEL::LERROR, _T("DeleteFile(%s) failed: %s"),
-                               strFile2Temp, GetSysError(GetLastError()));
                }
                strFile2Temp.Empty();
        }

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index fbd111e..24fd069 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -1199,8 +1199,6 @@ BOOL CMainFrame::DoFileOpen(LPCTSTR pszLeft /*=NULL*/, LPCTSTR pszRight /*=NULL*
                                        {
                                                LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
                                                        strLeft, GetSysError(GetLastError())));
-                                               gLog.Write(LOGLEVEL::LERROR, _T("DeleteFile(%s) failed: %s"),
-                                                       strLeft, GetSysError(GetLastError()));
                                        }
                                }
                                strLeft.Delete(0, strLeft.ReverseFind('\\'));
@@ -1230,8 +1228,6 @@ BOOL CMainFrame::DoFileOpen(LPCTSTR pszLeft /*=NULL*/, LPCTSTR pszRight /*=NULL*
                                                {
                                                        LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
                                                                strRight, GetSysError(GetLastError())));
-                                                       gLog.Write(LOGLEVEL::LERROR, _T("DeleteFile(%s) failed: %s"),
-                                                               strRight, GetSysError(GetLastError()));
                                                }
                                        }
                                        strRight.Delete(0, strRight.ReverseFind('\\'));

diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index ec5b8f2..8ea5008 100644 (file)
--- a/Src/MergeDoc.cpp
+++ b/Src/MergeDoc.cpp
@@ -1374,8 +1374,6 @@ LoadFromFileExit:
                {
                        LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
                                pszFileName, GetSysError(GetLastError())));
-                       gLog.Write(LOGLEVEL::LERROR, _T("DeleteFile(%s) failed: %s"),
-                               pszFileName, GetSysError(GetLastError()));
                }
 
        return nRetVal;
@@ -1492,8 +1490,6 @@ int CMergeDoc::CDiffTextBuffer::SaveToFile (LPCTSTR pszFileName,
                        {
                                LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
                                        sIntermediateFilename, GetSysError(GetLastError())));
-                               gLog.Write(LOGLEVEL::LERROR, _T("DeleteFile(%s) failed: %s"),
-                                       sIntermediateFilename, GetSysError(GetLastError()));
                        }
                        // returns now, don't overwrite the original file
                        return SAVE_PACK_FAILED;
@@ -1505,8 +1501,6 @@ int CMergeDoc::CDiffTextBuffer::SaveToFile (LPCTSTR pszFileName,
                        {
                                LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
                                        sIntermediateFilename, GetSysError(GetLastError())));
-                               gLog.Write(LOGLEVEL::LERROR, _T("DeleteFile(%s) failed: %s"),
-                                       sIntermediateFilename, GetSysError(GetLastError()));
                        }
                        sIntermediateFilename = csTempFileName;
                }
@@ -1518,8 +1512,6 @@ int CMergeDoc::CDiffTextBuffer::SaveToFile (LPCTSTR pszFileName,
                        {
                                LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
                                        sIntermediateFilename, GetSysError(GetLastError())));
-                               gLog.Write(LOGLEVEL::LERROR, _T("DeleteFile(%s) failed: %s"),
-                                       sIntermediateFilename, GetSysError(GetLastError()));
                        }
                        if (bClearModifiedFlag)
                        {
@@ -1645,8 +1637,6 @@ void CMergeDoc::CleanupTempFiles()
                {
                        LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
                                m_strTempLeftFile, GetSysError(GetLastError())));
-                       gLog.Write(LOGLEVEL::LERROR, _T("DeleteFile(%s) failed: %s"),
-                               m_strTempLeftFile, GetSysError(GetLastError()));
                }
        }
        if (!m_strTempRightFile.IsEmpty())
@@ -1657,8 +1647,6 @@ void CMergeDoc::CleanupTempFiles()
                {
                        LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
                                m_strTempRightFile, GetSysError(GetLastError())));
-                       gLog.Write(LOGLEVEL::LERROR, _T("DeleteFile(%s) failed: %s"),
-                               m_strTempRightFile, GetSysError(GetLastError()));
                }
        }
 }

diff --git a/Src/StdAfx.cpp b/Src/StdAfx.cpp
index 7c675d5..468035b 100644 (file)
--- a/Src/StdAfx.cpp
+++ b/Src/StdAfx.cpp
@@ -103,12 +103,16 @@ CString GetSysError(int nerr)
        return str;
 }
 
-// Send message to log (well, to debug window)
+// Send message to log and debug window
 void LogErrorString(LPCTSTR sz)
 {
        if (!sz || !sz[0]) return;
        CString now = COleDateTime::GetCurrentTime().Format();
        TRACE(_T("%s: %s\n"), (LPCTSTR)now, sz);
+
+#if defined (_DEBUG) || defined (ENABLE_LOG)
+       gLog.Write(LOGLEVEL::LERROR, sz);
+#endif
 }
 
 // Make a CString from printf-style args (single call version of CString::Format)
@@ -131,4 +135,3 @@ int GetClipTcharTextFormat()
        return CF_TEXT;
 #endif // _UNICODE
 }
-

diff --git a/Src/readme.txt b/Src/readme.txt
index 647d323..b9d86e9 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,7 @@
+2004-02-20 Kimmo
+ PATCH: [ 899926 ] Write LogErrorString()s to logfile
+  Src: DiffWrapper.cpp MainFrm.cpp MergeDoc.cpp StdAfx.cpp
+
 2004-02-19 Jochen
  BUG: [ 888992 ] 7zip integration: Error deleting file when closing WinMerge
   Src: 7zCommon.cpp
@@ -10,7 +14,7 @@
   Src: Merge.rc
   Languages: *.rc
  RFE: [ 897975 ] Syntax highlighting for INI files
-   Submitted by Tim Gerundt
+   Patch submitted by Tim Gerundt
    Src: Merge.dsp
    editlib: ccrystaltextview.cpp ccrystaltextview.h
    editlib new file: ini.cpp