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

Side by Side Diff: util/posix/symbolic_constants_posix.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 | « util/posix/process_util_mac.cc ('k') | util/posix/symbolic_constants_posix_test.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,
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/posix/symbolic_constants_posix.h" 15 #include "util/posix/symbolic_constants_posix.h"
16 16
17 #include <sys/signal.h> 17 #include <sys/signal.h>
18 18
19 #include "base/basictypes.h" 19 #include "base/basictypes.h"
20 #include "base/strings/stringprintf.h" 20 #include "base/strings/stringprintf.h"
21 #include "util/stdlib/string_number_conversion.h" 21 #include "util/stdlib/string_number_conversion.h"
22 22
23 namespace { 23 namespace {
24 24
25 const char* kSignalNames[] = { 25 const char* kSignalNames[] = {
26 NULL, 26 nullptr,
27 27
28 #if defined(OS_MACOSX) 28 #if defined(OS_MACOSX)
29 // sed -Ene 's/^#define[[:space:]]SIG([[:alnum:]]+)[[:space:]]+[[:digit:]]{1 ,2}([[:space:]]|$).*/ "\1",/p' 29 // sed -Ene 's/^#define[[:space:]]SIG([[:alnum:]]+)[[:space:]]+[[:digit:]]{1 ,2}([[:space:]]|$).*/ "\1",/p'
30 // /usr/include/sys/signal.h 30 // /usr/include/sys/signal.h
31 // and fix up by removing the entry for SIGPOLL. 31 // and fix up by removing the entry for SIGPOLL.
32 "HUP", 32 "HUP",
33 "INT", 33 "INT",
34 "QUIT", 34 "QUIT",
35 "ILL", 35 "ILL",
36 "TRAP", 36 "TRAP",
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 108
109 } // namespace 109 } // namespace
110 110
111 namespace crashpad { 111 namespace crashpad {
112 112
113 std::string SignalToString(int signal, 113 std::string SignalToString(int signal,
114 SymbolicConstantToStringOptions options) { 114 SymbolicConstantToStringOptions options) {
115 const char* signal_name = 115 const char* signal_name =
116 static_cast<size_t>(signal) < arraysize(kSignalNames) 116 static_cast<size_t>(signal) < arraysize(kSignalNames)
117 ? kSignalNames[signal] 117 ? kSignalNames[signal]
118 : NULL; 118 : nullptr;
119 if (!signal_name) { 119 if (!signal_name) {
120 if (options & kUnknownIsNumeric) { 120 if (options & kUnknownIsNumeric) {
121 return base::StringPrintf("%d", signal); 121 return base::StringPrintf("%d", signal);
122 } 122 }
123 return std::string(); 123 return std::string();
124 } 124 }
125 125
126 if (options & kUseShortName) { 126 if (options & kUseShortName) {
127 return std::string(signal_name); 127 return std::string(signal_name);
128 } 128 }
(...skipping 28 matching lines...) Expand all
157 } 157 }
158 158
159 if (options & kAllowNumber) { 159 if (options & kAllowNumber) {
160 return StringToNumber(string, signal); 160 return StringToNumber(string, signal);
161 } 161 }
162 162
163 return false; 163 return false;
164 } 164 }
165 165
166 } // namespace crashpad 166 } // namespace crashpad
OLDNEW
« no previous file with comments | « util/posix/process_util_mac.cc ('k') | util/posix/symbolic_constants_posix_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698