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

Side by Side Diff: snapshot/thread_snapshot_mac.cc

Issue 656703002: Convert NULL to nullptr (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: Fix 80-column violations Created 6 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
« no previous file with comments | « snapshot/system_snapshot_mac_test.cc ('k') | tools/catch_exception_tool.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Crashpad Authors. All rights reserved. 1 // Copyright 2014 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,
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 stack_.Initialize(process_reader, 52 stack_.Initialize(process_reader,
53 process_reader_thread.stack_region_address, 53 process_reader_thread.stack_region_address,
54 process_reader_thread.stack_region_size); 54 process_reader_thread.stack_region_size);
55 55
56 #if defined(ARCH_CPU_X86_FAMILY) 56 #if defined(ARCH_CPU_X86_FAMILY)
57 if (process_reader->Is64Bit()) { 57 if (process_reader->Is64Bit()) {
58 context_.architecture = kCPUArchitectureX86_64; 58 context_.architecture = kCPUArchitectureX86_64;
59 context_.x86_64 = &context_union_.x86_64; 59 context_.x86_64 = &context_union_.x86_64;
60 InitializeCPUContextX86_64(context_.x86_64, 60 InitializeCPUContextX86_64(context_.x86_64,
61 THREAD_STATE_NONE, 61 THREAD_STATE_NONE,
62 NULL, 62 nullptr,
63 0, 63 0,
64 &process_reader_thread.thread_context.t64, 64 &process_reader_thread.thread_context.t64,
65 &process_reader_thread.float_context.f64, 65 &process_reader_thread.float_context.f64,
66 &process_reader_thread.debug_context.d64); 66 &process_reader_thread.debug_context.d64);
67 } else { 67 } else {
68 context_.architecture = kCPUArchitectureX86; 68 context_.architecture = kCPUArchitectureX86;
69 context_.x86 = &context_union_.x86; 69 context_.x86 = &context_union_.x86;
70 InitializeCPUContextX86(context_.x86, 70 InitializeCPUContextX86(context_.x86,
71 THREAD_STATE_NONE, 71 THREAD_STATE_NONE,
72 NULL, 72 nullptr,
73 0, 73 0,
74 &process_reader_thread.thread_context.t32, 74 &process_reader_thread.thread_context.t32,
75 &process_reader_thread.float_context.f32, 75 &process_reader_thread.float_context.f32,
76 &process_reader_thread.debug_context.d32); 76 &process_reader_thread.debug_context.d32);
77 } 77 }
78 #endif 78 #endif
79 79
80 INITIALIZATION_STATE_SET_VALID(initialized_); 80 INITIALIZATION_STATE_SET_VALID(initialized_);
81 return true; 81 return true;
82 } 82 }
(...skipping 23 matching lines...) Expand all
106 return priority_; 106 return priority_;
107 } 107 }
108 108
109 uint64_t ThreadSnapshotMac::ThreadSpecificDataAddress() const { 109 uint64_t ThreadSnapshotMac::ThreadSpecificDataAddress() const {
110 INITIALIZATION_STATE_DCHECK_VALID(initialized_); 110 INITIALIZATION_STATE_DCHECK_VALID(initialized_);
111 return thread_specific_data_address_; 111 return thread_specific_data_address_;
112 } 112 }
113 113
114 } // namespace internal 114 } // namespace internal
115 } // namespace crashpad 115 } // namespace crashpad
OLDNEW
« no previous file with comments | « snapshot/system_snapshot_mac_test.cc ('k') | tools/catch_exception_tool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698