You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by sa...@apache.org on 2007/04/03 09:02:25 UTC
svn commit: r525065 - in /webservices/axis2/trunk/c/tools/tcpmon/src:
entry.c session.c util.c
Author: samisa
Date: Tue Apr 3 00:02:25 2007
New Revision: 525065
URL: http://svn.apache.org/viewvc?view=rev&rev=525065
Log:
Fixed build break
Modified:
webservices/axis2/trunk/c/tools/tcpmon/src/entry.c
webservices/axis2/trunk/c/tools/tcpmon/src/session.c
webservices/axis2/trunk/c/tools/tcpmon/src/util.c
Modified: webservices/axis2/trunk/c/tools/tcpmon/src/entry.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/src/entry.c?view=diff&rev=525065&r1=525064&r2=525065
==============================================================================
--- webservices/axis2/trunk/c/tools/tcpmon/src/entry.c (original)
+++ webservices/axis2/trunk/c/tools/tcpmon/src/entry.c Tue Apr 3 00:02:25 2007
@@ -473,8 +473,8 @@
host_socket = axutil_network_handler_open_socket(env, target_host, target_port);
if (-1 == host_socket)
{
- AXIS2_STREAM_WRITE(client_stream, env, NULL, 0);
- AXIS2_STREAM_FREE(client_stream, env);
+ axis2_stream_write(client_stream, env, NULL, 0);
+ axis2_stream_free(client_stream, env);
axutil_network_handler_close_socket(env, client_socket);
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Error in creating host_socket"
"creating socket");
@@ -490,8 +490,8 @@
host_stream = axutil_stream_create_socket(env, host_socket);
if (! host_stream)
{
- AXIS2_STREAM_WRITE(client_stream, env, NULL, 0);
- AXIS2_STREAM_FREE(client_stream, env);
+ axis2_stream_write(client_stream, env, NULL, 0);
+ axis2_stream_free(client_stream, env);
axutil_network_handler_close_socket(env, client_socket);
axutil_network_handler_close_socket(env, host_socket);
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Error in creating host stream"
@@ -505,7 +505,7 @@
return NULL;
}
- AXIS2_STREAM_WRITE(host_stream, env, buffer , buffer_size);
+ axis2_stream_write(host_stream, env, buffer , buffer_size);
AXIS2_FREE(env-> allocator, buffer);
buffer = read_current_stream(host_stream, env, &buffer_size,
@@ -552,11 +552,11 @@
}
- AXIS2_STREAM_WRITE(client_stream, env, buffer, buffer_size);
+ axis2_stream_write(client_stream, env, buffer, buffer_size);
AXIS2_FREE(env-> allocator, buffer);
- AXIS2_STREAM_FREE(client_stream, env);
- AXIS2_STREAM_FREE(host_stream, env);
+ axis2_stream_free(client_stream, env);
+ axis2_stream_free(host_stream, env);
axutil_network_handler_close_socket(env, client_socket);
axutil_network_handler_close_socket(env, host_socket);
@@ -592,7 +592,7 @@
{
buffer = AXIS2_REALLOC(env-> allocator, buffer,
sizeof(axis2_char_t) * (read_size + 1));
- read = AXIS2_STREAM_READ(stream, env , buffer + read_size, 1);
+ read = axis2_stream_read(stream, env , buffer + read_size, 1);
if (header_just_finished)
{
Modified: webservices/axis2/trunk/c/tools/tcpmon/src/session.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/src/session.c?view=diff&rev=525065&r1=525064&r2=525065
==============================================================================
--- webservices/axis2/trunk/c/tools/tcpmon/src/session.c (original)
+++ webservices/axis2/trunk/c/tools/tcpmon/src/session.c Tue Apr 3 00:02:25 2007
@@ -390,7 +390,7 @@
thread_data-> env = env;
session_impl-> is_running = AXIS2_TRUE;
- server_thread = AXIS2_THREAD_POOL_GET_THREAD(env->thread_pool,
+ server_thread = axutil_thread_pool_get_thread(env->thread_pool,
server_funct, (void*)thread_data);
if (! server_thread)
{
@@ -403,7 +403,7 @@
}
}
- AXIS2_THREAD_POOL_THREAD_DETACH(env->thread_pool, server_thread);
+ axutil_thread_pool_thread_detach(env->thread_pool, server_thread);
return AXIS2_SUCCESS;
}
@@ -506,7 +506,7 @@
request_thread_data-> socket = socket;
request_thread_data-> session = (tcpmon_session_t*)session_impl;
- request_thread = AXIS2_THREAD_POOL_GET_THREAD(env->thread_pool,
+ request_thread = axutil_thread_pool_get_thread(env->thread_pool,
tcpmon_entry_new_entry_funct,
(void*)request_thread_data);
if (! request_thread)
@@ -521,7 +521,7 @@
break;
}
- AXIS2_THREAD_POOL_THREAD_DETACH(env->thread_pool, request_thread);
+ axutil_thread_pool_thread_detach(env->thread_pool, request_thread);
}
axutil_network_handler_close_socket(env, listen_socket);
Modified: webservices/axis2/trunk/c/tools/tcpmon/src/util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/src/util.c?view=diff&rev=525065&r1=525064&r2=525065
==============================================================================
--- webservices/axis2/trunk/c/tools/tcpmon/src/util.c (original)
+++ webservices/axis2/trunk/c/tools/tcpmon/src/util.c Tue Apr 3 00:02:25 2007
@@ -79,7 +79,7 @@
axiom_xml_reader_init ();
- while ((c = AXIOM_XML_READER_NEXT (xml_reader, env)) != -1)
+ while ((c = axiom_xml_reader_next (xml_reader, env)) != -1)
{
switch (c)
{
@@ -90,28 +90,28 @@
tcpmon_strcat(out, "<?xml ", &buffer_size, env);
- ix = AXIOM_XML_READER_GET_ATTRIBUTE_COUNT (xml_reader, env);
+ ix = axiom_xml_reader_get_attribute_count (xml_reader, env);
for (; ix > 0; ix--)
{
axis2_char_t *attr_prefix;
axis2_char_t *attr_name;
axis2_char_t *attr_value;
- attr_prefix = (axis2_char_t *)AXIOM_XML_READER_GET_ATTRIBUTE_PREFIX_BY_NUMBER (xml_reader, env, ix);
+ attr_prefix = (axis2_char_t *)axiom_xml_reader_get_attribute_prefix_by_number (xml_reader, env, ix);
if (attr_prefix)
{
tcpmon_strcat(out, attr_prefix, &buffer_size, env);
tcpmon_strcat(out, ":", &buffer_size, env);
}
- attr_name = (axis2_char_t *)AXIOM_XML_READER_GET_ATTRIBUTE_NAME_BY_NUMBER (xml_reader, env, ix);
+ attr_name = (axis2_char_t *)axiom_xml_reader_get_attribute_name_by_number (xml_reader, env, ix);
if (attr_name)
{
tcpmon_strcat(out, attr_name, &buffer_size, env);
tcpmon_strcat(out, "=\"", &buffer_size, env);
}
- attr_value = (axis2_char_t *)AXIOM_XML_READER_GET_ATTRIBUTE_VALUE_BY_NUMBER (xml_reader, env, ix);
+ attr_value = (axis2_char_t *)axiom_xml_reader_get_attribute_value_by_number (xml_reader, env, ix);
if (attr_value)
{
tcpmon_strcat(out, attr_value, &buffer_size, env);
@@ -142,27 +142,27 @@
tcpmon_strcat(out, "<", &buffer_size, env);
- ele_prefix =(axis2_char_t *)AXIOM_XML_READER_GET_PREFIX (xml_reader, env);
+ ele_prefix =(axis2_char_t *)axiom_xml_reader_get_prefix (xml_reader, env);
if (ele_prefix)
{
tcpmon_strcat(out, ele_prefix, &buffer_size, env);
tcpmon_strcat(out, ":", &buffer_size, env);
}
- ele_name = (axis2_char_t *) AXIOM_XML_READER_GET_NAME (xml_reader, env);
+ ele_name = (axis2_char_t *) axiom_xml_reader_get_name (xml_reader, env);
if (ele_name)
{
tcpmon_strcat(out, ele_name, &buffer_size, env);
}
- ix = AXIOM_XML_READER_GET_ATTRIBUTE_COUNT (xml_reader, env);
+ ix = axiom_xml_reader_get_attribute_count (xml_reader, env);
for (; ix > 0; ix--)
{
axis2_char_t *attr_prefix;
axis2_char_t *attr_name;
axis2_char_t *attr_value;
- attr_prefix = (axis2_char_t *)AXIOM_XML_READER_GET_ATTRIBUTE_PREFIX_BY_NUMBER (xml_reader, env, ix);
+ attr_prefix = (axis2_char_t *)axiom_xml_reader_get_attribute_prefix_by_number (xml_reader, env, ix);
if (attr_prefix)
{
has_prefix = 1;
@@ -171,7 +171,7 @@
tcpmon_strcat(out, ":", &buffer_size, env);
}
- attr_name = (axis2_char_t *)AXIOM_XML_READER_GET_ATTRIBUTE_NAME_BY_NUMBER (xml_reader, env, ix);
+ attr_name = (axis2_char_t *)axiom_xml_reader_get_attribute_name_by_number (xml_reader, env, ix);
if (attr_name)
{
if(has_prefix)
@@ -189,7 +189,7 @@
has_prefix = 0;
}
- attr_value = (axis2_char_t *)AXIOM_XML_READER_GET_ATTRIBUTE_VALUE_BY_NUMBER (xml_reader, env, ix);
+ attr_value = (axis2_char_t *)axiom_xml_reader_get_attribute_value_by_number (xml_reader, env, ix);
if (attr_value)
{
tcpmon_strcat(out, attr_value, &buffer_size, env);
@@ -209,7 +209,7 @@
prev_case = CHAR_VALUE;
- ele_value = AXIOM_XML_READER_GET_VALUE (xml_reader, env);
+ ele_value = axiom_xml_reader_get_value (xml_reader, env);
if (ele_value)
tcpmon_strcat(out, ele_value, &buffer_size, env);
@@ -237,25 +237,25 @@
tcpmon_strcat(out, "<", &buffer_size, env);
- ele_prefix = (axis2_char_t *) AXIOM_XML_READER_GET_PREFIX (xml_reader, env);
+ ele_prefix = (axis2_char_t *) axiom_xml_reader_get_prefix (xml_reader, env);
if (ele_prefix)
{
tcpmon_strcat(out, ele_prefix, &buffer_size, env);
tcpmon_strcat(out, ":", &buffer_size, env);
}
- ele_name = (axis2_char_t *) AXIOM_XML_READER_GET_NAME (xml_reader, env);
+ ele_name = (axis2_char_t *) axiom_xml_reader_get_name (xml_reader, env);
if (ele_name)
tcpmon_strcat(out, ele_name, &buffer_size, env);
- ix = AXIOM_XML_READER_GET_ATTRIBUTE_COUNT (xml_reader, env);
+ ix = axiom_xml_reader_get_attribute_count (xml_reader, env);
for (; ix > 0; ix--)
{
axis2_char_t *attr_prefix;
axis2_char_t *attr_name;
axis2_char_t *attr_value;
- attr_prefix = (axis2_char_t *)AXIOM_XML_READER_GET_ATTRIBUTE_PREFIX_BY_NUMBER (xml_reader, env, ix);
+ attr_prefix = (axis2_char_t *)axiom_xml_reader_get_attribute_prefix_by_number (xml_reader, env, ix);
if (attr_prefix)
{
has_prefix = 1;
@@ -264,7 +264,7 @@
tcpmon_strcat(out, ":", &buffer_size, env);
}
- attr_name = (axis2_char_t *)AXIOM_XML_READER_GET_ATTRIBUTE_NAME_BY_NUMBER (xml_reader, env, ix);
+ attr_name = (axis2_char_t *)axiom_xml_reader_get_attribute_name_by_number (xml_reader, env, ix);
if (attr_name)
{
if(has_prefix)
@@ -281,7 +281,7 @@
has_prefix = 0;
}
- attr_value = (axis2_char_t *)AXIOM_XML_READER_GET_ATTRIBUTE_VALUE_BY_NUMBER (xml_reader, env, ix);
+ attr_value = (axis2_char_t *)axiom_xml_reader_get_attribute_value_by_number (xml_reader, env, ix);
if (attr_value)
{
tcpmon_strcat(out, attr_value, &buffer_size, env);
@@ -313,14 +313,14 @@
tcpmon_strcat(out, "</", &buffer_size, env);
- ele_prefix = (axis2_char_t *) AXIOM_XML_READER_GET_PREFIX (xml_reader, env);
+ ele_prefix = (axis2_char_t *) axiom_xml_reader_get_prefix (xml_reader, env);
if (ele_prefix)
{
tcpmon_strcat(out, ele_prefix, &buffer_size, env);
tcpmon_strcat(out, ":", &buffer_size, env);
}
- ele_name = (axis2_char_t *) AXIOM_XML_READER_GET_NAME (xml_reader, env);
+ ele_name = (axis2_char_t *) axiom_xml_reader_get_name (xml_reader, env);
if (ele_name)
{
tcpmon_strcat(out, ele_name, &buffer_size, env);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org