summaryrefslogtreecommitdiff
path: root/ace/Remote_Name_Space.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'ace/Remote_Name_Space.cpp')
-rw-r--r--ace/Remote_Name_Space.cpp71
1 files changed, 36 insertions, 35 deletions
diff --git a/ace/Remote_Name_Space.cpp b/ace/Remote_Name_Space.cpp
index e33702af313..cbd886b0d13 100644
--- a/ace/Remote_Name_Space.cpp
+++ b/ace/Remote_Name_Space.cpp
@@ -7,11 +7,11 @@
ACE_RCSID(ace, Remote_Name_Space, "$Id$")
int
-ACE_Remote_Name_Space::open (const ASYS_TCHAR *servername, u_short port)
+ACE_Remote_Name_Space::open (const char *servername, u_short port)
{
ACE_TRACE ("ACE_Remote_Name_Space::open");
ACE_INET_Addr servaddr;
-
+
// Initialize Addr
if (servaddr.set (port, servername) == -1)
return -1;
@@ -19,7 +19,7 @@ ACE_Remote_Name_Space::open (const ASYS_TCHAR *servername, u_short port)
// Connect to Name Server process.
if (this->ns_proxy_.open (servaddr) == -1)
return -1;
-
+
return 0;
}
@@ -28,7 +28,7 @@ ACE_Remote_Name_Space::ACE_Remote_Name_Space (void)
ACE_TRACE ("ACE_Remote_Name_Space::ACE_Remote_Name_Space");
}
-ACE_Remote_Name_Space::ACE_Remote_Name_Space (const ASYS_TCHAR *hostname,
+ACE_Remote_Name_Space::ACE_Remote_Name_Space (const char *hostname,
u_short port)
{
ACE_TRACE ("ACE_Remote_Name_Space::ACE_Remote_Name_Space");
@@ -36,9 +36,9 @@ ACE_Remote_Name_Space::ACE_Remote_Name_Space (const ASYS_TCHAR *hostname,
ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_Remote_Name_Space::ACE_Remote_Name_Space")));
}
-int
-ACE_Remote_Name_Space::bind (const ACE_WString &name,
- const ACE_WString &value,
+int
+ACE_Remote_Name_Space::bind (const ACE_WString &name,
+ const ACE_WString &value,
const char *type)
{
ACE_TRACE ("ACE_Remote_Name_Space::bind");
@@ -47,14 +47,14 @@ ACE_Remote_Name_Space::bind (const ACE_WString &name,
name.length () * sizeof (ACE_USHORT16),
value.fast_rep (),
value.length () * sizeof (ACE_USHORT16),
- type,
+ type,
ACE_OS::strlen (type));
return this->ns_proxy_.request_reply (request);
}
-int
-ACE_Remote_Name_Space::rebind (const ACE_WString &name,
- const ACE_WString &value,
+int
+ACE_Remote_Name_Space::rebind (const ACE_WString &name,
+ const ACE_WString &value,
const char *type)
{
ACE_TRACE ("ACE_Remote_Name_Space::rebind");
@@ -63,14 +63,14 @@ ACE_Remote_Name_Space::rebind (const ACE_WString &name,
name.length () * sizeof (ACE_USHORT16),
value.fast_rep (),
value.length () * sizeof (ACE_USHORT16),
- type,
+ type,
ACE_OS::strlen (type));
return this->ns_proxy_.request_reply (request);
}
-int
-ACE_Remote_Name_Space::resolve (const ACE_WString &name,
- ACE_WString &value,
+int
+ACE_Remote_Name_Space::resolve (const ACE_WString &name,
+ ACE_WString &value,
char *&type)
{
ACE_TRACE ("ACE_Remote_Name_Space::resolve");
@@ -89,14 +89,14 @@ ACE_Remote_Name_Space::resolve (const ACE_WString &name,
ACE_WString temp (reply.value (), reply.value_len () / sizeof (ACE_USHORT16));
value = temp;
- ACE_NEW_RETURN (type,
+ ACE_NEW_RETURN (type,
char[reply.type_len () + 1],
-1);
ACE_OS::strcpy (type, reply.type ());
return 0;
}
-int
+int
ACE_Remote_Name_Space::unbind (const ACE_WString &name)
{
ACE_TRACE ("ACE_Remote_Name_Space::unbind");
@@ -107,8 +107,8 @@ ACE_Remote_Name_Space::unbind (const ACE_WString &name)
return this->ns_proxy_.request_reply (request);
}
-int
-ACE_Remote_Name_Space::list_names (ACE_WSTRING_SET &set,
+int
+ACE_Remote_Name_Space::list_names (ACE_WSTRING_SET &set,
const ACE_WString &pattern)
{
ACE_TRACE ("ACE_Remote_Name_Space::list_names");
@@ -118,7 +118,7 @@ ACE_Remote_Name_Space::list_names (ACE_WSTRING_SET &set,
0, 0, 0, 0);
if (this->ns_proxy_.send_request (request) == -1)
return -1;
-
+
ACE_Name_Request reply (0, 0, 0, 0, 0, 0, 0, 0);
while (reply.msg_type () != ACE_Name_Request::MAX_ENUM)
@@ -138,8 +138,8 @@ ACE_Remote_Name_Space::list_names (ACE_WSTRING_SET &set,
return 0;
}
-int
-ACE_Remote_Name_Space::list_values (ACE_WSTRING_SET &set,
+int
+ACE_Remote_Name_Space::list_values (ACE_WSTRING_SET &set,
const ACE_WString &pattern)
{
ACE_TRACE ("ACE_Remote_Name_Space::list_values");
@@ -149,7 +149,7 @@ ACE_Remote_Name_Space::list_values (ACE_WSTRING_SET &set,
0, 0, 0, 0);
if (this->ns_proxy_.send_request (request) == -1)
return -1;
-
+
ACE_Name_Request reply (0, 0, 0, 0, 0, 0, 0, 0);
while (reply.msg_type () != ACE_Name_Request::MAX_ENUM)
@@ -170,8 +170,8 @@ ACE_Remote_Name_Space::list_values (ACE_WSTRING_SET &set,
return 0;
}
-int
-ACE_Remote_Name_Space::list_types (ACE_WSTRING_SET &set,
+int
+ACE_Remote_Name_Space::list_types (ACE_WSTRING_SET &set,
const ACE_WString &pattern)
{
ACE_TRACE ("ACE_Remote_Name_Space::list_types");
@@ -182,7 +182,7 @@ ACE_Remote_Name_Space::list_types (ACE_WSTRING_SET &set,
if (this->ns_proxy_.send_request (request) == -1)
return -1;
-
+
ACE_Name_Request reply (0, 0, 0, 0, 0, 0, 0, 0);
while (reply.msg_type () != ACE_Name_Request::MAX_ENUM)
@@ -202,8 +202,8 @@ ACE_Remote_Name_Space::list_types (ACE_WSTRING_SET &set,
return 0;
}
-int
-ACE_Remote_Name_Space::list_name_entries (ACE_BINDING_SET &set,
+int
+ACE_Remote_Name_Space::list_name_entries (ACE_BINDING_SET &set,
const ACE_WString &pattern)
{
ACE_TRACE ("ACE_Remote_Name_Space::list_names");
@@ -214,7 +214,7 @@ ACE_Remote_Name_Space::list_name_entries (ACE_BINDING_SET &set,
if (this->ns_proxy_.send_request (request) == -1)
return -1;
-
+
ACE_Name_Request reply (0, 0, 0, 0, 0, 0, 0, 0);
while (reply.msg_type () != ACE_Name_Request::MAX_ENUM)
@@ -240,8 +240,8 @@ ACE_Remote_Name_Space::list_name_entries (ACE_BINDING_SET &set,
return 0;
}
-int
-ACE_Remote_Name_Space::list_value_entries (ACE_BINDING_SET &set,
+int
+ACE_Remote_Name_Space::list_value_entries (ACE_BINDING_SET &set,
const ACE_WString &pattern)
{
ACE_TRACE ("ACE_Remote_Name_Space::list_values");
@@ -252,7 +252,7 @@ ACE_Remote_Name_Space::list_value_entries (ACE_BINDING_SET &set,
if (this->ns_proxy_.send_request (request) == -1)
return -1;
-
+
ACE_Name_Request reply (0, 0, 0, 0, 0, 0, 0, 0);
while (reply.msg_type () != ACE_Name_Request::MAX_ENUM)
@@ -278,8 +278,8 @@ ACE_Remote_Name_Space::list_value_entries (ACE_BINDING_SET &set,
return 0;
}
-int
-ACE_Remote_Name_Space::list_type_entries (ACE_BINDING_SET &set,
+int
+ACE_Remote_Name_Space::list_type_entries (ACE_BINDING_SET &set,
const ACE_WString &pattern)
{
ACE_TRACE ("ACE_Remote_Name_Space::list_types");
@@ -290,7 +290,7 @@ ACE_Remote_Name_Space::list_type_entries (ACE_BINDING_SET &set,
if (this->ns_proxy_.send_request (request) == -1)
return -1;
-
+
ACE_Name_Request reply (0, 0, 0, 0, 0, 0, 0, 0);
while (reply.msg_type () != ACE_Name_Request::MAX_ENUM)
@@ -330,3 +330,4 @@ ACE_Remote_Name_Space::dump (void) const
this->ns_proxy_.dump ();
ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
}
+
View Lorry Controller Status