Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(145)

Side by Side Diff: remoting/protocol/message_decoder.cc

Issue 810133003: replace NULL->nullptr in src/remoting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « remoting/protocol/message_decoder.h ('k') | remoting/protocol/message_reader.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "remoting/protocol/message_decoder.h" 5 #include "remoting/protocol/message_decoder.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "net/base/io_buffer.h" 8 #include "net/base/io_buffer.h"
9 #include "remoting/base/compound_buffer.h" 9 #include "remoting/base/compound_buffer.h"
10 #include "remoting/proto/internal.pb.h" 10 #include "remoting/proto/internal.pb.h"
(...skipping 21 matching lines...) Expand all
32 int next_payload = -1; 32 int next_payload = -1;
33 if (!next_payload_known_ && GetPayloadSize(&next_payload)) { 33 if (!next_payload_known_ && GetPayloadSize(&next_payload)) {
34 DCHECK_NE(-1, next_payload); 34 DCHECK_NE(-1, next_payload);
35 next_payload_ = next_payload; 35 next_payload_ = next_payload;
36 next_payload_known_ = true; 36 next_payload_known_ = true;
37 } 37 }
38 38
39 // If the next payload size is still not known or we don't have enough 39 // If the next payload size is still not known or we don't have enough
40 // data for parsing then exit. 40 // data for parsing then exit.
41 if (!next_payload_known_ || buffer_.total_bytes() < next_payload_) 41 if (!next_payload_known_ || buffer_.total_bytes() < next_payload_)
42 return NULL; 42 return nullptr;
43 43
44 CompoundBuffer* message_buffer = new CompoundBuffer(); 44 CompoundBuffer* message_buffer = new CompoundBuffer();
45 message_buffer->CopyFrom(buffer_, 0, next_payload_); 45 message_buffer->CopyFrom(buffer_, 0, next_payload_);
46 message_buffer->Lock(); 46 message_buffer->Lock();
47 buffer_.CropFront(next_payload_); 47 buffer_.CropFront(next_payload_);
48 next_payload_known_ = false; 48 next_payload_known_ = false;
49 49
50 return message_buffer; 50 return message_buffer;
51 } 51 }
52 52
53 bool MessageDecoder::GetPayloadSize(int* size) { 53 bool MessageDecoder::GetPayloadSize(int* size) {
54 // The header has a size of 4 bytes. 54 // The header has a size of 4 bytes.
55 const int kHeaderSize = sizeof(int32); 55 const int kHeaderSize = sizeof(int32);
56 56
57 if (buffer_.total_bytes() < kHeaderSize) 57 if (buffer_.total_bytes() < kHeaderSize)
58 return false; 58 return false;
59 59
60 CompoundBuffer header_buffer; 60 CompoundBuffer header_buffer;
61 char header[kHeaderSize]; 61 char header[kHeaderSize];
62 header_buffer.CopyFrom(buffer_, 0, kHeaderSize); 62 header_buffer.CopyFrom(buffer_, 0, kHeaderSize);
63 header_buffer.CopyTo(header, kHeaderSize); 63 header_buffer.CopyTo(header, kHeaderSize);
64 *size = rtc::GetBE32(header); 64 *size = rtc::GetBE32(header);
65 buffer_.CropFront(kHeaderSize); 65 buffer_.CropFront(kHeaderSize);
66 return true; 66 return true;
67 } 67 }
68 68
69 } // namespace protocol 69 } // namespace protocol
70 } // namespace remoting 70 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/protocol/message_decoder.h ('k') | remoting/protocol/message_reader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698