Index: ipc/ipc_message_utils.cc |
diff --git a/ipc/ipc_message_utils.cc b/ipc/ipc_message_utils.cc |
index a67c5f5cf9eae33b92bf64e67cab2a348348bf44..f5543ff71496b26fa6af8a116f278fbeab6d9c20 100644 |
--- a/ipc/ipc_message_utils.cc |
+++ b/ipc/ipc_message_utils.cc |
@@ -567,21 +567,17 @@ void ParamTraits<base::File::Info>::Write(Message* m, |
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, |