diff options
author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-18 01:40:47 +0000 |
---|---|---|
committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-18 01:40:47 +0000 |
commit | 481c3e82e2dcbcb676501f18bc8f58900071b935 (patch) | |
tree | b41b70589f0b082edffa7322b1c06af23c4b32bc /ipc/ipc_message_utils.cc | |
parent | cf85b9ad701b8363e3d1d54d54390dcdf4a45291 (diff) | |
download | chromium_src-481c3e82e2dcbcb676501f18bc8f58900071b935.zip chromium_src-481c3e82e2dcbcb676501f18bc8f58900071b935.tar.gz chromium_src-481c3e82e2dcbcb676501f18bc8f58900071b935.tar.bz2 |
Fixes for re-enabling more MSVC level 4 warnings: misc edition #2
This contains fixes for the following sorts of issues:
* Assignment inside conditional
* Taking the address of a temporary
* Octal escape sequence terminated by decimal number
* Signedness mismatch
* Possibly-uninitialized local variable
This also contains a small number of cleanups to nearby code (e.g. no else after return).
BUG=81439
TEST=none
Review URL: https://codereview.chromium.org/382673002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283967 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc/ipc_message_utils.cc')
-rw-r--r-- | ipc/ipc_message_utils.cc | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/ipc/ipc_message_utils.cc b/ipc/ipc_message_utils.cc index a67c5f5..f5543ff 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, |