| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ipc/ipc_message_utils.h" | 5 #include "ipc/ipc_message_utils.h" |
| 6 | 6 |
| 7 #include "base/file_path.h" | 7 #include "base/file_path.h" |
| 8 #include "base/json/json_writer.h" | 8 #include "base/json/json_writer.h" |
| 9 #include "base/nullable_string16.h" | 9 #include "base/nullable_string16.h" |
| 10 #include "base/scoped_ptr.h" | 10 #include "base/scoped_ptr.h" |
| (...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 448 WriteParam(m, p.routing_id); | 448 WriteParam(m, p.routing_id); |
| 449 WriteParam(m, static_cast<int>(p.type)); | 449 WriteParam(m, static_cast<int>(p.type)); |
| 450 WriteParam(m, p.flags); | 450 WriteParam(m, p.flags); |
| 451 WriteParam(m, p.sent); | 451 WriteParam(m, p.sent); |
| 452 WriteParam(m, p.receive); | 452 WriteParam(m, p.receive); |
| 453 WriteParam(m, p.dispatch); | 453 WriteParam(m, p.dispatch); |
| 454 WriteParam(m, p.params); | 454 WriteParam(m, p.params); |
| 455 } | 455 } |
| 456 | 456 |
| 457 bool ParamTraits<LogData>::Read(const Message* m, void** iter, param_type* r) { | 457 bool ParamTraits<LogData>::Read(const Message* m, void** iter, param_type* r) { |
| 458 int type; | 458 int type = 0; // clang pr9122 |
| 459 bool result = | 459 bool result = |
| 460 ReadParam(m, iter, &r->channel) && | 460 ReadParam(m, iter, &r->channel) && |
| 461 ReadParam(m, iter, &r->routing_id) && | 461 ReadParam(m, iter, &r->routing_id) && |
| 462 ReadParam(m, iter, &type) && | 462 ReadParam(m, iter, &type) && |
| 463 ReadParam(m, iter, &r->flags) && | 463 ReadParam(m, iter, &r->flags) && |
| 464 ReadParam(m, iter, &r->sent) && | 464 ReadParam(m, iter, &r->sent) && |
| 465 ReadParam(m, iter, &r->receive) && | 465 ReadParam(m, iter, &r->receive) && |
| 466 ReadParam(m, iter, &r->dispatch) && | 466 ReadParam(m, iter, &r->dispatch) && |
| 467 ReadParam(m, iter, &r->params); | 467 ReadParam(m, iter, &r->params); |
| 468 r->type = static_cast<uint16>(type); | 468 if (result) // real (but uninteresting) fix |
| 469 r->type = static_cast<uint16>(type); |
| 469 return result; | 470 return result; |
| 470 } | 471 } |
| 471 | 472 |
| 472 } // namespace IPC | 473 } // namespace IPC |
| OLD | NEW |