summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgthaker <gthaker@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-04-10 16:06:16 +0000
committergthaker <gthaker@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-04-10 16:06:16 +0000
commit841010459c446fce78cdf41cfffe17daa761e356 (patch)
tree0277b4acad89fd462f3a28ee208efb58472aa64d
parent05323279c17c01878697bd4c149b00c5d281bdbe (diff)
downloadATCD-841010459c446fce78cdf41cfffe17daa761e356.tar.gz
Fixed trailing whitespace problems
-rw-r--r--ace/Multihomed_INET_Addr.cpp24
-rw-r--r--ace/Multihomed_INET_Addr.h10
-rw-r--r--ace/SOCK_SEQPACK_Acceptor.cpp8
-rw-r--r--ace/SOCK_SEQPACK_Association.cpp4
-rw-r--r--performance-tests/SCTP/SOCK_SEQPACK_clt.cpp6
-rw-r--r--performance-tests/SCTP/SOCK_STREAM_clt.cpp8
-rwxr-xr-xperformance-tests/SCTP/run_spectrum.pl14
-rw-r--r--tests/SOCK_SEQPACK_Association_Test.cpp16
8 files changed, 45 insertions, 45 deletions
diff --git a/ace/Multihomed_INET_Addr.cpp b/ace/Multihomed_INET_Addr.cpp
index fe99c722855..e3e13a832f6 100644
--- a/ace/Multihomed_INET_Addr.cpp
+++ b/ace/Multihomed_INET_Addr.cpp
@@ -18,7 +18,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Multihomed_INET_Addr)
// Default constructor
ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr (void)
- : secondaries(0)
+ : secondaries(0)
{
ACE_TRACE ("ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr");
}
@@ -29,7 +29,7 @@ ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number,
int address_family,
const char *(secondary_host_names[]),
size_t size){
-
+
// Initialize the primary INET addr
ACE_INET_Addr::set(port_number, host_name, encode, address_family);
@@ -54,7 +54,7 @@ ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number,
++next_empty_slot;
}
}
-
+
return;
}
@@ -63,7 +63,7 @@ ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number,
int encode,
const ACE_UINT32 *secondary_ip_addrs,
size_t size){
-
+
// Initialize the primary INET addr
ACE_INET_Addr::set(port_number, primary_ip_addr, encode);
@@ -83,12 +83,12 @@ ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number,
"Invalid INET addr (%u:%u) will be ignored\n",
secondary_ip_addrs[i], port_number));
this->secondaries.size(this->secondaries.size() - 1);
- }
+ }
else
++next_empty_slot;
}
}
-
+
return;
}
@@ -111,7 +111,7 @@ ACE_Multihomed_INET_Addr::set (u_short port_number,
address_family);
if (ret) {
return ret;
- }
+ }
}
return ACE_INET_Addr::set(port_number, host_name, encode, address_family);
@@ -140,11 +140,11 @@ ACE_Multihomed_INET_Addr::set (u_short port_number,
return ACE_INET_Addr::set(port_number, primary_ip_addr, encode);
}
-int
+int
ACE_Multihomed_INET_Addr::get_secondary_addresses(ACE_INET_Addr *secondary_addrs,
size_t size) const
{
- size_t top = size < this->secondaries.size() ?
+ size_t top = size < this->secondaries.size() ?
size : this->secondaries.size();
for (size_t i = 0; i < top; ++i) {
@@ -167,11 +167,11 @@ ACE_Multihomed_INET_Addr::get_addresses(sockaddr_in *addrs,
if (size > 0) {
addrs[0] = *ACE_reinterpret_cast (sockaddr_in*, this->get_addr());
}
-
+
// Copy secondary addresses to remaining slots of the user-supplied
// array. Secondary address [i] is copied to slot [i+1]
-
- size_t top = size - 1 < this->secondaries.size() ?
+
+ size_t top = size - 1 < this->secondaries.size() ?
size - 1 : this->secondaries.size();
for (size_t i = 0; i < top; ++i) {
diff --git a/ace/Multihomed_INET_Addr.h b/ace/Multihomed_INET_Addr.h
index 4198316d4e0..32058a96f33 100644
--- a/ace/Multihomed_INET_Addr.h
+++ b/ace/Multihomed_INET_Addr.h
@@ -44,7 +44,7 @@ public:
* already and is passed straight through. <address_family> can be
* used to select IPv4/IPv6 if the OS has IPv6 capability
* (ACE_HAS_IPV6 is defined). To specify IPv6, use the value
- * AF_INET6. To specify IPv4, use AF_INET.
+ * AF_INET6. To specify IPv4, use AF_INET.
*/
ACE_Multihomed_INET_Addr(u_short port_number,
const char primary_host_name[],
@@ -66,9 +66,9 @@ public:
int encode = 1,
const ACE_UINT32 *secondary_ip_addrs = 0,
size_t size = 0);
-
+
/// Use compiler-generated copy constructor.
-
+
/// Use compiler-generated assignment operator.
/// Default dtor.
@@ -87,7 +87,7 @@ public:
* already and is passed straight through. <address_family> can be
* used to select IPv4/IPv6 if the OS has IPv6 capability
* (ACE_HAS_IPV6 is defined). To specify IPv6, use the value
- * AF_INET6. To specify IPv4, use AF_INET.
+ * AF_INET6. To specify IPv4, use AF_INET.
*/
int set (u_short port_number,
const char primary_host_name[],
@@ -127,7 +127,7 @@ public:
/**
* Initialize user-supplied array <addrs> with the the current
* primary and secondary addresses. <size> is taken as the size of
- * this array.
+ * this array.
*/
void get_addresses(sockaddr_in *addrs,
size_t size) const;
diff --git a/ace/SOCK_SEQPACK_Acceptor.cpp b/ace/SOCK_SEQPACK_Acceptor.cpp
index 97a9f8d280d..a6622889215 100644
--- a/ace/SOCK_SEQPACK_Acceptor.cpp
+++ b/ace/SOCK_SEQPACK_Acceptor.cpp
@@ -299,12 +299,12 @@ ACE_SOCK_SEQPACK_Acceptor::shared_open (const ACE_Multihomed_INET_Addr &local_sa
if (ACE::bind_port (this->get_handle ()) == -1)
error = 1;
}
- else
+ else
{
// The total number of addresses is the number of secondary
// addresses plus one.
size_t num_addresses = local_sap.get_num_secondary_addresses() + 1;
-
+
// Create an array of sockaddr_in to hold the underlying
// representations of the primary and secondary
// addresses.
@@ -314,7 +314,7 @@ ACE_SOCK_SEQPACK_Acceptor::shared_open (const ACE_Multihomed_INET_Addr &local_sa
if (!local_inet_addrs)
error = 1;
- else
+ else
{
// Populate the array by invoking the get_addresses method
// on the Multihomed_INET_Addr
@@ -336,7 +336,7 @@ ACE_SOCK_SEQPACK_Acceptor::shared_open (const ACE_Multihomed_INET_Addr &local_sa
(sockaddr *) local_sap.get_addr (),
local_sap.get_size ()) == -1)
error = 1;
-
+
if (error != 0
|| ACE_OS::listen (this->get_handle (),
backlog) == -1)
diff --git a/ace/SOCK_SEQPACK_Association.cpp b/ace/SOCK_SEQPACK_Association.cpp
index c132878cddb..9a672f73126 100644
--- a/ace/SOCK_SEQPACK_Association.cpp
+++ b/ace/SOCK_SEQPACK_Association.cpp
@@ -57,7 +57,7 @@ ACE_SOCK_SEQPACK_Association::get_local_addrs (ACE_INET_Addr *addrs, size_t &siz
// which causes dynamically-allocated memory to be released as soon
// as the ACE_Auto_Array_Ptr goes out of scope.
ACE_Auto_Array_Ptr<sockaddr_in> addr_structs;
-
+
// Allocate memory for this array. Return -1 if the memory cannot
// be allocated. (This activity requires a temporary variable---a
// bare sockaddr_in* --- because ACE_NEW_RETURN cannot act directory on
@@ -126,7 +126,7 @@ ACE_SOCK_SEQPACK_Association::get_remote_addrs (ACE_INET_Addr *addrs, size_t &si
// which causes dynamically-allocated memory to be released as soon
// as the ACE_Auto_Array_Ptr goes out of scope.
ACE_Auto_Array_Ptr<sockaddr_in> addr_structs;
-
+
// Allocate memory for this array. Return -1 if the memory cannot
// be allocated. (This activity requires a temporary variable---a
// bare sockaddr_in* --- because ACE_NEW_RETURN cannot act directory on
diff --git a/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp b/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp
index 8d964c01f98..74a2a2c3d00 100644
--- a/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp
+++ b/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp
@@ -1,6 +1,6 @@
// $Id$
-// On WIN32, math.h may contain template code,
+// On WIN32, math.h may contain template code,
// which cannot be wrapped by 'extern "C"'
#ifdef WIN32
#include <math.h>
@@ -262,10 +262,10 @@ HIST runUnmarshalledOctetTest(ACE_CDR::Octet *buf, size_t seqLen, ACE_SOCK_SEQPA
0);
// compute the message latency in micro-seconds
- messageLatency_usec =
+ messageLatency_usec =
(ACE_static_cast(double,
- ACE_UINT64_DBLCAST_ADAPTER(endTime)) -
+ ACE_UINT64_DBLCAST_ADAPTER(endTime)) -
ACE_static_cast(double,
ACE_UINT64_DBLCAST_ADAPTER(startTime)))
diff --git a/performance-tests/SCTP/SOCK_STREAM_clt.cpp b/performance-tests/SCTP/SOCK_STREAM_clt.cpp
index 81bd75aa362..754f16413f3 100644
--- a/performance-tests/SCTP/SOCK_STREAM_clt.cpp
+++ b/performance-tests/SCTP/SOCK_STREAM_clt.cpp
@@ -1,6 +1,6 @@
// $Id$
-// On WIN32, math.h may contain template code,
+// On WIN32, math.h may contain template code,
// which cannot be wrapped by 'extern "C"'
#ifdef WIN32
#include <math.h>
@@ -242,7 +242,7 @@ HIST runUnmarshalledOctetTest(ACE_CDR::Octet *buf, size_t seqLen, ACE_SOCK_Strea
"ACE_OS::gethrtime()"),
0);
-
+
ACE_CDR::ULong msgLenExpressed = ACE_HTONL(msgLen);
iov[0].iov_base = ACE_reinterpret_cast(char *, &msgLenExpressed);
iov[0].iov_len = ACE_CDR::LONG_SIZE;
@@ -272,10 +272,10 @@ HIST runUnmarshalledOctetTest(ACE_CDR::Octet *buf, size_t seqLen, ACE_SOCK_Strea
0);
// compute the message latency in micro-seconds
- messageLatency_usec =
+ messageLatency_usec =
(ACE_static_cast(double,
- ACE_UINT64_DBLCAST_ADAPTER(endTime)) -
+ ACE_UINT64_DBLCAST_ADAPTER(endTime)) -
ACE_static_cast(double,
ACE_UINT64_DBLCAST_ADAPTER(startTime)))
diff --git a/performance-tests/SCTP/run_spectrum.pl b/performance-tests/SCTP/run_spectrum.pl
index 40eb9d74525..98b2dbea2f5 100755
--- a/performance-tests/SCTP/run_spectrum.pl
+++ b/performance-tests/SCTP/run_spectrum.pl
@@ -21,7 +21,7 @@ run_spectrum.pl - Run a spectrum of performance tests.
=head1 SYNOPSIS
run_spectrum.pl [ --help ]
- [ --manual ]
+ [ --manual ]
[ --service (STREAM|SEQPACK) ]
[ --protocol (TCP|SCTP) ]
[ --config_file filename ]
@@ -199,12 +199,12 @@ $service =~ s/seqpacket/seqpack/; # Accept "seqpacket" as synonym for "seqpac
$service =~ /^(stream|seqpack)$/
or pod2usage("Service must be STREAM or SEQPACK\n");
-$protocol =~ /^(tcp|sctp)$/
+$protocol =~ /^(tcp|sctp)$/
or pod2usage("Protocol must be TCP or SCTP\n");
$service eq "seqpack" and $protocol eq "tcp"
and pod2usage("Cannot use SEQPACK service with TCP\n");
-
+
# Open config file
open CONFIG, "< $config_file"
or die "cannot open file: $config_file\n";
@@ -221,7 +221,7 @@ while (<CONFIG>) {
}
}
-# Close config file
+# Close config file
close CONFIG;
# Print options
@@ -236,13 +236,13 @@ print "Read options from $config_file: \"$options\"\n\n";
my $max_size = 16;
$max_size = 15 if $protocol eq "sctp";
for (my $i = 2; $i <= $max_size; ++$i) {
-
+
# Assemble client parameters and print out the command line
my $client_params = "-t $protocol -s $i $options >> $output_file";
print "$client_programs{$service} $client_params\n";
-
+
# Configure client
- my $client =
+ my $client =
new PerlACE::Process($client_programs{$service}, $client_params);
# Spawn client
diff --git a/tests/SOCK_SEQPACK_Association_Test.cpp b/tests/SOCK_SEQPACK_Association_Test.cpp
index d5bc6a3b3ec..86ded6a5f19 100644
--- a/tests/SOCK_SEQPACK_Association_Test.cpp
+++ b/tests/SOCK_SEQPACK_Association_Test.cpp
@@ -9,7 +9,7 @@
// SOCK_SEQPACK_Association_Test.cpp
//
// = DESCRIPTION
-//
+//
// Tests the methods get_local_addrs and get_remote_addrs of class
// ACE_SOCK_SEQPACK_Association.
//
@@ -51,21 +51,21 @@ int main (int argc, ACE_TCHAR *argv[])
status = 1;
} else if (serverAddr.set(argv[1])) {
-
+
ACE_ERROR ((LM_ERROR,
ACE_TEXT ("%p\n"),
ACE_TEXT ("ACE_INET_Addr::set")));
status = 1;
-
+
} else if (connector.connect (dataStream, serverAddr)) {
ACE_ERROR ((LM_ERROR,
ACE_TEXT ("%p\n"),
ACE_TEXT ("ACE_SOCK_SEQPACK_Connector::connect")));
status = 1;
-
+
} else {
-
+
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("Connected to server at %s\n"),
argv[1]));
@@ -105,7 +105,7 @@ void dump_names(const ACE_SOCK_SEQPACK_Association& assoc)
for (i = 0; i < in_out_size; ++i) {
if (in_out[i].addr_to_string(outbuf, outbuf_size)) {
-
+
ACE_ERROR((LM_ERROR,
"%p\n",
"addr_to_string"));
@@ -117,7 +117,7 @@ void dump_names(const ACE_SOCK_SEQPACK_Association& assoc)
i,
outbuf));
}
-
+
// Reset in_out_size
in_out_size = 100;
@@ -136,7 +136,7 @@ void dump_names(const ACE_SOCK_SEQPACK_Association& assoc)
for (i = 0; i < in_out_size; ++i) {
if (in_out[i].addr_to_string(outbuf, outbuf_size)) {
-
+
ACE_ERROR((LM_ERROR,
"%p\n",
"addr_to_string"));