summaryrefslogtreecommitdiff
path: root/ACE/tests/Network_Adapters_Test.cpp
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2008-09-19 09:43:13 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2008-09-19 09:43:13 +0000
commitafa95ea8f78ceac395603c8ff15dc1fd845f75c6 (patch)
tree2f268d69d91baebcc2e60c024fb4eebc6c57b60f /ACE/tests/Network_Adapters_Test.cpp
parent7a1f02fb83abccb5e1df8c928904ebacef82531b (diff)
downloadATCD-afa95ea8f78ceac395603c8ff15dc1fd845f75c6.tar.gz
Fri Sep 19 09:41:59 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'ACE/tests/Network_Adapters_Test.cpp')
-rw-r--r--ACE/tests/Network_Adapters_Test.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/ACE/tests/Network_Adapters_Test.cpp b/ACE/tests/Network_Adapters_Test.cpp
index e1059bf38d2..e7e997e6731 100644
--- a/ACE/tests/Network_Adapters_Test.cpp
+++ b/ACE/tests/Network_Adapters_Test.cpp
@@ -874,13 +874,13 @@ Fini_Guard::~Fini_Guard (void)
static int number_of_ping_points = 0;
static char ping_points_ips [MAX_NUMBER_OF_PING_POINTS][16];
static ACE_INET_Addr ping_points_addrs [MAX_NUMBER_OF_PING_POINTS];
-static ACE_TCHAR local_ip_to_bind [16];
+static char local_ip_to_bind [16];
static int wait_echo_reply_timer = 500; // 500 ms to wait is the default
static int repeats_seconds_timer = 60; // 60 seconds between repeats
static int
-is_ip_address_local (ACE_TCHAR const * const ip_to_bind)
+is_ip_address_local (char const * const ip_to_bind)
{
ACE_INET_Addr *the_addr_array = 0;
size_t how_many = 0;
@@ -951,7 +951,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
{
case 'b': // ip-address of the interface to bind to
ACE_OS::strncpy (local_ip_to_bind,
- get_opt.optarg,
+ ACE_TEXT_ALWAYS_CHAR (get_opt.optarg),
sizeof local_ip_to_bind);
if (!ACE_OS::strlen (local_ip_to_bind) ||
@@ -1074,7 +1074,7 @@ run_main (int argc, ACE_TCHAR *argv[])
milliseconds = wait_echo_reply_timer % 1000;
ACE_Time_Value const wait_timer (seconds, milliseconds);
- Echo_Handler *ping_handler;
+ Echo_Handler *ping_handler = 0;
ACE_NEW_RETURN (ping_handler, Echo_Handler, -1);
if (ACE_OS::strlen (local_ip_to_bind))
@@ -1117,7 +1117,7 @@ run_main (int argc, ACE_TCHAR *argv[])
}
}
- Repeats_Handler *repeats_handler;
+ Repeats_Handler *repeats_handler = 0;
ACE_NEW_RETURN (repeats_handler, Repeats_Handler, -1);
if (repeats_handler->open (ping_handler,
main_reactor,