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

Side by Side Diff: client/settings.cc

Issue 1483073004: Replace use of .Pass() with crashpad::move(). (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: pass: . 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 | « client/crashpad_client_mac.cc ('k') | handler/crash_report_upload_thread.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 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 "client/settings.h" 15 #include "client/settings.h"
16 16
17 #include <limits> 17 #include <limits>
18 18
19 #include "base/logging.h" 19 #include "base/logging.h"
20 #include "base/posix/eintr_wrapper.h" 20 #include "base/posix/eintr_wrapper.h"
21 #include "util/stdlib/move.h"
21 #include "util/numeric/in_range_cast.h" 22 #include "util/numeric/in_range_cast.h"
22 23
23 namespace crashpad { 24 namespace crashpad {
24 25
25 namespace internal { 26 namespace internal {
26 27
27 // static 28 // static
28 void ScopedLockedFileHandleTraits::Free(FileHandle handle) { 29 void ScopedLockedFileHandleTraits::Free(FileHandle handle) {
29 if (handle != kInvalidFileHandle) { 30 if (handle != kInvalidFileHandle) {
30 LoggingUnlockFile(handle); 31 LoggingUnlockFile(handle);
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 // created. The file-create and file-lock operations don’t occur atomically, 229 // created. The file-create and file-lock operations don’t occur atomically,
229 // and something else may have written the settings before this invocation 230 // and something else may have written the settings before this invocation
230 // took the lock. If the settings file was definitely just created, though, 231 // took the lock. If the settings file was definitely just created, though,
231 // don’t log any read errors. The expected non-race behavior in this case is a 232 // don’t log any read errors. The expected non-race behavior in this case is a
232 // zero-length read, with ReadSettings() failing. 233 // zero-length read, with ReadSettings() failing.
233 if (!ReadSettings(handle.get(), out_data, !created)) { 234 if (!ReadSettings(handle.get(), out_data, !created)) {
234 if (!RecoverSettings(handle.get(), out_data)) 235 if (!RecoverSettings(handle.get(), out_data))
235 return ScopedLockedFileHandle(); 236 return ScopedLockedFileHandle();
236 } 237 }
237 238
238 return handle.Pass(); 239 return handle;
239 } 240 }
240 241
241 bool Settings::ReadSettings(FileHandle handle, 242 bool Settings::ReadSettings(FileHandle handle,
242 Data* out_data, 243 Data* out_data,
243 bool log_read_error) { 244 bool log_read_error) {
244 if (LoggingSeekFile(handle, 0, SEEK_SET) != 0) 245 if (LoggingSeekFile(handle, 0, SEEK_SET) != 0)
245 return false; 246 return false;
246 247
247 bool read_result; 248 bool read_result;
248 if (log_read_error) { 249 if (log_read_error) {
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 305
305 bool Settings::InitializeSettings(FileHandle handle) { 306 bool Settings::InitializeSettings(FileHandle handle) {
306 Data settings; 307 Data settings;
307 if (!settings.client_id.InitializeWithNew()) 308 if (!settings.client_id.InitializeWithNew())
308 return false; 309 return false;
309 310
310 return WriteSettings(handle, settings); 311 return WriteSettings(handle, settings);
311 } 312 }
312 313
313 } // namespace crashpad 314 } // namespace crashpad
OLDNEW
« no previous file with comments | « client/crashpad_client_mac.cc ('k') | handler/crash_report_upload_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698