summaryrefslogtreecommitdiff
path: root/ACE/tests/Multihomed_INET_Addr_Test.cpp
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2011-03-06 09:25:23 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2011-03-06 09:25:23 +0000
commitd45d94467d8187dcb81b9f94c233314ef76b8d48 (patch)
tree65c94a020d1d2411f789573031e47ef1858a9a1c /ACE/tests/Multihomed_INET_Addr_Test.cpp
parent2125ad5eb15c4d404be5fd57e7d04da8aca0d5e1 (diff)
downloadATCD-d45d94467d8187dcb81b9f94c233314ef76b8d48.tar.gz
Sun Mar 6 09:20:22 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/INET_Addr_Test.cpp: * tests/Multihomed_INET_Addr_Test.cpp: Fixed gcc 4.5 warnings * tests/Log_Thread_Inheritance_Test.cpp: * tests/MT_Reference_Counted_Notify_Test.cpp: * tests/NDDS_Timer_Test.cpp: Zapped some empty lines
Diffstat (limited to 'ACE/tests/Multihomed_INET_Addr_Test.cpp')
-rw-r--r--ACE/tests/Multihomed_INET_Addr_Test.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/ACE/tests/Multihomed_INET_Addr_Test.cpp b/ACE/tests/Multihomed_INET_Addr_Test.cpp
index 8c89f1fe7db..62ea7ed2aee 100644
--- a/ACE/tests/Multihomed_INET_Addr_Test.cpp
+++ b/ACE/tests/Multihomed_INET_Addr_Test.cpp
@@ -24,11 +24,8 @@
#include "ace/Log_Msg.h"
#include "ace/OS_NS_arpa_inet.h"
-int run_main (int argc, ACE_TCHAR *argv[])
+int run_main (int, ACE_TCHAR *[])
{
- ACE_UNUSED_ARG (argc);
- ACE_UNUSED_ARG (argv);
-
ACE_START_TEST (ACE_TEXT ("Multihomed_INET_Addr_Test"));
int status = 0; // Innocent until proven guilty
@@ -62,6 +59,7 @@ int run_main (int argc, ACE_TCHAR *argv[])
{
struct in_addr addrv4;
+ ACE_OS::memset ((void *) &addrv4, 0, sizeof addrv4);
ACE_OS::inet_pton (AF_INET, primary_dotted_decimal, &addrv4);
ACE_OS::memcpy (&primary_addr32, &addrv4, sizeof (primary_addr32));
primary_addr32 = ACE_NTOHL(primary_addr32);
@@ -69,6 +67,7 @@ int run_main (int argc, ACE_TCHAR *argv[])
for (i = 0; i < num_secondaries; ++i) {
struct in_addr addrv4;
+ ACE_OS::memset ((void *) &addrv4, 0, sizeof addrv4);
ACE_OS::inet_pton (AF_INET, secondary_dotted_decimals[i], &addrv4);
ACE_OS::memcpy (&secondary_addr32[i], &addrv4, sizeof (primary_addr32));
secondary_addr32[i] = ACE_NTOHL(secondary_addr32[i]);