OLD | NEW |
---|---|
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/test/errors.h" | 15 #include "util/test/errors.h" |
16 | 16 |
17 #include <errno.h> | 17 #include <errno.h> |
18 | 18 |
19 #include "build/build_config.h" | 19 #include "build/build_config.h" |
20 #include "base/logging.h" | |
20 #include "base/strings/stringprintf.h" | 21 #include "base/strings/stringprintf.h" |
21 | 22 |
22 #if defined(OS_POSIX) | 23 #if defined(OS_POSIX) |
23 #include "base/safe_strerror_posix.h" | 24 #include "base/safe_strerror_posix.h" |
24 #elif defined(OS_WIN) | 25 #elif defined(OS_WIN) |
25 #include <string.h> | 26 #include <string.h> |
26 #endif | 27 #endif |
27 | 28 |
28 namespace crashpad { | 29 namespace crashpad { |
29 namespace test { | 30 namespace test { |
(...skipping 10 matching lines...) Expand all Loading... | |
40 base.c_str(), | 41 base.c_str(), |
41 base.empty() ? "" : ": ", | 42 base.empty() ? "" : ": ", |
42 err_string, | 43 err_string, |
43 err); | 44 err); |
44 } | 45 } |
45 | 46 |
46 std::string ErrnoMessage(const std::string& base) { | 47 std::string ErrnoMessage(const std::string& base) { |
47 return ErrnoMessage(errno, base); | 48 return ErrnoMessage(errno, base); |
48 } | 49 } |
49 | 50 |
51 #if defined(OS_WIN) | |
52 std::string ErrorMessage(const std::string& base) { | |
53 return base::StringPrintf( | |
54 "%s%s%s", | |
55 base.c_str(), | |
56 base.empty() ? "" : ": ", | |
57 base::SystemErrorCodeToString(GetLastError()).c_str()); | |
Mark Mentovai
2015/03/20 15:03:56
This is not declared by mini_chromium’s logging.h.
scottmg
2015/03/20 21:07:35
I admit I had not yet tested back on Windows yet.
| |
58 } | |
59 #endif | |
60 | |
50 } // namespace test | 61 } // namespace test |
51 } // namespace crashpad | 62 } // namespace crashpad |
OLD | NEW |