Tidy up to enable C4800 on Windows

client/settings.cc

 // Copyright 2015 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 235 matching lines @@
 bool Settings::ReadSettings(FileHandle handle,
                             Data* out_data,
                             bool log_read_error) {
   if (LoggingSeekFile(handle, 0, SEEK_SET) != 0)
     return false;
 
   bool read_result;
   if (log_read_error)
     read_result = LoggingReadFile(handle, out_data, sizeof(*out_data));
   else
-    read_result = ReadFile(handle, out_data, sizeof(*out_data));
+    read_result = ReadFile(handle, out_data, sizeof(*out_data)) >= 0;

[Mark Mentovai, 2015/10/22 21:22:40]

Oops, this was my mistake.

== sizeof(*out_data) would match how LoggingReadFile() behaves, right?

[scottmg, 2015/10/22 21:28:27]

Done.

[scottmg, 2015/10/22 21:29:54]

Let's hope sizeof(Data) != 0xffffffff bytes!

 
   if (!read_result)
     return false;
 
   if (out_data->magic != Data::kSettingsMagic) {
     LOG(ERROR) << "Settings magic is not " << Data::kSettingsMagic;
     return false;
   }
 
   if (out_data->version != Data::kSettingsVersion) {
@@ skipping 40 matching lines @@
 
 bool Settings::InitializeSettings(FileHandle handle) {
   Data settings;
   if (!settings.client_id.InitializeWithNew())
     return false;
 
   return WriteSettings(handle, settings);
 }
 
 }  // namespace crashpad