summaryrefslogtreecommitdiff
path: root/apps/Gateway/Peer/Options.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'apps/Gateway/Peer/Options.cpp')
-rw-r--r--apps/Gateway/Peer/Options.cpp26
1 files changed, 12 insertions, 14 deletions
diff --git a/apps/Gateway/Peer/Options.cpp b/apps/Gateway/Peer/Options.cpp
index 0b33552e629..b1b057f33ca 100644
--- a/apps/Gateway/Peer/Options.cpp
+++ b/apps/Gateway/Peer/Options.cpp
@@ -19,7 +19,7 @@ void
Options::print_usage_and_die (void)
{
ACE_DEBUG ((LM_DEBUG,
- ACE_TEXT ("%n [-a {C|S}:acceptor-port] [-c {C|S}:connector-port] [-C connection-id] [-h gateway-host] [-q max-queue-size] [-t timeout] [-v]\n")));
+ "%n [-a {C|S}:acceptor-port] [-c {C|S}:connector-port] [-C connection-id] [-h gateway-host] [-q max-queue-size] [-t timeout] [-v]\n"));
ACE_OS::exit (1);
}
@@ -93,7 +93,7 @@ Options::supplier_connector_port (void) const
return this->supplier_connector_port_;
}
-const ACE_TCHAR *
+const char *
Options::connector_host (void) const
{
return this->connector_host_;
@@ -106,9 +106,9 @@ Options::enabled (int option) const
}
void
-Options::parse_args (int argc, ACE_TCHAR *argv[])
+Options::parse_args (int argc, char *argv[])
{
- ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("a:c:C:h:m:t:v"), 0);
+ ACE_Get_Opt get_opt (argc, argv, "a:c:C:h:m:t:v", 0);
for (int c; (c = get_opt ()) != -1; )
{
@@ -118,11 +118,10 @@ Options::parse_args (int argc, ACE_TCHAR *argv[])
{
// Become an Acceptor.
- for (ACE_TCHAR *flag = ACE_OS::strtok (get_opt.opt_arg (),
- ACE_TEXT ("|"));
+ for (char *flag = ACE_OS::strtok (get_opt.opt_arg (), "|");
flag != 0;
- flag = ACE_OS::strtok (0, ACE_TEXT ("|")))
- if (ACE_OS::strncasecmp (flag, ACE_TEXT ("C"), 1) == 0)
+ flag = ACE_OS::strtok (0, "|"))
+ if (ACE_OS::strncasecmp (flag, "C", 1) == 0)
{
ACE_SET_BITS (this->options_,
Options::CONSUMER_ACCEPTOR);
@@ -130,7 +129,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[])
// Set the Consumer Acceptor port number.
this->consumer_acceptor_port_ = ACE_OS::atoi (flag + 2);
}
- else if (ACE_OS::strncasecmp (flag, ACE_TEXT ("S"), 1) == 0)
+ else if (ACE_OS::strncasecmp (flag, "S", 1) == 0)
{
ACE_SET_BITS (this->options_,
Options::SUPPLIER_ACCEPTOR);
@@ -145,11 +144,10 @@ Options::parse_args (int argc, ACE_TCHAR *argv[])
{
// Become a Connector.
- for (ACE_TCHAR *flag = ACE_OS::strtok (get_opt.opt_arg (),
- ACE_TEXT ("|"));
+ for (char *flag = ACE_OS::strtok (get_opt.opt_arg (), "|");
flag != 0;
- flag = ACE_OS::strtok (0, ACE_TEXT ("|")))
- if (ACE_OS::strncasecmp (flag, ACE_TEXT ("C"), 1) == 0)
+ flag = ACE_OS::strtok (0, "|"))
+ if (ACE_OS::strncasecmp (flag, "C", 1) == 0)
{
ACE_SET_BITS (this->options_,
Options::CONSUMER_CONNECTOR);
@@ -157,7 +155,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[])
// Set the Consumer Connector port number.
this->consumer_connector_port_ = ACE_OS::atoi (flag + 2);
}
- else if (ACE_OS::strncasecmp (flag, ACE_TEXT ("S"), 1) == 0)
+ else if (ACE_OS::strncasecmp (flag, "S", 1) == 0)
{
ACE_SET_BITS (this->options_,
Options::SUPPLIER_CONNECTOR);