diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2001-08-27 01:51:55 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2001-08-27 01:51:55 +0000 |
| commit | 7f6966bcc74c612ee55d6944a696469d3c76b492 (patch) | |
| tree | 150c1bd5f9cc0c572bb406437c83791afb34c1c3 | |
| parent | a84a9193f6a095bf3897d1b7dbd03b4714268321 (diff) | |
| download | ATCD-7f6966bcc74c612ee55d6944a696469d3c76b492.tar.gz | |
ChangeLogTag: Sun Aug 26 20:50:22 2001 Balachandran Natarajan <bala@cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 6 | ||||
| -rw-r--r-- | ace/SSL/SSL_SOCK_Stream.i | 12 |
4 files changed, 25 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index e32d98bea0a..c490ad4de7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Aug 26 20:50:22 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/SSL/SSL_SOCK_Stream.i: Fixed a warning (hopefully) in + Borland builds. The warning was because a temporary variable was + created. + Sun Aug 26 20:45:24 2001 Balachandran Natarajan <bala@cs.wustl.edu> * tests/MEM_Stream_Test.cpp: Fixed a unused variable warning in diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index e32d98bea0a..c490ad4de7b 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,9 @@ +Sun Aug 26 20:50:22 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/SSL/SSL_SOCK_Stream.i: Fixed a warning (hopefully) in + Borland builds. The warning was because a temporary variable was + created. + Sun Aug 26 20:45:24 2001 Balachandran Natarajan <bala@cs.wustl.edu> * tests/MEM_Stream_Test.cpp: Fixed a unused variable warning in diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index e32d98bea0a..c490ad4de7b 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,9 @@ +Sun Aug 26 20:50:22 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/SSL/SSL_SOCK_Stream.i: Fixed a warning (hopefully) in + Borland builds. The warning was because a temporary variable was + created. + Sun Aug 26 20:45:24 2001 Balachandran Natarajan <bala@cs.wustl.edu> * tests/MEM_Stream_Test.cpp: Fixed a unused variable warning in diff --git a/ace/SSL/SSL_SOCK_Stream.i b/ace/SSL/SSL_SOCK_Stream.i index a7b285b13c1..353b60812c2 100644 --- a/ace/SSL/SSL_SOCK_Stream.i +++ b/ace/SSL/SSL_SOCK_Stream.i @@ -135,10 +135,12 @@ ACE_SSL_SOCK_Stream::recv_i (void *buf, { ACE_TRACE ("ACE_SSL_SOCK_Stream::recv_i"); + // @@Ossama: Need to be sure that we want to inline this.. + // NOTE: Caller must provide thread-synchronization. int bytes_read = 0; - const ACE_HANDLE &handle = this->get_handle (); + //const ACE_HANDLE &handle = this->get_handle (); // Flag that forces another iteration of the read loop. int ssl_read = 0; @@ -147,7 +149,7 @@ ACE_SSL_SOCK_Stream::recv_i (void *buf, int val = 0; if (timeout != 0) - ACE::record_and_set_non_blocking_mode (handle, + ACE::record_and_set_non_blocking_mode (this->get_handle (), val); // The SSL_read() and SSL_peek() calls are wrapped in a @@ -177,7 +179,7 @@ ACE_SSL_SOCK_Stream::recv_i (void *buf, { case SSL_ERROR_NONE: if (timeout != 0) - ACE::restore_non_blocking_mode (handle, val); + ACE::restore_non_blocking_mode (this->get_handle (), val); return bytes_read; @@ -190,7 +192,7 @@ ACE_SSL_SOCK_Stream::recv_i (void *buf, if (timeout != 0 && !SSL_pending (this->ssl_)) { - if (ACE::enter_recv_timedwait (handle, + if (ACE::enter_recv_timedwait (this->get_handle (), timeout, val) == -1) return -1; @@ -202,7 +204,7 @@ ACE_SSL_SOCK_Stream::recv_i (void *buf, case SSL_ERROR_ZERO_RETURN: if (timeout != 0) - ACE::restore_non_blocking_mode (handle, val); + ACE::restore_non_blocking_mode (this->get_handle (), val); // @@ This appears to be the right/expected thing to do. // However, it'd be nice if someone could verify this. |