summaryrefslogtreecommitdiff
path: root/netsvcs
diff options
context:
space:
mode:
Diffstat (limited to 'netsvcs')
-rw-r--r--netsvcs/clients/Tokens/collection/collection.cpp6
-rw-r--r--netsvcs/clients/Tokens/collection/rw_locks.cpp10
-rw-r--r--netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp6
-rw-r--r--netsvcs/clients/Tokens/manual/manual.cpp4
-rw-r--r--netsvcs/clients/Tokens/mutex/test_mutex.cpp8
-rw-r--r--netsvcs/clients/Tokens/rw_lock/rw_locks.cpp10
-rw-r--r--netsvcs/lib/Client_Logging_Handler.cpp6
-rw-r--r--netsvcs/lib/Name_Handler.cpp2
-rw-r--r--netsvcs/lib/Server_Logging_Handler_T.cpp2
-rw-r--r--netsvcs/lib/TS_Clerk_Handler.cpp6
-rw-r--r--netsvcs/lib/TS_Server_Handler.cpp2
-rw-r--r--netsvcs/lib/Token_Handler.cpp2
12 files changed, 32 insertions, 32 deletions
diff --git a/netsvcs/clients/Tokens/collection/collection.cpp b/netsvcs/clients/Tokens/collection/collection.cpp
index 822240f6a9f..c6d223ed095 100644
--- a/netsvcs/clients/Tokens/collection/collection.cpp
+++ b/netsvcs/clients/Tokens/collection/collection.cpp
@@ -100,18 +100,18 @@ parse_args (int argc, char *argv[])
switch (c)
{
case 'h': // specify the host machine on which the server is running
- server_host = get_opt.optarg;
+ server_host = get_opt.opt_arg ();
remote = 1;
break;
case 'p': // specify the port on which the server is running
- server_port = ACE_OS::atoi (get_opt.optarg);
+ server_port = ACE_OS::atoi (get_opt.opt_arg ());
remote = 1;
break;
case 'd':
debug = 1;
break;
case 'n':
- iterations = ACE_OS::atoi (get_opt.optarg);
+ iterations = ACE_OS::atoi (get_opt.opt_arg ());
break;
case 'u':
// usage: fallthrough
diff --git a/netsvcs/clients/Tokens/collection/rw_locks.cpp b/netsvcs/clients/Tokens/collection/rw_locks.cpp
index e48f0e5db0d..2a64f8d9786 100644
--- a/netsvcs/clients/Tokens/collection/rw_locks.cpp
+++ b/netsvcs/clients/Tokens/collection/rw_locks.cpp
@@ -82,16 +82,16 @@ parse_args (int argc, char *argv[])
switch (c)
{
case 'h': // specify the host machine on which the server is running
- server_host = get_opt.optarg;
+ server_host = get_opt.opt_arg ();
break;
case 'p': // specify the port on which the server is running
- server_port = ACE_OS::atoi (get_opt.optarg);
+ server_port = ACE_OS::atoi (get_opt.opt_arg ());
break;
case 't':
- threads = ACE_OS::atoi (get_opt.optarg);
+ threads = ACE_OS::atoi (get_opt.opt_arg ());
break;
case 'R':
- reads = ACE_OS::atoi (get_opt.optarg);
+ reads = ACE_OS::atoi (get_opt.opt_arg ());
break;
case 'd':
debug = 1;
@@ -103,7 +103,7 @@ parse_args (int argc, char *argv[])
write_sleep = 1;
break;
case 'n':
- iterations = ACE_OS::atoi (get_opt.optarg);
+ iterations = ACE_OS::atoi (get_opt.opt_arg ());
break;
case 'i':
ignore_deadlock = 1;
diff --git a/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp b/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp
index 9b4c12b77e1..46a9daabf80 100644
--- a/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp
+++ b/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp
@@ -184,15 +184,15 @@ parse_args (int argc, char *argv[])
ignore_deadlock = 1;
break;
case 'h':
- server_host = get_opt.optarg;
+ server_host = get_opt.opt_arg ();
remote_mutexes = 1;
break;
case 'p':
- server_port = ACE_OS::atoi (get_opt.optarg);
+ server_port = ACE_OS::atoi (get_opt.opt_arg ());
remote_mutexes = 1;
break;
case 'n':
- iterations = ACE_OS::atoi (get_opt.optarg);
+ iterations = ACE_OS::atoi (get_opt.opt_arg ());
break;
case 'u':
default:
diff --git a/netsvcs/clients/Tokens/manual/manual.cpp b/netsvcs/clients/Tokens/manual/manual.cpp
index 1393150f751..9574fc7edb6 100644
--- a/netsvcs/clients/Tokens/manual/manual.cpp
+++ b/netsvcs/clients/Tokens/manual/manual.cpp
@@ -111,11 +111,11 @@ STDIN_Token::parse_args (int argc, char *argv[])
switch (c)
{
case 'h': // specify the host machine on which the server is running
- server_host_ = get_opt.optarg;
+ server_host_ = get_opt.opt_arg ();
remote_ = 1;
break;
case 'p': // specify the port on which the server is running
- server_port_ = ACE_OS::atoi (get_opt.optarg);
+ server_port_ = ACE_OS::atoi (get_opt.opt_arg ());
remote_ = 1;
break;
case 'd':
diff --git a/netsvcs/clients/Tokens/mutex/test_mutex.cpp b/netsvcs/clients/Tokens/mutex/test_mutex.cpp
index b15243dffba..c291981789d 100644
--- a/netsvcs/clients/Tokens/mutex/test_mutex.cpp
+++ b/netsvcs/clients/Tokens/mutex/test_mutex.cpp
@@ -77,18 +77,18 @@ parse_args (int argc, char *argv[])
switch (c)
{
case 't':
- spawn_count = ACE_OS::atoi (get_opt.optarg);
+ spawn_count = ACE_OS::atoi (get_opt.opt_arg ());
break;
case 'h': // specify the host machine on which the server is running
- server_host = get_opt.optarg;
+ server_host = get_opt.opt_arg ();
remote_mutexes = 1;
break;
case 'p': // specify the port on which the server is running
- server_port = ACE_OS::atoi (get_opt.optarg);
+ server_port = ACE_OS::atoi (get_opt.opt_arg ());
remote_mutexes = 1;
break;
case 'n': // specify the port on which the server is running
- iterations = ACE_OS::atoi (get_opt.optarg);
+ iterations = ACE_OS::atoi (get_opt.opt_arg ());
break;
case 'u':
default:
diff --git a/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp b/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp
index f9d8da9eb9c..098d2bd9d84 100644
--- a/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp
+++ b/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp
@@ -150,21 +150,21 @@ parse_args (int argc, char *argv[])
switch (c)
{
case 'h': // specify the host machine on which the server is running
- server_host = get_opt.optarg;
+ server_host = get_opt.opt_arg ();
remote = 1;
break;
case 'p': // specify the port on which the server is running
- server_port = ACE_OS::atoi (get_opt.optarg);
+ server_port = ACE_OS::atoi (get_opt.opt_arg ());
remote = 1;
break;
case 't':
- threads = ACE_OS::atoi (get_opt.optarg);
+ threads = ACE_OS::atoi (get_opt.opt_arg ());
break;
case 'R':
renew = 1;
break;
case 'r':
- reads = ACE_OS::atoi (get_opt.optarg);
+ reads = ACE_OS::atoi (get_opt.opt_arg ());
break;
case 'd':
debug = 1;
@@ -173,7 +173,7 @@ parse_args (int argc, char *argv[])
write_sleep = 1;
break;
case 'n':
- iterations = ACE_OS::atoi (get_opt.optarg);
+ iterations = ACE_OS::atoi (get_opt.opt_arg ());
break;
case 'i':
ignore_deadlock = 1;
diff --git a/netsvcs/lib/Client_Logging_Handler.cpp b/netsvcs/lib/Client_Logging_Handler.cpp
index 8fe4c6d5fbf..7d3e10b32e7 100644
--- a/netsvcs/lib/Client_Logging_Handler.cpp
+++ b/netsvcs/lib/Client_Logging_Handler.cpp
@@ -500,14 +500,14 @@ ACE_Client_Logging_Acceptor::parse_args (int argc, char *argv[])
{
case 'h':
ACE_OS::free ((void *) this->server_host_);
- this->server_host_ = ACE_OS::strdup (get_opt.optarg);
+ this->server_host_ = ACE_OS::strdup (get_opt.opt_arg ());
break;
case 'k':
ACE_OS::free ((void *) this->logger_key_);
- this->logger_key_ = ACE_OS::strdup (get_opt.optarg);
+ this->logger_key_ = ACE_OS::strdup (get_opt.opt_arg ());
break;
case 'p':
- this->server_port_ = ACE_OS::atoi (get_opt.optarg);
+ this->server_port_ = ACE_OS::atoi (get_opt.opt_arg ());
break;
default:
ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/netsvcs/lib/Name_Handler.cpp b/netsvcs/lib/Name_Handler.cpp
index bfa2eb7c591..8ecbe1659f8 100644
--- a/netsvcs/lib/Name_Handler.cpp
+++ b/netsvcs/lib/Name_Handler.cpp
@@ -52,7 +52,7 @@ ACE_Name_Acceptor::parse_args (int argc, char *argv[])
switch (c)
{
case 'p':
- this->service_port_ = ACE_OS::atoi (get_opt.optarg);
+ this->service_port_ = ACE_OS::atoi (get_opt.opt_arg ());
break;
default:
ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/netsvcs/lib/Server_Logging_Handler_T.cpp b/netsvcs/lib/Server_Logging_Handler_T.cpp
index 994a9426dc2..a4465722891 100644
--- a/netsvcs/lib/Server_Logging_Handler_T.cpp
+++ b/netsvcs/lib/Server_Logging_Handler_T.cpp
@@ -256,7 +256,7 @@ ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::parse_args (int argc, char *argv[]
switch (c)
{
case 'p':
- this->service_port_ = ACE_OS::atoi (get_opt.optarg);
+ this->service_port_ = ACE_OS::atoi (get_opt.opt_arg ());
break;
default:
ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/netsvcs/lib/TS_Clerk_Handler.cpp b/netsvcs/lib/TS_Clerk_Handler.cpp
index 95565887a83..094676c99e2 100644
--- a/netsvcs/lib/TS_Clerk_Handler.cpp
+++ b/netsvcs/lib/TS_Clerk_Handler.cpp
@@ -560,7 +560,7 @@ ACE_TS_Clerk_Processor::parse_args (int argc, char *argv[])
{
case 'h':
// Get the hostname:port and create an ADDR
- server_addr.set (get_opt.optarg);
+ server_addr.set (get_opt.opt_arg ());
// Create a new handler
ACE_NEW_RETURN (handler,
@@ -572,12 +572,12 @@ ACE_TS_Clerk_Processor::parse_args (int argc, char *argv[])
break;
case 't':
// Get the timeout value
- this->timeout_ = ACE_OS::atoi (get_opt.optarg);
+ this->timeout_ = ACE_OS::atoi (get_opt.opt_arg ());
break;
case 'p':
// Get the poolname
ACE_OS::strncpy (this->poolname_,
- ACE_TEXT_CHAR_TO_TCHAR (get_opt.optarg),
+ ACE_TEXT_CHAR_TO_TCHAR (get_opt.opt_arg ()),
sizeof this->poolname_ / sizeof (ACE_TCHAR));
break;
case 'b':
diff --git a/netsvcs/lib/TS_Server_Handler.cpp b/netsvcs/lib/TS_Server_Handler.cpp
index 130afe253bd..9a9fd7e223a 100644
--- a/netsvcs/lib/TS_Server_Handler.cpp
+++ b/netsvcs/lib/TS_Server_Handler.cpp
@@ -51,7 +51,7 @@ ACE_TS_Server_Acceptor::parse_args (int argc, char *argv[])
switch (c)
{
case 'p':
- this->service_port_ = ACE_OS::atoi (get_opt.optarg);
+ this->service_port_ = ACE_OS::atoi (get_opt.opt_arg ());
break;
default:
ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/netsvcs/lib/Token_Handler.cpp b/netsvcs/lib/Token_Handler.cpp
index 0dca06cd4ea..4d420130bfd 100644
--- a/netsvcs/lib/Token_Handler.cpp
+++ b/netsvcs/lib/Token_Handler.cpp
@@ -43,7 +43,7 @@ ACE_Token_Acceptor::parse_args (int argc, char *argv[])
switch (c)
{
case 'p':
- this->service_port_ = ACE_OS::atoi (get_opt.optarg);
+ this->service_port_ = ACE_OS::atoi (get_opt.opt_arg ());
break;
default:
ACE_ERROR_RETURN ((LM_ERROR,
View Lorry Controller Status