Fixes for re-enabling more MSVC level 4 warnings: misc edition #2

ipc/ipc_message_utils.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ipc/ipc_message_utils.h"
 
 #include "base/files/file_path.h"
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/nullable_string16.h"
@@ skipping 549 matching lines @@
   WriteParam(m, p.size);
   WriteParam(m, p.is_directory);
   WriteParam(m, p.last_modified.ToDoubleT());
   WriteParam(m, p.last_accessed.ToDoubleT());
   WriteParam(m, p.creation_time.ToDoubleT());
 }
 
 bool ParamTraits<base::File::Info>::Read(const Message* m,
                                          PickleIterator* iter,
                                          param_type* p) {
-  double last_modified;
-  double last_accessed;
-  double creation_time;
-  bool result =
-      ReadParam(m, iter, &p->size) &&
-      ReadParam(m, iter, &p->is_directory) &&
-      ReadParam(m, iter, &last_modified) &&
-      ReadParam(m, iter, &last_accessed) &&
-      ReadParam(m, iter, &creation_time);
-  if (result) {
-    p->last_modified = base::Time::FromDoubleT(last_modified);
-    p->last_accessed = base::Time::FromDoubleT(last_accessed);
-    p->creation_time = base::Time::FromDoubleT(creation_time);
-  }
-  return result;
+  double last_modified, last_accessed, creation_time;
+  if (!ReadParam(m, iter, &p->size) ||
+      !ReadParam(m, iter, &p->is_directory) ||
+      !ReadParam(m, iter, &last_modified) ||
+      !ReadParam(m, iter, &last_accessed) ||
+      !ReadParam(m, iter, &creation_time))
+    return false;
+  p->last_modified = base::Time::FromDoubleT(last_modified);
+  p->last_accessed = base::Time::FromDoubleT(last_accessed);
+  p->creation_time = base::Time::FromDoubleT(creation_time);
+  return true;
 }
 
 void ParamTraits<base::File::Info>::Log(const param_type& p,
                                         std::string* l) {
   l->append("(");
   LogParam(p.size, l);
   l->append(",");
   LogParam(p.is_directory, l);
   l->append(",");
   LogParam(p.last_modified.ToDoubleT(), l);
@@ skipping 228 matching lines @@
   return result;
 }
 
 void ParamTraits<MSG>::Log(const param_type& p, std::string* l) {
   l->append("<MSG>");
 }
 
 #endif  // OS_WIN
 
 }  // namespace IPC