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

Side by Side Diff: webrtc/base/socketadapters.cc

Issue 2718663005: Replace NULL with nullptr or null in webrtc/base/. (Closed)
Patch Set: Fixing Windows and formatting issues. Created 3 years, 9 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 | « webrtc/base/socket_unittest.cc ('k') | webrtc/base/socketaddress.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 /* 1 /*
2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 274
275 SocketAddress AsyncHttpsProxySocket::GetRemoteAddress() const { 275 SocketAddress AsyncHttpsProxySocket::GetRemoteAddress() const {
276 return dest_; 276 return dest_;
277 } 277 }
278 278
279 int AsyncHttpsProxySocket::Close() { 279 int AsyncHttpsProxySocket::Close() {
280 headers_.clear(); 280 headers_.clear();
281 state_ = PS_ERROR; 281 state_ = PS_ERROR;
282 dest_.Clear(); 282 dest_.Clear();
283 delete context_; 283 delete context_;
284 context_ = NULL; 284 context_ = nullptr;
285 return BufferedReadAdapter::Close(); 285 return BufferedReadAdapter::Close();
286 } 286 }
287 287
288 Socket::ConnState AsyncHttpsProxySocket::GetState() const { 288 Socket::ConnState AsyncHttpsProxySocket::GetState() const {
289 if (state_ < PS_TUNNEL) { 289 if (state_ < PS_TUNNEL) {
290 return CS_CONNECTING; 290 return CS_CONNECTING;
291 } else if (state_ == PS_TUNNEL) { 291 } else if (state_ == PS_TUNNEL) {
292 return CS_CONNECTED; 292 return CS_CONNECTED;
293 } else { 293 } else {
294 return CS_CLOSED; 294 return CS_CLOSED;
(...skipping 544 matching lines...) Expand 10 before | Expand all | Expand 10 after
839 839
840 void AsyncSocksProxyServerSocket::Error(int error) { 840 void AsyncSocksProxyServerSocket::Error(int error) {
841 state_ = SS_ERROR; 841 state_ = SS_ERROR;
842 BufferInput(false); 842 BufferInput(false);
843 Close(); 843 Close();
844 SetError(SOCKET_EACCES); 844 SetError(SOCKET_EACCES);
845 SignalCloseEvent(this, error); 845 SignalCloseEvent(this, error);
846 } 846 }
847 847
848 } // namespace rtc 848 } // namespace rtc
OLDNEW
« no previous file with comments | « webrtc/base/socket_unittest.cc ('k') | webrtc/base/socketaddress.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698