summaryrefslogtreecommitdiff
path: root/ACE/apps/JAWS/server
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2009-07-19 08:18:09 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2009-07-19 08:18:09 +0000
commit4173f74edb737f12aedc697a231af3b8ddc79b7b (patch)
treec4f4d2d2337a6ab4fe9be6290d4fd586d417f330 /ACE/apps/JAWS/server
parent878cb013d39ac7bb6245df3374e5d16be7763790 (diff)
downloadATCD-4173f74edb737f12aedc697a231af3b8ddc79b7b.tar.gz
Sun Jul 19 08:18:12 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* apps/JAWS/server/HTTP_Response.cpp: * apps/JAWS/server/JAWS_IO.cpp: Unicode fixes
Diffstat (limited to 'ACE/apps/JAWS/server')
-rw-r--r--ACE/apps/JAWS/server/HTTP_Response.cpp8
-rw-r--r--ACE/apps/JAWS/server/JAWS_IO.cpp4
2 files changed, 6 insertions, 6 deletions
diff --git a/ACE/apps/JAWS/server/HTTP_Response.cpp b/ACE/apps/JAWS/server/HTTP_Response.cpp
index dcd3bb4c5f1..54e1a17c0f7 100644
--- a/ACE/apps/JAWS/server/HTTP_Response.cpp
+++ b/ACE/apps/JAWS/server/HTTP_Response.cpp
@@ -112,7 +112,7 @@ HTTP_Response::error_response (int status_code, const char *log_message)
;
- char *buf;
+ char *buf = 0;
char buf1[4 * BUFSIZ];
char buf2[BUFSIZ];
@@ -270,12 +270,12 @@ HTTP_Response::cgi_response (void)
if (this->request_.cgi_env ())
for (size_t i = 0; this->request_.cgi_env ()[i]; i += 2)
- cgi_options.setenv ((const ACE_TCHAR *)this->request_.cgi_env ()[i],
+ cgi_options.setenv (this->request_.cgi_env ()[i],
ACE_TEXT ("%s"),
- (const ACE_TCHAR *)this->request_.cgi_env ()[i+1]);
+ this->request_.cgi_env ()[i+1]);
ACE_TCHAR buf[BUFSIZ];
- ACE_TCHAR *p, *q;
+ ACE_TCHAR *p = 0, *q = 0;
ACE_OS::strcpy (buf, ACE_TEXT ("HTTP_"));
p = q = buf + ACE_OS::strlen (buf);
diff --git a/ACE/apps/JAWS/server/JAWS_IO.cpp b/ACE/apps/JAWS/server/JAWS_IO.cpp
index efe04cd1f76..4043193d2ee 100644
--- a/ACE/apps/JAWS/server/JAWS_IO.cpp
+++ b/ACE/apps/JAWS/server/JAWS_IO.cpp
@@ -85,7 +85,7 @@ JAWS_Synch_IO::receive_file (const char *filename,
int initial_data_length,
int entire_length)
{
- ACE_Filecache_Handle handle ((const ACE_TCHAR *)filename, entire_length);
+ ACE_Filecache_Handle handle (ACE_TEXT_CHAR_TO_TCHAR (filename), entire_length);
int result = handle.error ();
@@ -118,7 +118,7 @@ JAWS_Synch_IO::transmit_file (const char *filename,
const char *trailer,
int trailer_size)
{
- ACE_Filecache_Handle handle ((const ACE_TCHAR *)filename);
+ ACE_Filecache_Handle handle (ACE_TEXT_CHAR_TO_TCHAR (filename));
int result = handle.error ();