diff options
| author | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-12-11 08:51:41 +0000 |
|---|---|---|
| committer | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-12-11 08:51:41 +0000 |
| commit | c32320ace6717334c9cf38321835a19199d6a64a (patch) | |
| tree | b8e41b34c9abaaeb5d45a5573e4ee50cc927ebac /ace/SSL | |
| parent | b1bc808ef31592cb3aeda6f3ed8e1d957810f5e8 (diff) | |
| download | ATCD-c32320ace6717334c9cf38321835a19199d6a64a.tar.gz | |
ChangeLogTag:Mon Dec 11 00:50:42 2000 Darrell Brunsch <brunsch@uci.edu>
Diffstat (limited to 'ace/SSL')
| -rw-r--r-- | ace/SSL/SSL_Context.cpp | 6 | ||||
| -rw-r--r-- | ace/SSL/SSL_SOCK_Acceptor.cpp | 2 | ||||
| -rw-r--r-- | ace/SSL/SSL_SOCK_Connector.cpp | 12 | ||||
| -rw-r--r-- | ace/SSL/SSL_SOCK_Stream.i | 4 |
4 files changed, 9 insertions, 15 deletions
diff --git a/ace/SSL/SSL_Context.cpp b/ace/SSL/SSL_Context.cpp index 69759afcdf8..f2bea62aba8 100644 --- a/ace/SSL/SSL_Context.cpp +++ b/ace/SSL/SSL_Context.cpp @@ -97,11 +97,9 @@ ACE_SSL_Context::ssl_library_init (void) // rwlock_init(&(ACE_SSL_Context::lock_[i]), USYNC_THREAD, // 0); if (ACE_OS::mutex_init(&(ACE_SSL_Context::lock_[i]), - USYNC_THREAD, - 0) != 0) + USYNC_THREAD) != 0) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) ACE_SSL_Context::ssl_library_init ") - ACE_TEXT ("- %p\n"), + "(%P|%t) ACE_SSL_Context::ssl_library_init - %p\n", "mutex_init")); } diff --git a/ace/SSL/SSL_SOCK_Acceptor.cpp b/ace/SSL/SSL_SOCK_Acceptor.cpp index 842cfb852f5..f81a87fb23c 100644 --- a/ace/SSL/SSL_SOCK_Acceptor.cpp +++ b/ace/SSL/SSL_SOCK_Acceptor.cpp @@ -128,7 +128,7 @@ ACE_SSL_SOCK_Acceptor::ssl_accept (ACE_SSL_SOCK_Stream &new_stream) const { #ifndef ACE_NDEBUG ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) X.509 certificate verify error:%s\n"), + "(%P|%t) X.509 certificate verify error:%s\n", ::X509_verify_cert_error_string (verify_error))); #endif /* ACE_NDEBUG */ diff --git a/ace/SSL/SSL_SOCK_Connector.cpp b/ace/SSL/SSL_SOCK_Connector.cpp index 1ea6a780cab..58aaf82ab0d 100644 --- a/ace/SSL/SSL_SOCK_Connector.cpp +++ b/ace/SSL/SSL_SOCK_Connector.cpp @@ -242,10 +242,8 @@ ACE_SSL_SOCK_Connector::ACE_SSL_SOCK_Connector ( && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ( - "ACE_SSL_SOCK_Connector::ACE_SSL_SOCK_Connector" - ))); + "%p\n", + ACE_TEXT ("ACE_SSL_SOCK_Connector::ACE_SSL_SOCK_Connector"))); } ACE_SSL_SOCK_Connector::ACE_SSL_SOCK_Connector ( @@ -279,9 +277,7 @@ ACE_SSL_SOCK_Connector::ACE_SSL_SOCK_Connector ( && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ( - "ACE_SSL_SOCK_Connector::ACE_SSL_SOCK_Connector" - ))); + "%p\n", + ACE_TEXT ("ACE_SSL_SOCK_Connector::ACE_SSL_SOCK_Connector"))); } diff --git a/ace/SSL/SSL_SOCK_Stream.i b/ace/SSL/SSL_SOCK_Stream.i index d777bfe1471..c49e157df76 100644 --- a/ace/SSL/SSL_SOCK_Stream.i +++ b/ace/SSL/SSL_SOCK_Stream.i @@ -33,8 +33,8 @@ ACE_SSL_SOCK_Stream::ACE_SSL_SOCK_Stream (ACE_SSL_Context *context) if (this->ssl_ == 0) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) ACE_SSL_SOCK_Stream ") - ACE_TEXT ("- cannot allocate new SSL structure%p\n"), + "(%P|%t) ACE_SSL_SOCK_Stream " + "- cannot allocate new SSL structure %p\n", ACE_TEXT (""))); ::SSL_set_verify (this->ssl_, |