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

Side by Side Diff: tools/crashpad_database_util.cc

Issue 1513573005: Provide std::move() in compat instead of using crashpad::move() (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: Created 5 years 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 | « test/win/win_child_process.cc ('k') | util/mach/child_port_handshake.h » ('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 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 <errno.h> 15 #include <errno.h>
16 #include <getopt.h> 16 #include <getopt.h>
17 #include <stdio.h> 17 #include <stdio.h>
18 #include <stdlib.h> 18 #include <stdlib.h>
19 #include <string.h> 19 #include <string.h>
20 #include <strings.h> 20 #include <strings.h>
21 #include <sys/types.h> 21 #include <sys/types.h>
22 #include <time.h> 22 #include <time.h>
23 23
24 #include <string> 24 #include <string>
25 #include <utility>
25 #include <vector> 26 #include <vector>
26 27
27 #include "base/basictypes.h" 28 #include "base/basictypes.h"
28 #include "base/files/file_path.h" 29 #include "base/files/file_path.h"
29 #include "base/logging.h" 30 #include "base/logging.h"
30 #include "base/memory/scoped_ptr.h" 31 #include "base/memory/scoped_ptr.h"
31 #include "base/numerics/safe_conversions.h" 32 #include "base/numerics/safe_conversions.h"
32 #include "base/strings/utf_string_conversions.h" 33 #include "base/strings/utf_string_conversions.h"
33 #include "build/build_config.h" 34 #include "build/build_config.h"
34 #include "client/crash_report_database.h" 35 #include "client/crash_report_database.h"
35 #include "client/settings.h" 36 #include "client/settings.h"
36 #include "tools/tool_support.h" 37 #include "tools/tool_support.h"
37 #include "util/file/file_io.h" 38 #include "util/file/file_io.h"
38 #include "util/file/file_reader.h" 39 #include "util/file/file_reader.h"
39 #include "util/stdlib/move.h"
40 #include "util/misc/uuid.h" 40 #include "util/misc/uuid.h"
41 41
42 namespace crashpad { 42 namespace crashpad {
43 namespace { 43 namespace {
44 44
45 void Usage(const base::FilePath& me) { 45 void Usage(const base::FilePath& me) {
46 fprintf(stderr, 46 fprintf(stderr,
47 "Usage: %" PRFilePath " [OPTION]... PID\n" 47 "Usage: %" PRFilePath " [OPTION]... PID\n"
48 "Operate on Crashpad crash report databases.\n" 48 "Operate on Crashpad crash report databases.\n"
49 "\n" 49 "\n"
(...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 bool is_stdin = false; 546 bool is_stdin = false;
547 if (new_report_path.value() == FILE_PATH_LITERAL("-")) { 547 if (new_report_path.value() == FILE_PATH_LITERAL("-")) {
548 is_stdin = true; 548 is_stdin = true;
549 file_reader.reset(new WeakStdioFileReader(stdin)); 549 file_reader.reset(new WeakStdioFileReader(stdin));
550 } else { 550 } else {
551 scoped_ptr<FileReader> file_path_reader(new FileReader()); 551 scoped_ptr<FileReader> file_path_reader(new FileReader());
552 if (!file_path_reader->Open(new_report_path)) { 552 if (!file_path_reader->Open(new_report_path)) {
553 return EXIT_FAILURE; 553 return EXIT_FAILURE;
554 } 554 }
555 555
556 file_reader = crashpad::move(file_path_reader); 556 file_reader = std::move(file_path_reader);
557 } 557 }
558 558
559 CrashReportDatabase::NewReport* new_report; 559 CrashReportDatabase::NewReport* new_report;
560 CrashReportDatabase::OperationStatus status = 560 CrashReportDatabase::OperationStatus status =
561 database->PrepareNewCrashReport(&new_report); 561 database->PrepareNewCrashReport(&new_report);
562 if (status != CrashReportDatabase::kNoError) { 562 if (status != CrashReportDatabase::kNoError) {
563 return EXIT_FAILURE; 563 return EXIT_FAILURE;
564 } 564 }
565 565
566 CrashReportDatabase::CallErrorWritingCrashReport 566 CrashReportDatabase::CallErrorWritingCrashReport
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
606 606
607 #if defined(OS_POSIX) 607 #if defined(OS_POSIX)
608 int main(int argc, char* argv[]) { 608 int main(int argc, char* argv[]) {
609 return crashpad::DatabaseUtilMain(argc, argv); 609 return crashpad::DatabaseUtilMain(argc, argv);
610 } 610 }
611 #elif defined(OS_WIN) 611 #elif defined(OS_WIN)
612 int wmain(int argc, wchar_t* argv[]) { 612 int wmain(int argc, wchar_t* argv[]) {
613 return crashpad::ToolSupport::Wmain(argc, argv, crashpad::DatabaseUtilMain); 613 return crashpad::ToolSupport::Wmain(argc, argv, crashpad::DatabaseUtilMain);
614 } 614 }
615 #endif // OS_POSIX 615 #endif // OS_POSIX
OLDNEW
« no previous file with comments | « test/win/win_child_process.cc ('k') | util/mach/child_port_handshake.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698