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

Side by Side Diff: test/errors.cc

Issue 1181043002: Roll DEPS for mini_chromium for updates to base/posix/safe_strerror (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: Remove include from mach_errors, as it doesn't use safe_strerror Created 5 years, 6 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 | « DEPS ('k') | test/mac/mach_errors.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 "test/errors.h" 15 #include "test/errors.h"
16 16
17 #include <errno.h> 17 #include <errno.h>
18 18
19 #include "base/logging.h" 19 #include "base/logging.h"
20 #include "base/strings/stringprintf.h" 20 #include "base/strings/stringprintf.h"
21 #include "build/build_config.h" 21 #include "build/build_config.h"
22 22
23 #if defined(OS_POSIX) 23 #if defined(OS_POSIX)
24 #include "base/safe_strerror_posix.h" 24 #include "base/posix/safe_strerror.h"
25 #elif defined(OS_WIN) 25 #elif defined(OS_WIN)
26 #include <string.h> 26 #include <string.h>
27 #include <windows.h> 27 #include <windows.h>
28 #endif 28 #endif
29 29
30 namespace crashpad { 30 namespace crashpad {
31 namespace test { 31 namespace test {
32 32
33 std::string ErrnoMessage(int err, const std::string& base) { 33 std::string ErrnoMessage(int err, const std::string& base) {
34 #if defined(OS_POSIX) 34 #if defined(OS_POSIX)
35 std::string err_as_string = safe_strerror(errno); 35 std::string err_as_string = base::safe_strerror(errno);
36 const char* err_string = err_as_string.c_str(); 36 const char* err_string = err_as_string.c_str();
37 #elif defined(OS_WIN) 37 #elif defined(OS_WIN)
38 char err_string[256]; 38 char err_string[256];
39 strerror_s(err_string, errno); 39 strerror_s(err_string, errno);
40 #endif 40 #endif
41 return base::StringPrintf("%s%s%s (%d)", 41 return base::StringPrintf("%s%s%s (%d)",
42 base.c_str(), 42 base.c_str(),
43 base.empty() ? "" : ": ", 43 base.empty() ? "" : ": ",
44 err_string, 44 err_string,
45 err); 45 err);
46 } 46 }
47 47
48 std::string ErrnoMessage(const std::string& base) { 48 std::string ErrnoMessage(const std::string& base) {
49 return ErrnoMessage(errno, base); 49 return ErrnoMessage(errno, base);
50 } 50 }
51 51
52 #if defined(OS_WIN) 52 #if defined(OS_WIN)
53 std::string ErrorMessage(const std::string& base) { 53 std::string ErrorMessage(const std::string& base) {
54 return base::StringPrintf( 54 return base::StringPrintf(
55 "%s%s%s", 55 "%s%s%s",
56 base.c_str(), 56 base.c_str(),
57 base.empty() ? "" : ": ", 57 base.empty() ? "" : ": ",
58 logging::SystemErrorCodeToString(GetLastError()).c_str()); 58 logging::SystemErrorCodeToString(GetLastError()).c_str());
59 } 59 }
60 #endif 60 #endif
61 61
62 } // namespace test 62 } // namespace test
63 } // namespace crashpad 63 } // namespace crashpad
OLDNEW
« no previous file with comments | « DEPS ('k') | test/mac/mach_errors.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698