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

Side by Side Diff: net/base/ssl_client_socket_nss.cc

Issue 42013: Slight code change to make some global variables const. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 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 | Annotate | Revision Log
« no previous file with comments | « net/base/nss_memio.c ('k') | net/base/telnet_server.h » ('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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 "net/base/ssl_client_socket_nss.h" 5 #include "net/base/ssl_client_socket_nss.h"
6 6
7 #include <nspr.h> 7 #include <nspr.h>
8 #include <nss.h> 8 #include <nss.h>
9 #include <secerr.h> 9 #include <secerr.h>
10 // Work around https://bugzilla.mozilla.org/show_bug.cgi?id=455424 10 // Work around https://bugzilla.mozilla.org/show_bug.cgi?id=455424
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 NOTREACHED() << "unexpected state"; 393 NOTREACHED() << "unexpected state";
394 break; 394 break;
395 } 395 }
396 396
397 // Do the actual network I/O 397 // Do the actual network I/O
398 if (nss_bufs_ != NULL) { 398 if (nss_bufs_ != NULL) {
399 int nsent = BufferSend(); 399 int nsent = BufferSend();
400 int nreceived = BufferRecv(); 400 int nreceived = BufferRecv();
401 network_moved = (nsent > 0 || nreceived >= 0); 401 network_moved = (nsent > 0 || nreceived >= 0);
402 } 402 }
403 } while ((rv != ERR_IO_PENDING || network_moved) && next_state_ != STATE_NONE) ; 403 } while ((rv != ERR_IO_PENDING || network_moved) &&
404 next_state_ != STATE_NONE);
404 LeaveFunction(""); 405 LeaveFunction("");
405 return rv; 406 return rv;
406 } 407 }
407 408
408 int SSLClientSocketNSS::DoConnect() { 409 int SSLClientSocketNSS::DoConnect() {
409 EnterFunction(""); 410 EnterFunction("");
410 GotoState(STATE_CONNECT_COMPLETE); 411 GotoState(STATE_CONNECT_COMPLETE);
411 return transport_->Connect(&io_callback_); 412 return transport_->Connect(&io_callback_);
412 } 413 }
413 414
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
579 GotoState(STATE_PAYLOAD_WRITE); 580 GotoState(STATE_PAYLOAD_WRITE);
580 return ERR_IO_PENDING; 581 return ERR_IO_PENDING;
581 } 582 }
582 user_buf_ = NULL; 583 user_buf_ = NULL;
583 LeaveFunction(""); 584 LeaveFunction("");
584 return NetErrorFromNSPRError(prerr); 585 return NetErrorFromNSPRError(prerr);
585 } 586 }
586 587
587 } // namespace net 588 } // namespace net
588 589
OLDNEW
« no previous file with comments | « net/base/nss_memio.c ('k') | net/base/telnet_server.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698