Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(144)

Side by Side Diff: util/win/critical_section_with_debug_info.cc

Issue 1408123006: Tidy up to enable C4800 on Windows (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: . Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Crashpad Authors. All rights reserved. 1 // Copyright 2015 The Crashpad Authors. All rights reserved.
2 // 2 //
3 // Licensed under the Apache License, Version 2.0 (the "License"); 3 // Licensed under the Apache License, Version 2.0 (the "License");
4 // you may not use this file except in compliance with the License. 4 // you may not use this file except in compliance with the License.
5 // You may obtain a copy of the License at 5 // You may obtain a copy of the License at
6 // 6 //
7 // http://www.apache.org/licenses/LICENSE-2.0 7 // http://www.apache.org/licenses/LICENSE-2.0
8 // 8 //
9 // Unless required by applicable law or agreed to in writing, software 9 // Unless required by applicable law or agreed to in writing, software
10 // distributed under the License is distributed on an "AS IS" BASIS, 10 // distributed under the License is distributed on an "AS IS" BASIS,
11 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 11 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12 // See the License for the specific language governing permissions and 12 // See the License for the specific language governing permissions and
13 // limitations under the License. 13 // limitations under the License.
14 14
15 #include "util/win/critical_section_with_debug_info.h" 15 #include "util/win/critical_section_with_debug_info.h"
16 16
17 #include "base/logging.h" 17 #include "base/logging.h"
18 #include "util/win/get_function.h" 18 #include "util/win/get_function.h"
19 19
20 namespace crashpad { 20 namespace crashpad {
21 21
22 namespace { 22 namespace {
23 23
24 BOOL CrashpadInitializeCriticalSectionEx( 24 BOOL CrashpadInitializeCriticalSectionEx(
Mark Mentovai 2015/10/22 21:22:40 Switch this to bool, which is what it really retur
scottmg 2015/10/22 21:28:27 Done.
25 CRITICAL_SECTION* critical_section, 25 CRITICAL_SECTION* critical_section,
26 DWORD spin_count, 26 DWORD spin_count,
27 DWORD flags) { 27 DWORD flags) {
28 static const auto initialize_critical_section_ex = 28 static const auto initialize_critical_section_ex =
29 GET_FUNCTION_REQUIRED(L"kernel32.dll", ::InitializeCriticalSectionEx); 29 GET_FUNCTION_REQUIRED(L"kernel32.dll", ::InitializeCriticalSectionEx);
30 bool ret = 30 bool ret =
Mark Mentovai 2015/10/22 21:22:40 …this one can even be BOOL…
scottmg 2015/10/22 21:28:27 Done.
31 initialize_critical_section_ex(critical_section, spin_count, flags); 31 !!initialize_critical_section_ex(critical_section, spin_count, flags);
32 if (!ret) { 32 if (!ret) {
33 PLOG(ERROR) << "InitializeCriticalSectionEx"; 33 PLOG(ERROR) << "InitializeCriticalSectionEx";
34 return false; 34 return false;
35 } 35 }
36 return true; 36 return true;
37 } 37 }
38 38
39 } // namespace 39 } // namespace
40 40
41 bool InitializeCriticalSectionWithDebugInfoIfPossible( 41 bool InitializeCriticalSectionWithDebugInfoIfPossible(
(...skipping 16 matching lines...) Expand all
58 const DWORD major_version = LOBYTE(LOWORD(version)); 58 const DWORD major_version = LOBYTE(LOWORD(version));
59 const DWORD minor_version = HIBYTE(LOWORD(version)); 59 const DWORD minor_version = HIBYTE(LOWORD(version));
60 const bool win7_or_lower = 60 const bool win7_or_lower =
61 major_version < 6 || (major_version == 6 && minor_version <= 1); 61 major_version < 6 || (major_version == 6 && minor_version <= 1);
62 62
63 if (win7_or_lower) { 63 if (win7_or_lower) {
64 InitializeCriticalSection(critical_section); 64 InitializeCriticalSection(critical_section);
65 return true; 65 return true;
66 } 66 }
67 67
68 return CrashpadInitializeCriticalSectionEx( 68 return !!CrashpadInitializeCriticalSectionEx(
Mark Mentovai 2015/10/22 21:22:40 …then you don’t need to change this.
scottmg 2015/10/22 21:28:27 Done.
69 critical_section, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); 69 critical_section, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO);
70 } 70 }
71 71
72 } // namespace crashpad 72 } // namespace crashpad
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698