summaryrefslogtreecommitdiff
path: root/ace/SSL
diff options
context:
space:
mode:
Diffstat (limited to 'ace/SSL')
-rw-r--r--ace/SSL/SSL_Asynch_Stream.cpp66
-rw-r--r--ace/SSL/SSL_Context.cpp2
-rw-r--r--ace/SSL/SSL_SOCK_Stream.cpp2
3 files changed, 35 insertions, 35 deletions
diff --git a/ace/SSL/SSL_Asynch_Stream.cpp b/ace/SSL/SSL_Asynch_Stream.cpp
index 23ab69059fd..2e0188475c5 100644
--- a/ace/SSL/SSL_Asynch_Stream.cpp
+++ b/ace/SSL/SSL_Asynch_Stream.cpp
@@ -121,8 +121,8 @@ ACE_SSL_Asynch_Stream::ACE_SSL_Asynch_Stream (
if (this->ssl_ == 0)
ACE_ERROR
((LM_ERROR,
- ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream %p\n"),
- ACE_TEXT ("- cannot allocate new SSL structure")
+ ACE_LIB_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream %p\n"),
+ ACE_LIB_TEXT ("- cannot allocate new SSL structure")
));
::SSL_set_verify (this->ssl_,
@@ -141,9 +141,9 @@ ACE_SSL_Asynch_Stream::~ACE_SSL_Asynch_Stream (void)
if (this->flags_ & SF_STREAM_OPEN) // open
if ((this->flags_ & SF_DELETE_ENABLE) == 0) // but ..
ACE_DEBUG ((LM_DEBUG,
- ACE_TEXT("ACE_SSL_Asynch_Stream::DTOR-")
- ACE_TEXT("possible access violation ")
- ACE_TEXT("if proactor still handles events\n")));
+ ACE_LIB_TEXT("ACE_SSL_Asynch_Stream::DTOR-")
+ ACE_LIB_TEXT("possible access violation ")
+ ACE_LIB_TEXT("if proactor still handles events\n")));
::SSL_free (this->ssl_);
@@ -232,22 +232,22 @@ ACE_SSL_Asynch_Stream::open (ACE_Handler & handler,
if (this->flags_ & SF_STREAM_OPEN)
ACE_ERROR_RETURN
((LM_ERROR,
- ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"),
- ACE_TEXT ("- already opened")),
+ ACE_LIB_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"),
+ ACE_LIB_TEXT ("- already opened")),
-1);
if (this->ssl_ == 0)
ACE_ERROR_RETURN
((LM_ERROR,
- ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"),
- ACE_TEXT ("- SSL structure is absent")),
+ ACE_LIB_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"),
+ ACE_LIB_TEXT ("- SSL structure is absent")),
-1);
if (handle == ACE_INVALID_HANDLE)
ACE_ERROR_RETURN
((LM_ERROR,
- ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"),
- ACE_TEXT ("- invalid handle")),
+ ACE_LIB_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"),
+ ACE_LIB_TEXT ("- invalid handle")),
-1);
@@ -275,8 +275,8 @@ ACE_SSL_Asynch_Stream::open (ACE_Handler & handler,
if (this->bio_ == 0)
ACE_ERROR_RETURN
((LM_ERROR,
- ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"),
- ACE_TEXT ("- cannot allocate new BIO structure")),
+ ACE_LIB_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"),
+ ACE_LIB_TEXT ("- cannot allocate new BIO structure")),
-1);
::SSL_set_bio (this->ssl_ , this->bio_ , this->bio_);
@@ -294,8 +294,8 @@ ACE_SSL_Asynch_Stream::open (ACE_Handler & handler,
default:
ACE_ERROR_RETURN
((LM_ERROR,
- ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"),
- ACE_TEXT ("- invalid stream type")),
+ ACE_LIB_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"),
+ ACE_LIB_TEXT ("- invalid stream type")),
-1);
}
@@ -464,7 +464,7 @@ ACE_SSL_Asynch_Stream::do_SSL_shutdown (void)
default:
this->print_error (status,
- ACE_TEXT ("Shutdown error"));
+ ACE_LIB_TEXT ("Shutdown error"));
retval = -1;
break;
}
@@ -505,8 +505,8 @@ ACE_SSL_Asynch_Stream::do_SSL_handshake (void)
default:
ACE_ERROR_RETURN
((LM_ERROR,
- ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream %p\n"),
- ACE_TEXT ("- invalid stream type")),
+ ACE_LIB_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream %p\n"),
+ ACE_LIB_TEXT ("- invalid stream type")),
-1);
}
@@ -528,7 +528,7 @@ ACE_SSL_Asynch_Stream::do_SSL_handshake (void)
case SSL_ERROR_SYSCALL:
default:
this->print_error (status,
- ACE_TEXT ("Handshake error"));
+ ACE_LIB_TEXT ("Handshake error"));
return -1;
}
@@ -587,7 +587,7 @@ ACE_SSL_Asynch_Stream::do_SSL_read (void)
this->notify_read (0, EFAULT);
this->print_error (status,
- ACE_TEXT ("SSL_read error"));
+ ACE_LIB_TEXT ("SSL_read error"));
return -1;
}
@@ -637,7 +637,7 @@ ACE_SSL_Asynch_Stream::do_SSL_write (void)
this->notify_write(0, EFAULT);
this->print_error (status,
- ACE_TEXT ("SSL_write error"));
+ ACE_LIB_TEXT ("SSL_write error"));
return -1;
}
@@ -820,8 +820,8 @@ ACE_SSL_Asynch_Stream::ssl_bio_read (char * buf,
{
ACE_ERROR
((LM_ERROR,
- ACE_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"),
- ACE_TEXT ("error in ACE_Message_Block::size() ")
+ ACE_LIB_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"),
+ ACE_LIB_TEXT ("error in ACE_Message_Block::size() ")
));
errval = EINVAL;
@@ -843,8 +843,8 @@ ACE_SSL_Asynch_Stream::ssl_bio_read (char * buf,
{
ACE_ERROR
((LM_ERROR,
- ACE_TEXT ("%N:%l (%P|%t) ACE_SSL_Asynch_Stream %p\n"),
- ACE_TEXT ("attempt read failed")
+ ACE_LIB_TEXT ("%N:%l (%P|%t) ACE_SSL_Asynch_Stream %p\n"),
+ ACE_LIB_TEXT ("attempt read failed")
));
errval = EINVAL; // may be leave EINPROGRESS ??
@@ -884,8 +884,8 @@ ACE_SSL_Asynch_Stream::ssl_bio_write (const char * buf,
{
ACE_ERROR
((LM_ERROR,
- ACE_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"),
- ACE_TEXT ("error in ACE_Message_Block::size() ")
+ ACE_LIB_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"),
+ ACE_LIB_TEXT ("error in ACE_Message_Block::size() ")
));
errval = EINVAL;
@@ -901,8 +901,8 @@ ACE_SSL_Asynch_Stream::ssl_bio_write (const char * buf,
{
ACE_ERROR
((LM_ERROR,
- ACE_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"),
- ACE_TEXT ("error in ACE_Message_Block::copy() ")
+ ACE_LIB_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"),
+ ACE_LIB_TEXT ("error in ACE_Message_Block::copy() ")
));
errval = EINVAL;
@@ -920,8 +920,8 @@ ACE_SSL_Asynch_Stream::ssl_bio_write (const char * buf,
{
ACE_ERROR
((LM_ERROR,
- ACE_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"),
- ACE_TEXT ("attempt write failed")
+ ACE_LIB_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"),
+ ACE_LIB_TEXT ("attempt write failed")
));
errval = EINVAL; // may be leave EINPROGRESS ??
@@ -971,8 +971,8 @@ ACE_SSL_Asynch_Stream::handle_write_stream (
ACE_ERROR
((LM_ERROR,
- ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream %p\n"),
- ACE_TEXT ("attempt write failed")
+ ACE_LIB_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream %p\n"),
+ ACE_LIB_TEXT ("attempt write failed")
));
this->bio_out_errno_ = EINVAL;
diff --git a/ace/SSL/SSL_Context.cpp b/ace/SSL/SSL_Context.cpp
index fa120632038..fd884dd9044 100644
--- a/ace/SSL/SSL_Context.cpp
+++ b/ace/SSL/SSL_Context.cpp
@@ -503,7 +503,7 @@ ACE_SSL_Context::report_error (unsigned long error_code)
(void) ::ERR_error_string (error_code, error_string);
ACE_ERROR ((LM_ERROR,
- ACE_TEXT ("ACE_SSL (%P|%t) error code: %u - %C\n"),
+ ACE_LIB_TEXT ("ACE_SSL (%P|%t) error code: %u - %C\n"),
error_code,
error_string));
}
diff --git a/ace/SSL/SSL_SOCK_Stream.cpp b/ace/SSL/SSL_SOCK_Stream.cpp
index d0ed9f3709e..f5ba831ad17 100644
--- a/ace/SSL/SSL_SOCK_Stream.cpp
+++ b/ace/SSL/SSL_SOCK_Stream.cpp
@@ -45,7 +45,7 @@ ACE_SSL_SOCK_Stream::ACE_SSL_SOCK_Stream (ACE_SSL_Context *context)
ACE_ERROR ((LM_ERROR,
"(%P|%t) ACE_SSL_SOCK_Stream "
"- cannot allocate new SSL structure %p\n",
- ACE_TEXT ("")));
+ ACE_LIB_TEXT ("")));
}
}
View Lorry Controller Status