Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: src/plugin/PluginDebug.cpp

Issue 5747779603267584: Issue #1234 - Rework strings in debug facility (Closed)
Left Patch Set: rebase Created March 3, 2015, 8:03 p.m.
Right Patch Set: typo fix Created March 5, 2015, 12:43 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « src/plugin/PluginDebug.h ('k') | src/plugin/PluginDebugMacros.h » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2015 Eyeo GmbH 3 * Copyright (C) 2006-2015 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 { 148 {
149 CString errorCodeText; 149 CString errorCodeText;
150 errorCodeText.Format(L"%u (0x%8.8x)", errorCode, errorCode); 150 errorCodeText.Format(L"%u (0x%8.8x)", errorCode, errorCode);
151 151
152 CString finalError = error + L". error=" + errorCodeText; 152 CString finalError = error + L". error=" + errorCodeText;
153 153
154 #ifdef ENABLE_DEBUG_ERROR 154 #ifdef ENABLE_DEBUG_ERROR
155 DebugLegacy(finalError, dwProcessId, dwThreadId); 155 DebugLegacy(finalError, dwProcessId, dwThreadId);
156 #endif 156 #endif
157 157
158 DEBUG_SELFTEST(L"************************************************************* *******************\n" + finalError + "\ n************************************** ******************************************") 158 DEBUG_SELFTEST(L"************************************************************* *******************\n" + finalError + "\n*************************************** *****************************************")
Oleksandr 2015/03/04 21:03:06 What's this for? No space between '\' and 'n'
Eric 2015/03/05 00:47:11 It's a typo. Sometimes stray characters end up in
159 } 159 }
160 160
161 void CPluginDebug::DebugErrorCode(DWORD errorCode, const std::string& error, DWO RD processId, DWORD threadId) 161 void CPluginDebug::DebugErrorCode(DWORD errorCode, const std::string& error, DWO RD processId, DWORD threadId)
162 { 162 {
163 DebugErrorCodeLegacy(errorCode, CString(error.c_str()), processId, threadId); 163 DebugErrorCodeLegacy(errorCode, CString(error.c_str()), processId, threadId);
164 } 164 }
165 165
166 #endif 166 #endif
167 167
168 // ============================================================================ 168 // ============================================================================
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 srcTrunc = srcTrunc.Left(67) + L"..." + srcTrunc.Right(30); 249 srcTrunc = srcTrunc.Left(67) + L"..." + srcTrunc.Right(30);
250 } 250 }
251 251
252 CString blocking; 252 CString blocking;
253 blocking.Format(L"Ignored %-12s %s %s", ToCString(type), domain.empty()? L" -" : ToCString(domain), srcTrunc); 253 blocking.Format(L"Ignored %-12s %s %s", ToCString(type), domain.empty()? L" -" : ToCString(domain), srcTrunc);
254 254
255 DebugResultLegacy(blocking); 255 DebugResultLegacy(blocking);
256 } 256 }
257 257
258 #endif // ENABLE_DEBUG_RESULT_IGNORED 258 #endif // ENABLE_DEBUG_RESULT_IGNORED
LEFTRIGHT

Powered by Google App Engine
This is Rietveld