You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by da...@apache.org on 2006/06/15 13:11:10 UTC
svn commit: r414557 [2/3] - in /webservices/axis2/trunk/c: axiom/include/
axiom/src/attachments/ axiom/src/om/ axiom/src/parser/guththila/
axiom/src/parser/libxml2/ axiom/src/soap/ axiom/test/om/ axiom/test/soap/
include/ modules/core/clientapi/ module...
Modified: webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c?rev=414557&r1=414556&r2=414557&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c Thu Jun 15 04:11:07 2006
@@ -20,7 +20,7 @@
#include <axiom_processing_instruction.h>
#include <axiom_comment.h>
#include <axis2_string.h>
-#include <axis2_xml_writer.h>
+#include <axiom_writer.h>
#include <axiom_doctype.h>
#include "axiom_node_internal.h"
#include "axiom_stax_builder_internal.h"
@@ -56,7 +56,7 @@
{
axiom_stax_builder_t om_stax_builder;
/** pull parser instance used by the builder */
- axis2_xml_reader_t *parser;
+ axiom_reader_t *parser;
/** last node the builder found */
axiom_node_t *lastnode;
@@ -85,7 +85,7 @@
AXIS2_EXTERN axiom_stax_builder_t * AXIS2_CALL
axiom_stax_builder_create (const axis2_env_t *env,
- axis2_xml_reader_t *parser)
+ axiom_reader_t *parser)
{
axiom_stax_builder_impl_t *builder = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -125,7 +125,7 @@
if (!builder->om_stax_builder.ops)
{
- AXIS2_XML_READER_FREE (builder->parser, env);
+ AXIOM_READER_FREE (builder->parser, env);
AXIS2_FREE (env->allocator, builder);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -175,16 +175,16 @@
builder_impl = AXIS2_INTF_TO_IMPL(om_builder);
- attribute_count = AXIS2_XML_READER_GET_ATTRIBUTE_COUNT(
+ attribute_count = AXIOM_READER_GET_ATTRIBUTE_COUNT(
builder_impl->parser,env);
for (i=1; i <= attribute_count ; i++)
{
axiom_element_t *temp_ele = NULL;
- uri = AXIS2_XML_READER_GET_ATTRIBUTE_NAMESPACE_BY_NUMBER(
+ uri = AXIOM_READER_GET_ATTRIBUTE_NAMESPACE_BY_NUMBER(
builder_impl->parser, env, i);
- prefix = AXIS2_XML_READER_GET_ATTRIBUTE_PREFIX_BY_NUMBER(
+ prefix = AXIOM_READER_GET_ATTRIBUTE_PREFIX_BY_NUMBER(
builder_impl->parser, env, i);
if (uri)
{
@@ -206,10 +206,10 @@
}
}
- attr_name = AXIS2_XML_READER_GET_ATTRIBUTE_NAME_BY_NUMBER(
+ attr_name = AXIOM_READER_GET_ATTRIBUTE_NAME_BY_NUMBER(
builder_impl->parser, env, i);
- attr_value = AXIS2_XML_READER_GET_ATTRIBUTE_VALUE_BY_NUMBER(
+ attr_value = AXIOM_READER_GET_ATTRIBUTE_VALUE_BY_NUMBER(
builder_impl->parser, env, i);
if(NULL != attr_name)
{
@@ -224,13 +224,13 @@
}
}
if(uri)
- AXIS2_XML_READER_XML_FREE(builder_impl->parser, env, uri);
+ AXIOM_READER_XML_FREE(builder_impl->parser, env, uri);
if(prefix)
- AXIS2_XML_READER_XML_FREE(builder_impl->parser, env, prefix);
+ AXIOM_READER_XML_FREE(builder_impl->parser, env, prefix);
if(attr_name)
- AXIS2_XML_READER_XML_FREE(builder_impl->parser, env, attr_name);
+ AXIOM_READER_XML_FREE(builder_impl->parser, env, attr_name);
if(attr_value)
- AXIS2_XML_READER_XML_FREE(builder_impl->parser, env, attr_value);
+ AXIOM_READER_XML_FREE(builder_impl->parser, env, attr_value);
ns = NULL;
}
@@ -255,7 +255,7 @@
AXIS2_ERROR_INVALID_BUILDER_STATE_LAST_NODE_NULL, AXIS2_FAILURE);
return NULL;
}
- temp_value = AXIS2_XML_READER_GET_VALUE (builder->parser, env);
+ temp_value = AXIOM_READER_GET_VALUE (builder->parser, env);
if (!temp_value)
{
@@ -278,7 +278,7 @@
axiom_node_set_complete(node , env, AXIS2_TRUE);
builder->lastnode = node;
- AXIS2_XML_READER_XML_FREE(builder->parser , env, temp_value);
+ AXIOM_READER_XML_FREE(builder->parser , env, temp_value);
return node;
}
@@ -309,8 +309,8 @@
builder->cache = AXIS2_FALSE;
do
{
- while (AXIS2_XML_READER_NEXT (builder->parser, env)
- != AXIS2_XML_READER_END_ELEMENT);
+ while (AXIOM_READER_NEXT (builder->parser, env)
+ != AXIOM_READER_END_ELEMENT);
}
while (!(AXIOM_NODE_IS_COMPLETE(element, env)));
@@ -356,13 +356,13 @@
builder = AXIS2_INTF_TO_IMPL(om_stax_builder);
- namespace_count = AXIS2_XML_READER_GET_NAMESPACE_COUNT (builder->parser, env);
+ namespace_count = AXIOM_READER_GET_NAMESPACE_COUNT (builder->parser, env);
for (i = 1; i <= namespace_count; i++)
{
- temp_ns_prefix = AXIS2_XML_READER_GET_NAMESPACE_PREFIX_BY_NUMBER(
+ temp_ns_prefix = AXIOM_READER_GET_NAMESPACE_PREFIX_BY_NUMBER(
builder->parser, env, i);
- temp_ns_uri = AXIS2_XML_READER_GET_NAMESPACE_URI_BY_NUMBER(
+ temp_ns_uri = AXIOM_READER_GET_NAMESPACE_URI_BY_NUMBER(
builder->parser, env , i);
if(!temp_ns_prefix || AXIS2_STRCMP(temp_ns_prefix,"xmlns") == 0)
@@ -406,8 +406,8 @@
env, temp_ns_uri,temp_ns_prefix);
*/
}
- AXIS2_XML_READER_XML_FREE(builder->parser, env, temp_ns_prefix);
- AXIS2_XML_READER_XML_FREE(builder->parser, env, temp_ns_uri);
+ AXIOM_READER_XML_FREE(builder->parser, env, temp_ns_prefix);
+ AXIOM_READER_XML_FREE(builder->parser, env, temp_ns_uri);
if (!om_ns)
{
/* something went wrong */
@@ -415,7 +415,7 @@
}
}
/* set own namespace */
- temp_prefix = AXIS2_XML_READER_GET_PREFIX ( builder->parser, env);
+ temp_prefix = AXIOM_READER_GET_PREFIX ( builder->parser, env);
if (temp_prefix)
{
om_ns = AXIOM_ELEMENT_FIND_NAMESPACE (
@@ -437,7 +437,7 @@
}
}
if(temp_prefix)
- AXIS2_XML_READER_XML_FREE(builder->parser, env, temp_prefix);
+ AXIOM_READER_XML_FREE(builder->parser, env, temp_prefix);
return status;
}
@@ -456,7 +456,7 @@
builder_impl = AXIS2_INTF_TO_IMPL(om_stax_builder);
- temp_localname = AXIS2_XML_READER_GET_NAME (builder_impl->parser, env);
+ temp_localname = AXIOM_READER_GET_NAME (builder_impl->parser, env);
if (!temp_localname)
{
@@ -514,7 +514,7 @@
}
}
if(temp_localname)
- AXIS2_XML_READER_XML_FREE(builder_impl->parser , env, temp_localname);
+ AXIOM_READER_XML_FREE(builder_impl->parser , env, temp_localname);
/** order of processing namespaces first is important */
axiom_stax_builder_process_namespaces ( om_stax_builder, env, element_node, 0);
@@ -536,7 +536,7 @@
AXIS2_ENV_CHECK(env, NULL);
builder_impl = AXIS2_INTF_TO_IMPL(builder);
- comment_value = AXIS2_XML_READER_GET_VALUE(builder_impl->parser, env);
+ comment_value = AXIOM_READER_GET_VALUE(builder_impl->parser, env);
if (!comment_value)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_XML_READER_ELEMENT_NULL, AXIS2_FAILURE);
@@ -546,7 +546,7 @@
if (!(builder_impl->lastnode))
{
/* do nothing */
- AXIS2_XML_READER_XML_FREE(builder_impl->parser , env, comment_value);
+ AXIOM_READER_XML_FREE(builder_impl->parser , env, comment_value);
return NULL;
}
else if (AXIOM_NODE_IS_COMPLETE(builder_impl->lastnode, env))
@@ -569,7 +569,7 @@
builder_impl->element_level++;
- AXIS2_XML_READER_XML_FREE(builder_impl->parser , env, comment_value);
+ AXIOM_READER_XML_FREE(builder_impl->parser , env, comment_value);
builder_impl->lastnode = comment_node;
@@ -589,7 +589,7 @@
AXIS2_ENV_CHECK(env, NULL);
builder_impl = AXIS2_INTF_TO_IMPL(builder);
- doc_value = AXIS2_XML_READER_GET_DTD(builder_impl->parser, env);
+ doc_value = AXIOM_READER_GET_DTD(builder_impl->parser, env);
if(!doc_value)
return NULL;
if(!(builder_impl->lastnode))
@@ -602,7 +602,7 @@
}
}
builder_impl->lastnode = doctype_node;
- AXIS2_XML_READER_XML_FREE(builder_impl->parser, env, doc_value);
+ AXIOM_READER_XML_FREE(builder_impl->parser, env, doc_value);
return doctype_node;
}
@@ -621,8 +621,8 @@
- target = AXIS2_XML_READER_GET_PI_TARGET (builder_impl->parser, env);
- value = AXIS2_XML_READER_GET_PI_DATA(builder_impl->parser, env);
+ target = AXIOM_READER_GET_PI_TARGET (builder_impl->parser, env);
+ value = AXIOM_READER_GET_PI_DATA(builder_impl->parser, env);
if (!target)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_XML_READER_ELEMENT_NULL, AXIS2_FAILURE);
@@ -631,8 +631,8 @@
if (!(builder_impl->lastnode))
{
/* do nothing */
- AXIS2_XML_READER_XML_FREE(builder_impl->parser , env, target);
- AXIS2_XML_READER_XML_FREE(builder_impl->parser , env, value);
+ AXIOM_READER_XML_FREE(builder_impl->parser , env, target);
+ AXIOM_READER_XML_FREE(builder_impl->parser , env, value);
return NULL;
}
else if (AXIOM_NODE_IS_COMPLETE(builder_impl->lastnode, env) ||
@@ -656,9 +656,9 @@
builder_impl->element_level++;
if(target)
- AXIS2_XML_READER_XML_FREE(builder_impl->parser , env, target);
+ AXIOM_READER_XML_FREE(builder_impl->parser , env, target);
if(value)
- AXIS2_XML_READER_XML_FREE(builder_impl->parser , env, value);
+ AXIOM_READER_XML_FREE(builder_impl->parser , env, value);
builder_impl->lastnode = pi_node;
return pi_node;
@@ -724,7 +724,7 @@
return NULL;
}
- token = AXIS2_XML_READER_NEXT (builder_impl->parser, env);
+ token = AXIOM_READER_NEXT (builder_impl->parser, env);
if(token == -1)
return NULL;
@@ -738,43 +738,43 @@
switch (token)
{
- case AXIS2_XML_READER_START_DOCUMENT:
+ case AXIOM_READER_START_DOCUMENT:
/*Do nothing */
break;
- case AXIS2_XML_READER_START_ELEMENT:
+ case AXIOM_READER_START_ELEMENT:
node = axiom_stax_builder_create_om_element (
om_stax_builder, env);
break;
- case AXIS2_XML_READER_EMPTY_ELEMENT:
+ case AXIOM_READER_EMPTY_ELEMENT:
node = axiom_stax_builder_create_om_element (
om_stax_builder, env);
- case AXIS2_XML_READER_END_ELEMENT:
+ case AXIOM_READER_END_ELEMENT:
axiom_stax_builder_end_element (om_stax_builder, env);
break;
- case AXIS2_XML_READER_SPACE:
+ case AXIOM_READER_SPACE:
/* Do nothing */
break;
- case AXIS2_XML_READER_CHARACTER:
+ case AXIOM_READER_CHARACTER:
node = axiom_stax_builder_create_om_text(om_stax_builder, env);
break;
- case AXIS2_XML_READER_ENTITY_REFERENCE:
+ case AXIOM_READER_ENTITY_REFERENCE:
break;
- case AXIS2_XML_READER_COMMENT:
+ case AXIOM_READER_COMMENT:
node = axiom_stax_builder_create_om_comment(om_stax_builder, env);
axiom_stax_builder_end_element (om_stax_builder, env);
break;
- case AXIS2_XML_READER_PROCESSING_INSTRUCTION:
+ case AXIOM_READER_PROCESSING_INSTRUCTION:
node = axiom_stax_builder_create_om_processing_instruction(
om_stax_builder , env );
@@ -782,10 +782,10 @@
break;
- case AXIS2_XML_READER_CDATA:
+ case AXIOM_READER_CDATA:
break;
- case AXIS2_XML_READER_DOCUMENT_TYPE:
+ case AXIOM_READER_DOCUMENT_TYPE:
/* node = axiom_stax_builder_create_om_doctype(om_stax_builder, env);
*/
break;
@@ -812,7 +812,7 @@
if(builder_impl->parser)
{
- AXIS2_XML_READER_FREE(builder_impl->parser, env);
+ AXIOM_READER_FREE(builder_impl->parser, env);
builder_impl->parser = NULL;
}
if(builder_impl->document)
@@ -947,7 +947,7 @@
if(!builder_impl->parser) return -1;
- token = AXIS2_XML_READER_NEXT (builder_impl->parser, env);
+ token = AXIOM_READER_NEXT (builder_impl->parser, env);
if(token == -1)
{
@@ -961,11 +961,11 @@
}
switch (token)
{
- case AXIS2_XML_READER_START_DOCUMENT:
+ case AXIOM_READER_START_DOCUMENT:
/*Do nothing */
break;
- case AXIS2_XML_READER_START_ELEMENT:
+ case AXIOM_READER_START_ELEMENT:
val = axiom_stax_builder_create_om_element (
builder, env);
if(!val)
@@ -973,37 +973,37 @@
break;
- case AXIS2_XML_READER_EMPTY_ELEMENT:
+ case AXIOM_READER_EMPTY_ELEMENT:
val = axiom_stax_builder_create_om_element (
builder, env);
if(!val)
return -1;
- case AXIS2_XML_READER_END_ELEMENT:
+ case AXIOM_READER_END_ELEMENT:
axiom_stax_builder_end_element (builder, env);
break;
- case AXIS2_XML_READER_SPACE:
+ case AXIOM_READER_SPACE:
/* Do nothing */
break;
- case AXIS2_XML_READER_CHARACTER:
+ case AXIOM_READER_CHARACTER:
val = axiom_stax_builder_create_om_text(builder, env);
if(!val)
return -1;
break;
- case AXIS2_XML_READER_ENTITY_REFERENCE:
+ case AXIOM_READER_ENTITY_REFERENCE:
break;
- case AXIS2_XML_READER_COMMENT:
+ case AXIOM_READER_COMMENT:
val = axiom_stax_builder_create_om_comment(builder, env);
if(!val)
return -1;
axiom_stax_builder_end_element (builder, env);
break;
- case AXIS2_XML_READER_PROCESSING_INSTRUCTION:
+ case AXIOM_READER_PROCESSING_INSTRUCTION:
val = axiom_stax_builder_create_om_processing_instruction(
builder , env );
if(!val)
@@ -1011,10 +1011,10 @@
axiom_stax_builder_end_element (builder, env);
break;
- case AXIS2_XML_READER_CDATA:
+ case AXIOM_READER_CDATA:
break;
- case AXIS2_XML_READER_DOCUMENT_TYPE:
+ case AXIOM_READER_DOCUMENT_TYPE:
break;
default:
Modified: webservices/axis2/trunk/c/axiom/src/om/om_text.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_text.c?rev=414557&r1=414556&r2=414557&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_text.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_text.c Thu Jun 15 04:11:07 2006
@@ -18,7 +18,7 @@
#include <axiom_output.h>
#include <axis2_string.h>
#include "axiom_node_internal.h"
-#include <axis2_xml_writer.h>
+#include <axiom_writer.h>
#include <axiom_output.h>
#include <axiom_attribute.h>
#include <axiom_namespace.h>
@@ -106,7 +106,7 @@
axiom_text_get_text(axiom_text_t *om_text,
const axis2_env_t *env);
-axis2_data_handler_t *AXIS2_CALL
+axiom_data_handler_t *AXIS2_CALL
axiom_text_get_data_handler(axiom_text_t *om_text,
const axis2_env_t *env);
@@ -125,7 +125,7 @@
axis2_char_t *content_id;
axiom_attribute_t *om_attribute;
axiom_namespace_t *ns;
- axis2_data_handler_t *data_handler;
+ axiom_data_handler_t *data_handler;
}axiom_text_impl_t;
@@ -217,7 +217,7 @@
AXIS2_EXTERN axiom_text_t* AXIS2_CALL
axiom_text_create_with_data_handler (const axis2_env_t *env,
axiom_node_t * parent,
- axis2_data_handler_t* data_handler,
+ axiom_data_handler_t* data_handler,
axiom_node_t **node)
{
@@ -279,7 +279,7 @@
axiom_text_impl_t *om_text_impl = NULL;
axis2_char_t *attribute_value = NULL;
axis2_char_t *text = NULL;
- axis2_xml_writer_t *om_output_xml_writer = NULL;
+ axiom_writer_t *om_output_xml_writer = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, om_output, AXIS2_FAILURE);
@@ -316,7 +316,7 @@
else
{
text = axiom_text_get_text(om_text, env);
- AXIS2_XML_WRITER_WRITE_CHARACTERS(om_output_xml_writer, env, text);
+ AXIOM_WRITER_WRITE_CHARACTERS(om_output_xml_writer, env, text);
}
}
return status;
@@ -506,7 +506,7 @@
axiom_output_t *om_output,
axiom_attribute_t *om_attribute)
{
- axis2_xml_writer_t *xml_writer = NULL;
+ axiom_writer_t *xml_writer = NULL;
axiom_namespace_t *om_namespace = NULL;
axiom_text_impl_t *om_text_impl = NULL;
@@ -517,7 +517,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- xml_writer = axis2_xml_writer_create_for_memory(env, NULL, AXIS2_TRUE, 0,
+ xml_writer = axiom_writer_create_for_memory(env, NULL, AXIS2_TRUE, 0,
AXIS2_XML_PARSER_TYPE_BUFFER);
om_namespace = axiom_namespace_create(env, "" , "");
om_text_impl = AXIS2_INTF_TO_IMPL(om_text);
@@ -532,12 +532,12 @@
attribute_value = AXIOM_ATTRIBUTE_GET_VALUE(om_attribute, env);
if (prefix != NULL)
{
- AXIS2_XML_WRITER_WRITE_ATTRIBUTE(xml_writer, env, attribute_local_name, attribute_value);
+ AXIOM_WRITER_WRITE_ATTRIBUTE(xml_writer, env, attribute_local_name, attribute_value);
} else {
- AXIS2_XML_WRITER_WRITE_ATTRIBUTE_WITH_NAMESPACE(xml_writer, env, attribute_local_name, attribute_value, namespace_uri);
+ AXIOM_WRITER_WRITE_ATTRIBUTE_WITH_NAMESPACE(xml_writer, env, attribute_local_name, attribute_value, namespace_uri);
}
} else {
- AXIS2_XML_WRITER_WRITE_ATTRIBUTE(xml_writer, env, attribute_local_name, attribute_value);
+ AXIOM_WRITER_WRITE_ATTRIBUTE(xml_writer, env, attribute_local_name, attribute_value);
}
AXIOM_NAMESPACE_FREE(om_namespace, env);
return AXIS2_SUCCESS;
@@ -549,14 +549,14 @@
const axiom_namespace_t *om_namespace,
axiom_output_t *om_output)
{
- axis2_xml_writer_t *xml_writer = NULL;
+ axiom_writer_t *xml_writer = NULL;
axiom_text_impl_t *om_text_impl = NULL;
axis2_char_t *namespace_uri = NULL;
axis2_char_t *namespace_prefix = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- xml_writer = axis2_xml_writer_create_for_memory(env, NULL, AXIS2_TRUE, 0,
+ xml_writer = axiom_writer_create_for_memory(env, NULL, AXIS2_TRUE, 0,
AXIS2_XML_PARSER_TYPE_BUFFER);
om_namespace = axiom_namespace_create(env, "" , "");
om_text_impl = AXIS2_INTF_TO_IMPL(om_text);
@@ -565,8 +565,8 @@
{
namespace_uri = AXIOM_NAMESPACE_GET_URI(om_text_impl->ns, env);
namespace_prefix = AXIOM_NAMESPACE_GET_PREFIX(om_text_impl->ns, env);
- AXIS2_XML_WRITER_WRITE_NAMESPACE(xml_writer, env, namespace_prefix, namespace_uri);
- AXIS2_XML_WRITER_SET_PREFIX(xml_writer, env, namespace_prefix, namespace_uri);
+ AXIOM_WRITER_WRITE_NAMESPACE(xml_writer, env, namespace_prefix, namespace_uri);
+ AXIOM_WRITER_SET_PREFIX(xml_writer, env, namespace_prefix, namespace_uri);
}
return AXIS2_SUCCESS;
}
@@ -591,7 +591,7 @@
{
int encoded_len = 0;
axis2_char_t *encoded_str = NULL;
- AXIS2_DATA_HANDLER_READ_FROM(om_text_impl->data_handler, env,
+ AXIOM_DATA_HANDLER_READ_FROM(om_text_impl->data_handler, env,
&data_handler_stream, &data_handler_stream_size);
if (data_handler_stream)
{
@@ -610,7 +610,7 @@
return om_text_impl->value;
}
-axis2_data_handler_t *AXIS2_CALL
+axiom_data_handler_t *AXIS2_CALL
axiom_text_get_data_handler(axiom_text_t *om_text,
const axis2_env_t *env)
{
Modified: webservices/axis2/trunk/c/axiom/src/parser/guththila/guththila_xml_reader_wrapper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/parser/guththila/guththila_xml_reader_wrapper.c?rev=414557&r1=414556&r2=414557&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/parser/guththila/guththila_xml_reader_wrapper.c (original)
+++ webservices/axis2/trunk/c/axiom/src/parser/guththila/guththila_xml_reader_wrapper.c Thu Jun 15 04:11:07 2006
@@ -15,7 +15,7 @@
*
*/
-#include <axis2_xml_reader.h>
+#include <axiom_reader.h>
#include <axis2_env.h>
#include <axis2_utils.h>
#include <guththila_xml_pull_parser.h>
@@ -25,84 +25,84 @@
int AXIS2_CALL
-guththila_xml_reader_wrapper_next(axis2_xml_reader_t *parser,
+guththila_xml_reader_wrapper_next(axiom_reader_t *parser,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-guththila_xml_reader_wrapper_free(axis2_xml_reader_t *parser,
+guththila_xml_reader_wrapper_free(axiom_reader_t *parser,
const axis2_env_t *env);
int AXIS2_CALL
-guththila_xml_reader_wrapper_get_attribute_count(axis2_xml_reader_t *parser,
+guththila_xml_reader_wrapper_get_attribute_count(axiom_reader_t *parser,
const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
-guththila_xml_reader_wrapper_get_attribute_name_by_number(axis2_xml_reader_t *parser,
+guththila_xml_reader_wrapper_get_attribute_name_by_number(axiom_reader_t *parser,
const axis2_env_t *env,
int i);
axis2_char_t* AXIS2_CALL
-guththila_xml_reader_wrapper_get_attribute_prefix_by_number(axis2_xml_reader_t *parser,
+guththila_xml_reader_wrapper_get_attribute_prefix_by_number(axiom_reader_t *parser,
const axis2_env_t *env,
int i);
axis2_char_t* AXIS2_CALL
guththila_xml_reader_wrapper_get_attribute_value_by_number(
- axis2_xml_reader_t *parser,
+ axiom_reader_t *parser,
const axis2_env_t *env,
int i);
axis2_char_t* AXIS2_CALL
guththila_xml_reader_wrapper_get_attribute_namespace_by_number(
- axis2_xml_reader_t *parser,
+ axiom_reader_t *parser,
const axis2_env_t *env,
int i);
axis2_char_t* AXIS2_CALL
-guththila_xml_reader_wrapper_get_value(axis2_xml_reader_t *parser,
+guththila_xml_reader_wrapper_get_value(axiom_reader_t *parser,
const axis2_env_t *env);
int AXIS2_CALL
-guththila_xml_reader_wrapper_get_namespace_count(axis2_xml_reader_t *parser,
+guththila_xml_reader_wrapper_get_namespace_count(axiom_reader_t *parser,
const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
-guththila_xml_reader_wrapper_get_namespace_uri_by_number(axis2_xml_reader_t *parser,
+guththila_xml_reader_wrapper_get_namespace_uri_by_number(axiom_reader_t *parser,
const axis2_env_t *env,
int i);
axis2_char_t* AXIS2_CALL
guththila_xml_reader_wrapper_get_namespace_prefix_by_number(
- axis2_xml_reader_t *parser,
+ axiom_reader_t *parser,
const axis2_env_t *env,
int i);
axis2_char_t* AXIS2_CALL
-guththila_xml_reader_wrapper_get_prefix(axis2_xml_reader_t *parser,
+guththila_xml_reader_wrapper_get_prefix(axiom_reader_t *parser,
const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
-guththila_xml_reader_wrapper_get_name(axis2_xml_reader_t *parser,
+guththila_xml_reader_wrapper_get_name(axiom_reader_t *parser,
const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
-guththila_xml_reader_wrapper_get_pi_target(axis2_xml_reader_t *parser,
+guththila_xml_reader_wrapper_get_pi_target(axiom_reader_t *parser,
const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
-guththila_xml_reader_wrapper_get_pi_data(axis2_xml_reader_t *parser,
+guththila_xml_reader_wrapper_get_pi_data(axiom_reader_t *parser,
const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
-guththila_xml_reader_wrapper_get_dtd(axis2_xml_reader_t *parser,
+guththila_xml_reader_wrapper_get_dtd(axiom_reader_t *parser,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-guththila_xml_reader_wrapper_xml_free(axis2_xml_reader_t *parser,
+guththila_xml_reader_wrapper_xml_free(axiom_reader_t *parser,
const axis2_env_t *env,
void *data);
@@ -111,7 +111,7 @@
typedef struct guththila_xml_reader_wrapper_impl
{
- axis2_xml_reader_t parser;
+ axiom_reader_t parser;
guththila_xml_pull_parser_t *guththila_parser;
guththila_environment_t *guththila_env;
guththila_reader_t *reader;
@@ -132,14 +132,14 @@
{
if(parser)
{
- parser->event_map[GUTHTHILA_START_DOCUMENT] = AXIS2_XML_READER_START_DOCUMENT;
- parser->event_map[GUTHTHILA_START_ELEMENT] = AXIS2_XML_READER_START_ELEMENT;
- parser->event_map[GUTHTHILA_END_ELEMENT] = AXIS2_XML_READER_END_ELEMENT;
- parser->event_map[GUTHTHILA_SPACE] = AXIS2_XML_READER_SPACE;
- parser->event_map[GUTHTHILA_EMPTY_ELEMENT] = AXIS2_XML_READER_EMPTY_ELEMENT;
- parser->event_map[GUTHTHILA_CHARACTER] = AXIS2_XML_READER_CHARACTER;
- parser->event_map[GUTHTHILA_ENTITY_REFERANCE] = AXIS2_XML_READER_ENTITY_REFERANCE;
- parser->event_map[GUTHTHILA_COMMENT] = AXIS2_XML_READER_COMMENT;
+ parser->event_map[GUTHTHILA_START_DOCUMENT] = AXIOM_READER_START_DOCUMENT;
+ parser->event_map[GUTHTHILA_START_ELEMENT] = AXIOM_READER_START_ELEMENT;
+ parser->event_map[GUTHTHILA_END_ELEMENT] = AXIOM_READER_END_ELEMENT;
+ parser->event_map[GUTHTHILA_SPACE] = AXIOM_READER_SPACE;
+ parser->event_map[GUTHTHILA_EMPTY_ELEMENT] = AXIOM_READER_EMPTY_ELEMENT;
+ parser->event_map[GUTHTHILA_CHARACTER] = AXIOM_READER_CHARACTER;
+ parser->event_map[GUTHTHILA_ENTITY_REFERANCE] = AXIOM_READER_ENTITY_REFERANCE;
+ parser->event_map[GUTHTHILA_COMMENT] = AXIOM_READER_COMMENT;
return AXIS2_SUCCESS;
}
return AXIS2_FAILURE;
@@ -147,8 +147,8 @@
/********************************************************************************/
-AXIS2_EXTERN axis2_xml_reader_t * AXIS2_CALL
-axis2_xml_reader_create_for_file(const axis2_env_t *env,
+AXIS2_EXTERN axiom_reader_t * AXIS2_CALL
+axiom_reader_create_for_file(const axis2_env_t *env,
char* filename,
const char *encoding)
{
@@ -194,9 +194,9 @@
guththila_impl->guththila_parser = guththila;
guththila_impl->guththila_env = guththila_env;
guththila_impl->parser.ops = NULL;
- guththila_impl->parser.ops = (axis2_xml_reader_ops_t*)AXIS2_MALLOC(
+ guththila_impl->parser.ops = (axiom_reader_ops_t*)AXIS2_MALLOC(
env->allocator,
- sizeof(axis2_xml_reader_ops_t));
+ sizeof(axiom_reader_ops_t));
if(!(guththila_impl->parser.ops))
{ guththila_xml_pull_parser_free( guththila_env, guththila);
AXIS2_FREE(env->allocator,guththila_impl);
@@ -246,8 +246,8 @@
/****** pull parser for io create function ***************************/
-AXIS2_EXTERN axis2_xml_reader_t * AXIS2_CALL
-axis2_xml_reader_create_for_io(const axis2_env_t *env,
+AXIS2_EXTERN axiom_reader_t * AXIS2_CALL
+axiom_reader_create_for_io(const axis2_env_t *env,
int (*read_input_callback)(char *buffer,int size,void* ctx),
int (*close_input_callback)(void *ctx),
void *ctx,
@@ -296,9 +296,9 @@
guththila_impl->guththila_parser = guththila;
guththila_impl->guththila_env = guththila_env;
guththila_impl->parser.ops = NULL;
- guththila_impl->parser.ops = (axis2_xml_reader_ops_t*)AXIS2_MALLOC(
+ guththila_impl->parser.ops = (axiom_reader_ops_t*)AXIS2_MALLOC(
env->allocator,
- sizeof(axis2_xml_reader_ops_t));
+ sizeof(axiom_reader_ops_t));
if(!(guththila_impl->parser.ops))
{ guththila_xml_pull_parser_free( guththila_env, guththila);
AXIS2_FREE(env->allocator,guththila_impl);
@@ -348,7 +348,7 @@
int AXIS2_CALL
-guththila_xml_reader_wrapper_next(axis2_xml_reader_t *parser,
+guththila_xml_reader_wrapper_next(axiom_reader_t *parser,
const axis2_env_t *env)
{
int i =-1;
@@ -361,7 +361,7 @@
axis2_status_t AXIS2_CALL
-guththila_xml_reader_wrapper_free(axis2_xml_reader_t *parser,
+guththila_xml_reader_wrapper_free(axiom_reader_t *parser,
const axis2_env_t *env)
{
guththila_xml_reader_wrapper_impl_t *parser_impl = NULL;
@@ -386,7 +386,7 @@
int AXIS2_CALL
-guththila_xml_reader_wrapper_get_attribute_count(axis2_xml_reader_t *parser,
+guththila_xml_reader_wrapper_get_attribute_count(axiom_reader_t *parser,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
@@ -396,7 +396,7 @@
}
axis2_char_t* AXIS2_CALL
-guththila_xml_reader_wrapper_get_attribute_name_by_number(axis2_xml_reader_t *parser,
+guththila_xml_reader_wrapper_get_attribute_name_by_number(axiom_reader_t *parser,
const axis2_env_t *env,
int i)
{
@@ -409,7 +409,7 @@
}
axis2_char_t* AXIS2_CALL
-guththila_xml_reader_wrapper_get_attribute_prefix_by_number(axis2_xml_reader_t *parser,
+guththila_xml_reader_wrapper_get_attribute_prefix_by_number(axiom_reader_t *parser,
const axis2_env_t *env,
int i)
{
@@ -423,7 +423,7 @@
axis2_char_t* AXIS2_CALL
-guththila_xml_reader_wrapper_get_attribute_value_by_number(axis2_xml_reader_t *parser,
+guththila_xml_reader_wrapper_get_attribute_value_by_number(axiom_reader_t *parser,
const axis2_env_t *env,
int i)
{
@@ -438,7 +438,7 @@
axis2_char_t* AXIS2_CALL
guththila_xml_reader_wrapper_get_attribute_namespace_by_number(
- axis2_xml_reader_t *parser,
+ axiom_reader_t *parser,
const axis2_env_t *env,
int i)
{
@@ -452,7 +452,7 @@
axis2_char_t* AXIS2_CALL
-guththila_xml_reader_wrapper_get_value(axis2_xml_reader_t *parser,
+guththila_xml_reader_wrapper_get_value(axiom_reader_t *parser,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -464,7 +464,7 @@
}
int AXIS2_CALL
-guththila_xml_reader_wrapper_get_namespace_count(axis2_xml_reader_t *parser,
+guththila_xml_reader_wrapper_get_namespace_count(axiom_reader_t *parser,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -476,7 +476,7 @@
}
axis2_char_t* AXIS2_CALL
-guththila_xml_reader_wrapper_get_namespace_uri_by_number(axis2_xml_reader_t *parser,
+guththila_xml_reader_wrapper_get_namespace_uri_by_number(axiom_reader_t *parser,
const axis2_env_t *env,
int i)
{
@@ -490,7 +490,7 @@
axis2_char_t* AXIS2_CALL
guththila_xml_reader_wrapper_get_namespace_prefix_by_number(
- axis2_xml_reader_t *parser,
+ axiom_reader_t *parser,
const axis2_env_t *env,
int i)
{
@@ -503,7 +503,7 @@
}
axis2_char_t* AXIS2_CALL
-guththila_xml_reader_wrapper_get_prefix(axis2_xml_reader_t *parser,
+guththila_xml_reader_wrapper_get_prefix(axiom_reader_t *parser,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -515,7 +515,7 @@
}
axis2_char_t* AXIS2_CALL
-guththila_xml_reader_wrapper_get_name(axis2_xml_reader_t *parser,
+guththila_xml_reader_wrapper_get_name(axiom_reader_t *parser,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -527,7 +527,7 @@
}
axis2_char_t* AXIS2_CALL
-guththila_xml_reader_wrapper_get_pi_target(axis2_xml_reader_t *parser,
+guththila_xml_reader_wrapper_get_pi_target(axiom_reader_t *parser,
const axis2_env_t *env)
{
/* guththila_does not support pi's yet*/
@@ -535,7 +535,7 @@
}
axis2_char_t* AXIS2_CALL
-guththila_xml_reader_wrapper_get_pi_data(axis2_xml_reader_t *parser,
+guththila_xml_reader_wrapper_get_pi_data(axiom_reader_t *parser,
const axis2_env_t *env)
{
/* guththila_dose not support yet */
@@ -543,7 +543,7 @@
}
axis2_char_t* AXIS2_CALL
-guththila_xml_reader_wrapper_get_dtd(axis2_xml_reader_t *parser,
+guththila_xml_reader_wrapper_get_dtd(axiom_reader_t *parser,
const axis2_env_t *env)
{
printf("not implemented in guththila");
@@ -551,7 +551,7 @@
}
axis2_status_t AXIS2_CALL
-guththila_xml_reader_wrapper_xml_free(axis2_xml_reader_t *parser,
+guththila_xml_reader_wrapper_xml_free(axiom_reader_t *parser,
const axis2_env_t *env,
void *data)
{
Modified: webservices/axis2/trunk/c/axiom/src/parser/guththila/guththila_xml_writer_wrapper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/parser/guththila/guththila_xml_writer_wrapper.c?rev=414557&r1=414556&r2=414557&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/parser/guththila/guththila_xml_writer_wrapper.c (original)
+++ webservices/axis2/trunk/c/axiom/src/parser/guththila/guththila_xml_writer_wrapper.c Thu Jun 15 04:11:07 2006
@@ -17,32 +17,32 @@
#include <guththila_xml_stream_writer.h>
#include <axis2_utils.h>
#include <axis2_env.h>
-#include <axis2_xml_writer.h>
+#include <axiom_writer.h>
/*********************** function prototypes ***********************************/
axis2_status_t AXIS2_CALL
-guththila_xml_writer_wrapper_free(axis2_xml_writer_t *writer,
+guththila_xml_writer_wrapper_free(axiom_writer_t *writer,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_start_element(
- axis2_xml_writer_t *writer,
+ axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *localname);
axis2_status_t AXIS2_CALL
-guththila_xml_writer_wrapper_end_start_element(axis2_xml_writer_t *writer,
+guththila_xml_writer_wrapper_end_start_element(axiom_writer_t *writer,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_start_element_with_namespace(
- axis2_xml_writer_t *writer,
+ axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *localname,
axis2_char_t *namespace_uri);
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_start_element_with_namespace_prefix(
- axis2_xml_writer_t *writer,
+ axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *localname,
axis2_char_t *namespace_uri,
@@ -50,42 +50,42 @@
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_empty_element(
- axis2_xml_writer_t *writer,
+ axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *localname);
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_empty_element_with_namespace(
- axis2_xml_writer_t *writer,
+ axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *localname,
axis2_char_t *namespace_uri);
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_empty_element_with_namespace_prefix(
- axis2_xml_writer_t *writer,
+ axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *localname,
axis2_char_t *namespace_uri,
axis2_char_t *prefix);
axis2_status_t AXIS2_CALL
-guththila_xml_writer_wrapper_write_end_element(axis2_xml_writer_t *writer,
+guththila_xml_writer_wrapper_write_end_element(axiom_writer_t *writer,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-guththila_xml_writer_wrapper_write_end_document(axis2_xml_writer_t *writer,
+guththila_xml_writer_wrapper_write_end_document(axiom_writer_t *writer,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-guththila_xml_writer_wrapper_write_attribute(axis2_xml_writer_t *writer,
+guththila_xml_writer_wrapper_write_attribute(axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *localname,
axis2_char_t *value);
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_attribute_with_namespace(
- axis2_xml_writer_t *writer,
+ axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *localname,
axis2_char_t *value,
@@ -93,7 +93,7 @@
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_attribute_with_namespace_prefix(
- axis2_xml_writer_t *writer,
+ axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *localname,
axis2_char_t *value,
@@ -101,7 +101,7 @@
axis2_char_t *prefix);
axis2_status_t AXIS2_CALL
-guththila_xml_writer_wrapper_write_namespace(axis2_xml_writer_t *writer,
+guththila_xml_writer_wrapper_write_namespace(axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *prefix,
axis2_char_t *namespace_uri);
@@ -109,93 +109,93 @@
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_default_namespace
- (axis2_xml_writer_t *writer,
+ (axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *namespace_uri);
axis2_status_t AXIS2_CALL
-guththila_xml_writer_wrapper_write_comment(axis2_xml_writer_t *writer,
+guththila_xml_writer_wrapper_write_comment(axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *value);
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_processing_instruction(
- axis2_xml_writer_t *writer,
+ axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *target);
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_processing_instruction_data(
- axis2_xml_writer_t *writer,
+ axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *target,
axis2_char_t *data);
axis2_status_t AXIS2_CALL
-guththila_xml_writer_wrapper_write_cdata(axis2_xml_writer_t *writer,
+guththila_xml_writer_wrapper_write_cdata(axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *data);
axis2_status_t AXIS2_CALL
-guththila_xml_writer_wrapper_write_dtd(axis2_xml_writer_t *writer,
+guththila_xml_writer_wrapper_write_dtd(axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *dtd);
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_entity_ref(
- axis2_xml_writer_t *writer,
+ axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *name);
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_start_document(
- axis2_xml_writer_t *writer,
+ axiom_writer_t *writer,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_start_document_with_version(
- axis2_xml_writer_t *writer,
+ axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *version);
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_start_document_with_version_encoding(
- axis2_xml_writer_t *writer,
+ axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *encoding,
axis2_char_t *version);
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_characters(
- axis2_xml_writer_t *writer,
+ axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *text);
axis2_char_t* AXIS2_CALL
-guththila_xml_writer_wrapper_get_prefix( axis2_xml_writer_t *writer,
+guththila_xml_writer_wrapper_get_prefix( axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *uri);
axis2_status_t AXIS2_CALL
-guththila_xml_writer_wrapper_set_prefix( axis2_xml_writer_t *writer,
+guththila_xml_writer_wrapper_set_prefix( axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *prefix,
axis2_char_t *uri);
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_set_default_prefix(
- axis2_xml_writer_t *writer,
+ axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *uri);
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_encoded(
- axis2_xml_writer_t *writer,
+ axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *text,
int in_attr);
void* AXIS2_CALL
-guththila_xml_writer_wrapper_get_xml(axis2_xml_writer_t *writer,
+guththila_xml_writer_wrapper_get_xml(axiom_writer_t *writer,
const axis2_env_t *env);
@@ -204,7 +204,7 @@
typedef struct guththila_xml_writer_wrapper_impl
{
- axis2_xml_writer_t writer;
+ axiom_writer_t writer;
guththila_xml_stream_writer_t *guththila_writer;
guththila_environment_t *guththila_env;
@@ -217,8 +217,8 @@
/****************************** End macro **************************************/
-AXIS2_EXTERN axis2_xml_writer_t * AXIS2_CALL
-axis2_xml_writer_create(const axis2_env_t *env,
+AXIS2_EXTERN axiom_writer_t * AXIS2_CALL
+axiom_writer_create(const axis2_env_t *env,
axis2_char_t *filename,
axis2_char_t *encoding,
int is_prefix_default,
@@ -256,8 +256,8 @@
}
writer_impl->writer.ops = NULL;
- writer_impl->writer.ops = (axis2_xml_writer_ops_t*)AXIS2_MALLOC(env->allocator,
- sizeof(axis2_xml_writer_ops_t));
+ writer_impl->writer.ops = (axiom_writer_ops_t*)AXIS2_MALLOC(env->allocator,
+ sizeof(axiom_writer_ops_t));
if(!(writer_impl->writer.ops))
{
AXIS2_FREE(env->allocator,writer_impl);
@@ -328,19 +328,19 @@
return &(writer_impl->writer);
}
-AXIS2_EXTERN axis2_xml_writer_t * AXIS2_CALL
-axis2_xml_writer_create_for_memory(const axis2_env_t *env,
+AXIS2_EXTERN axiom_writer_t * AXIS2_CALL
+axiom_writer_create_for_memory(const axis2_env_t *env,
axis2_char_t *encoding,
int is_prefix_default,
int compression,
int type)
{
- return axis2_xml_writer_create(env, NULL, encoding, is_prefix_default, compression);
+ return axiom_writer_create(env, NULL, encoding, is_prefix_default, compression);
}
axis2_status_t AXIS2_CALL
-guththila_xml_writer_wrapper_free(axis2_xml_writer_t *writer,
+guththila_xml_writer_wrapper_free(axiom_writer_t *writer,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
@@ -359,7 +359,7 @@
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_start_element(
- axis2_xml_writer_t *writer,
+ axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *localname)
{
@@ -374,7 +374,7 @@
}
axis2_status_t AXIS2_CALL
-guththila_xml_writer_wrapper_end_start_element(axis2_xml_writer_t *writer,
+guththila_xml_writer_wrapper_end_start_element(axiom_writer_t *writer,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
@@ -385,7 +385,7 @@
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_start_element_with_namespace(
- axis2_xml_writer_t *writer,
+ axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *localname,
axis2_char_t *namespace_uri)
@@ -402,7 +402,7 @@
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_start_element_with_namespace_prefix(
- axis2_xml_writer_t *writer,
+ axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *localname,
axis2_char_t *namespace_uri,
@@ -421,7 +421,7 @@
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_empty_element(
- axis2_xml_writer_t *writer,
+ axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *localname)
{
@@ -436,7 +436,7 @@
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_empty_element_with_namespace(
- axis2_xml_writer_t *writer,
+ axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *localname,
axis2_char_t *namespace_uri)
@@ -452,7 +452,7 @@
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_empty_element_with_namespace_prefix(
- axis2_xml_writer_t *writer,
+ axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *localname,
axis2_char_t *namespace_uri,
@@ -472,7 +472,7 @@
}
axis2_status_t AXIS2_CALL
-guththila_xml_writer_wrapper_write_end_element(axis2_xml_writer_t *writer,
+guththila_xml_writer_wrapper_write_end_element(axiom_writer_t *writer,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
@@ -482,7 +482,7 @@
}
axis2_status_t AXIS2_CALL
-guththila_xml_writer_wrapper_write_end_document(axis2_xml_writer_t *writer,
+guththila_xml_writer_wrapper_write_end_document(axiom_writer_t *writer,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
@@ -493,7 +493,7 @@
}
axis2_status_t AXIS2_CALL
-guththila_xml_writer_wrapper_write_attribute(axis2_xml_writer_t *writer,
+guththila_xml_writer_wrapper_write_attribute(axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *localname,
axis2_char_t *value)
@@ -512,7 +512,7 @@
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_attribute_with_namespace(
- axis2_xml_writer_t *writer,
+ axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *localname,
axis2_char_t *value,
@@ -531,7 +531,7 @@
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_attribute_with_namespace_prefix(
- axis2_xml_writer_t *writer,
+ axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *localname,
axis2_char_t *value,
@@ -553,7 +553,7 @@
}
axis2_status_t AXIS2_CALL
-guththila_xml_writer_wrapper_write_namespace(axis2_xml_writer_t *writer,
+guththila_xml_writer_wrapper_write_namespace(axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *prefix,
axis2_char_t *namespace_uri)
@@ -571,7 +571,7 @@
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_default_namespace
- (axis2_xml_writer_t *writer,
+ (axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *namespace_uri)
{
@@ -585,7 +585,7 @@
}
axis2_status_t AXIS2_CALL
-guththila_xml_writer_wrapper_write_comment(axis2_xml_writer_t *writer,
+guththila_xml_writer_wrapper_write_comment(axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *value)
{
@@ -601,7 +601,7 @@
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_processing_instruction(
- axis2_xml_writer_t *writer,
+ axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *target)
{
@@ -617,7 +617,7 @@
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_processing_instruction_data(
- axis2_xml_writer_t *writer,
+ axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *target,
axis2_char_t *data)
@@ -633,7 +633,7 @@
}
axis2_status_t AXIS2_CALL
-guththila_xml_writer_wrapper_write_cdata(axis2_xml_writer_t *writer,
+guththila_xml_writer_wrapper_write_cdata(axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *data)
{
@@ -647,7 +647,7 @@
}
axis2_status_t AXIS2_CALL
-guththila_xml_writer_wrapper_write_dtd(axis2_xml_writer_t *writer,
+guththila_xml_writer_wrapper_write_dtd(axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *dtd)
{
@@ -661,7 +661,7 @@
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_entity_ref(
- axis2_xml_writer_t *writer,
+ axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *name)
{
@@ -676,7 +676,7 @@
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_start_document(
- axis2_xml_writer_t *writer,
+ axiom_writer_t *writer,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
@@ -687,7 +687,7 @@
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_start_document_with_version(
- axis2_xml_writer_t *writer,
+ axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *version)
{
@@ -701,7 +701,7 @@
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_start_document_with_version_encoding(
- axis2_xml_writer_t *writer,
+ axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *encoding,
axis2_char_t *version)
@@ -719,7 +719,7 @@
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_characters(
- axis2_xml_writer_t *writer,
+ axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *text)
{
@@ -732,7 +732,7 @@
}
axis2_char_t* AXIS2_CALL
-guththila_xml_writer_wrapper_get_prefix( axis2_xml_writer_t *writer,
+guththila_xml_writer_wrapper_get_prefix( axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *uri)
{
@@ -747,7 +747,7 @@
}
axis2_status_t AXIS2_CALL
-guththila_xml_writer_wrapper_set_prefix( axis2_xml_writer_t *writer,
+guththila_xml_writer_wrapper_set_prefix( axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *prefix,
axis2_char_t *uri)
@@ -762,7 +762,7 @@
}
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_set_default_prefix(
- axis2_xml_writer_t *writer,
+ axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *uri)
{
@@ -775,7 +775,7 @@
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_encoded(
- axis2_xml_writer_t *writer,
+ axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *text,
int in_attr)
@@ -788,7 +788,7 @@
}
void* AXIS2_CALL
-guththila_xml_writer_wrapper_get_xml(axis2_xml_writer_t *writer,
+guththila_xml_writer_wrapper_get_xml(axiom_writer_t *writer,
const axis2_env_t *env)
{
return (void*)NULL;
Modified: webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c?rev=414557&r1=414556&r2=414557&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c (original)
+++ webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c Thu Jun 15 04:11:07 2006
@@ -15,7 +15,7 @@
*
*/
- #include <axis2_xml_reader.h>
+ #include <axiom_reader.h>
#include <libxml/xmlreader.h>
#include <libxml/parser.h>
#include <axis2_utils_defines.h>
@@ -29,94 +29,94 @@
int AXIS2_CALL
-axis2_libxml2_reader_wrapper_next(axis2_xml_reader_t *parser,
+axis2_libxml2_reader_wrapper_next(axiom_reader_t *parser,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_libxml2_reader_wrapper_free(axis2_xml_reader_t *parser,
+axis2_libxml2_reader_wrapper_free(axiom_reader_t *parser,
const axis2_env_t *env);
int AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_attribute_count(axis2_xml_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_attribute_count(axiom_reader_t *parser,
const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_attribute_name_by_number(axis2_xml_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_attribute_name_by_number(axiom_reader_t *parser,
const axis2_env_t *env,
int i);
axis2_char_t* AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_attribute_prefix_by_number(axis2_xml_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_attribute_prefix_by_number(axiom_reader_t *parser,
const axis2_env_t *env,
int i);
axis2_char_t* AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_attribute_value_by_number(axis2_xml_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_attribute_value_by_number(axiom_reader_t *parser,
const axis2_env_t *env,
int i);
axis2_char_t* AXIS2_CALL
axis2_libxml2_reader_wrapper_get_attribute_namespace_by_number
- (axis2_xml_reader_t *parser,
+ (axiom_reader_t *parser,
const axis2_env_t *env,
int i);
axis2_char_t* AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_value(axis2_xml_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_value(axiom_reader_t *parser,
const axis2_env_t *env);
int AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_namespace_count(axis2_xml_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_namespace_count(axiom_reader_t *parser,
const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_namespace_uri_by_number(axis2_xml_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_namespace_uri_by_number(axiom_reader_t *parser,
const axis2_env_t *env,
int i);
axis2_char_t* AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_namespace_prefix_by_number(axis2_xml_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_namespace_prefix_by_number(axiom_reader_t *parser,
const axis2_env_t *env,
int i);
axis2_char_t* AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_prefix(axis2_xml_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_prefix(axiom_reader_t *parser,
const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_name(axis2_xml_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_name(axiom_reader_t *parser,
const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_pi_target(axis2_xml_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_pi_target(axiom_reader_t *parser,
const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_pi_data(axis2_xml_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_pi_data(axiom_reader_t *parser,
const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_dtd(axis2_xml_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_dtd(axiom_reader_t *parser,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_libxml2_reader_wrapper_xml_free(axis2_xml_reader_t *parser,
+axis2_libxml2_reader_wrapper_xml_free(axiom_reader_t *parser,
const axis2_env_t *env,
void *data);
axis2_char_t* AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_char_set_encoding(axis2_xml_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_char_set_encoding(axiom_reader_t *parser,
const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
axis2_libxml2_reader_wrapper_get_namespace_uri
- (axis2_xml_reader_t *parser,
+ (axiom_reader_t *parser,
const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
axis2_libxml2_reader_wrapper_get_namespace_uri_by_prefix
- (axis2_xml_reader_t *parser,
+ (axiom_reader_t *parser,
const axis2_env_t *env,
axis2_char_t *prefix);
axis2_status_t
-axis2_libxml2_reader_wrapper_fill_maps(axis2_xml_reader_t *parser,
+axis2_libxml2_reader_wrapper_fill_maps(axiom_reader_t *parser,
const axis2_env_t *env);
void
@@ -134,14 +134,14 @@
axis2_libxml2_reader_wrapper_close_input_callback(void *ctx);
static void
-axis2_libxml2_reader_wrapper_init_ops(axis2_xml_reader_t *reader);
+axis2_libxml2_reader_wrapper_init_ops(axiom_reader_t *reader);
/************* End function parameters , axis2_libxml2_reader_wrapper_impl_t struct ***/
typedef struct axis2_libxml2_reader_wrapper_impl_t
{
- axis2_xml_reader_t parser;
+ axiom_reader_t parser;
xmlTextReaderPtr reader;
@@ -186,47 +186,47 @@
parser->event_map[i] = -1;
parser->event_map[XML_READER_TYPE_ELEMENT] =
- AXIS2_XML_READER_START_ELEMENT;
+ AXIOM_READER_START_ELEMENT;
parser->event_map[XML_READER_TYPE_ELEMENT] =
- AXIS2_XML_READER_START_ELEMENT;
+ AXIOM_READER_START_ELEMENT;
parser->event_map[XML_READER_TYPE_DOCUMENT] =
- AXIS2_XML_READER_START_DOCUMENT;
+ AXIOM_READER_START_DOCUMENT;
- parser->event_map[XML_READER_TYPE_TEXT] = AXIS2_XML_READER_CHARACTER;
+ parser->event_map[XML_READER_TYPE_TEXT] = AXIOM_READER_CHARACTER;
- parser->event_map[XML_READER_TYPE_CDATA] = AXIS2_XML_READER_CDATA;
+ parser->event_map[XML_READER_TYPE_CDATA] = AXIOM_READER_CDATA;
parser->event_map[XML_READER_TYPE_SIGNIFICANT_WHITESPACE] =
- AXIS2_XML_READER_SPACE;
+ AXIOM_READER_SPACE;
- parser->event_map[XML_READER_TYPE_WHITESPACE] = AXIS2_XML_READER_SPACE;
+ parser->event_map[XML_READER_TYPE_WHITESPACE] = AXIOM_READER_SPACE;
parser->event_map[XML_READER_TYPE_END_ELEMENT] =
- AXIS2_XML_READER_END_ELEMENT;
+ AXIOM_READER_END_ELEMENT;
parser->event_map [XML_READER_TYPE_ENTITY_REFERENCE] =
- AXIS2_XML_READER_ENTITY_REFERENCE;
+ AXIOM_READER_ENTITY_REFERENCE;
- parser->event_map [XML_READER_TYPE_END_ENTITY] = AXIS2_XML_READER_SPACE;
+ parser->event_map [XML_READER_TYPE_END_ENTITY] = AXIOM_READER_SPACE;
- parser->event_map[XML_READER_TYPE_ENTITY] = AXIS2_XML_READER_SPACE;
+ parser->event_map[XML_READER_TYPE_ENTITY] = AXIOM_READER_SPACE;
parser->event_map[XML_READER_TYPE_PROCESSING_INSTRUCTION] =
- AXIS2_XML_READER_PROCESSING_INSTRUCTION;
+ AXIOM_READER_PROCESSING_INSTRUCTION;
- parser->event_map[XML_READER_TYPE_COMMENT] = AXIS2_XML_READER_COMMENT;
+ parser->event_map[XML_READER_TYPE_COMMENT] = AXIOM_READER_COMMENT;
parser->event_map[XML_READER_TYPE_DOCUMENT_TYPE] =
- AXIS2_XML_READER_DOCUMENT_TYPE;
+ AXIOM_READER_DOCUMENT_TYPE;
return AXIS2_SUCCESS;
}
return AXIS2_FAILURE;
}
static void
-axis2_libxml2_reader_wrapper_init_ops(axis2_xml_reader_t *parser)
+axis2_libxml2_reader_wrapper_init_ops(axiom_reader_t *parser)
{
parser->ops->free =
axis2_libxml2_reader_wrapper_free;
@@ -273,22 +273,22 @@
/*******************************************************************************/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_reader_init()
+axiom_reader_init()
{
xmlInitParser();
return AXIS2_SUCCESS;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_reader_cleanup()
+axiom_reader_cleanup()
{
xmlCleanupParser();
return AXIS2_SUCCESS;
}
/*******************************************************************************/
-AXIS2_EXTERN axis2_xml_reader_t * AXIS2_CALL
-axis2_xml_reader_create_for_file(const axis2_env_t *env,
+AXIS2_EXTERN axiom_reader_t * AXIS2_CALL
+axiom_reader_create_for_file(const axis2_env_t *env,
char *filename,
const axis2_char_t *encoding)
{
@@ -322,8 +322,8 @@
wrapper_impl->parser.ops = NULL;
- wrapper_impl->parser.ops = (axis2_xml_reader_ops_t*)AXIS2_MALLOC(env->allocator,
- sizeof(axis2_xml_reader_ops_t));
+ wrapper_impl->parser.ops = (axiom_reader_ops_t*)AXIS2_MALLOC(env->allocator,
+ sizeof(axiom_reader_ops_t));
if(!(wrapper_impl->parser.ops))
{
@@ -339,8 +339,8 @@
/************** create function for io callback function **********************/
-AXIS2_EXTERN axis2_xml_reader_t * AXIS2_CALL
-axis2_xml_reader_create_for_io(const axis2_env_t *env,
+AXIS2_EXTERN axiom_reader_t * AXIS2_CALL
+axiom_reader_create_for_io(const axis2_env_t *env,
AXIS2_READ_INPUT_CALLBACK read_input_callback,
AXIS2_CLOSE_INPUT_CALLBACK close_input_callback,
void* ctx,
@@ -395,8 +395,8 @@
wrapper_impl->parser.ops = NULL;
- wrapper_impl->parser.ops = (axis2_xml_reader_ops_t*)AXIS2_MALLOC(env->allocator,
- sizeof(axis2_xml_reader_ops_t));
+ wrapper_impl->parser.ops = (axiom_reader_ops_t*)AXIS2_MALLOC(env->allocator,
+ sizeof(axiom_reader_ops_t));
if(!(wrapper_impl->parser.ops))
{
@@ -411,8 +411,8 @@
}
/***************** create function for character buffer or xml doc ************************/
-AXIS2_EXTERN axis2_xml_reader_t * AXIS2_CALL
-axis2_xml_reader_create_for_memory(const axis2_env_t *env,
+AXIS2_EXTERN axiom_reader_t * AXIS2_CALL
+axiom_reader_create_for_memory(const axis2_env_t *env,
void *container,
int size,
const axis2_char_t *encoding,
@@ -470,8 +470,8 @@
axis2_libxml2_reader_wrapper_init_map(wrapper_impl);
wrapper_impl->parser.ops = NULL;
- wrapper_impl->parser.ops = (axis2_xml_reader_ops_t*)AXIS2_MALLOC(env->allocator,
- sizeof(axis2_xml_reader_ops_t));
+ wrapper_impl->parser.ops = (axiom_reader_ops_t*)AXIS2_MALLOC(env->allocator,
+ sizeof(axiom_reader_ops_t));
if(!(wrapper_impl->parser.ops))
{
@@ -488,7 +488,7 @@
int AXIS2_CALL
-axis2_libxml2_reader_wrapper_next(axis2_xml_reader_t *parser,
+axis2_libxml2_reader_wrapper_next(axiom_reader_t *parser,
const axis2_env_t *env)
{
int ret_val = 0;
@@ -499,12 +499,12 @@
parser_impl = AXIS2_INTF_TO_IMPL(parser);
/* if end_element event after empty element event is not required remove
this if close
- if(parser_impl->current_event == AXIS2_XML_READER_EMPTY_ELEMENT)
+ if(parser_impl->current_event == AXIOM_READER_EMPTY_ELEMENT)
{
if the previous event was a empty element then create an end element
event
- parser_impl->current_event = AXIS2_XML_READER_END_ELEMENT;
- return AXIS2_XML_READER_END_ELEMENT;
+ parser_impl->current_event = AXIOM_READER_END_ELEMENT;
+ return AXIOM_READER_END_ELEMENT;
}
*/
ret_val = xmlTextReaderRead(parser_impl->reader);
@@ -532,8 +532,8 @@
}
if(empty_check == 1)
{
- parser_impl->current_event = AXIS2_XML_READER_EMPTY_ELEMENT;
- return AXIS2_XML_READER_EMPTY_ELEMENT;
+ parser_impl->current_event = AXIOM_READER_EMPTY_ELEMENT;
+ return AXIOM_READER_EMPTY_ELEMENT;
}
return parser_impl->event_map[node];
}
@@ -542,7 +542,7 @@
}
axis2_status_t AXIS2_CALL
-axis2_libxml2_reader_wrapper_free(axis2_xml_reader_t *parser,
+axis2_libxml2_reader_wrapper_free(axiom_reader_t *parser,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -560,21 +560,21 @@
}
int AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_attribute_count(axis2_xml_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_attribute_count(axiom_reader_t *parser,
const axis2_env_t *env)
{
axis2_libxml2_reader_wrapper_impl_t *parser_impl=NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
parser_impl = AXIS2_INTF_TO_IMPL(parser);
- if(parser_impl->current_event == AXIS2_XML_READER_START_ELEMENT ||
- parser_impl->current_event == AXIS2_XML_READER_EMPTY_ELEMENT )
+ if(parser_impl->current_event == AXIOM_READER_START_ELEMENT ||
+ parser_impl->current_event == AXIOM_READER_EMPTY_ELEMENT )
return parser_impl->current_attribute_count;
else
return 0;
}
axis2_char_t* AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_attribute_name_by_number(axis2_xml_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_attribute_name_by_number(axiom_reader_t *parser,
const axis2_env_t *env,
int i)
{
@@ -596,7 +596,7 @@
}
axis2_char_t* AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_attribute_prefix_by_number(axis2_xml_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_attribute_prefix_by_number(axiom_reader_t *parser,
const axis2_env_t *env,
int i)
{
@@ -619,7 +619,7 @@
axis2_char_t* AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_attribute_value_by_number(axis2_xml_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_attribute_value_by_number(axiom_reader_t *parser,
const axis2_env_t *env,
int i)
{
@@ -643,7 +643,7 @@
axis2_char_t* AXIS2_CALL
axis2_libxml2_reader_wrapper_get_attribute_namespace_by_number
- (axis2_xml_reader_t *parser,
+ (axiom_reader_t *parser,
const axis2_env_t *env,
int i)
{
@@ -667,7 +667,7 @@
}
axis2_char_t* AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_value(axis2_xml_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_value(axiom_reader_t *parser,
const axis2_env_t *env)
{
axis2_libxml2_reader_wrapper_impl_t *parser_impl = NULL;
@@ -679,14 +679,14 @@
}
int AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_namespace_count(axis2_xml_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_namespace_count(axiom_reader_t *parser,
const axis2_env_t *env)
{
axis2_libxml2_reader_wrapper_impl_t *parser_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
parser_impl = AXIS2_INTF_TO_IMPL(parser);
- if(parser_impl->current_event == AXIS2_XML_READER_START_ELEMENT ||
- parser_impl->current_event == AXIS2_XML_READER_EMPTY_ELEMENT)
+ if(parser_impl->current_event == AXIOM_READER_START_ELEMENT ||
+ parser_impl->current_event == AXIOM_READER_EMPTY_ELEMENT)
return parser_impl->current_namespace_count;
else
return 0;
@@ -694,7 +694,7 @@
axis2_char_t* AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_namespace_uri_by_number(axis2_xml_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_namespace_uri_by_number(axiom_reader_t *parser,
const axis2_env_t *env,
int i)
{
@@ -717,7 +717,7 @@
}
axis2_char_t* AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_namespace_prefix_by_number(axis2_xml_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_namespace_prefix_by_number(axiom_reader_t *parser,
const axis2_env_t *env,
int i)
{
@@ -743,7 +743,7 @@
}
axis2_char_t* AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_prefix(axis2_xml_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_prefix(axiom_reader_t *parser,
const axis2_env_t *env)
{
axis2_libxml2_reader_wrapper_impl_t *parser_impl = NULL;
@@ -754,7 +754,7 @@
}
axis2_char_t* AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_name(axis2_xml_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_name(axiom_reader_t *parser,
const axis2_env_t *env)
{
axis2_libxml2_reader_wrapper_impl_t *parser_impl = NULL;
@@ -766,26 +766,26 @@
}
axis2_char_t* AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_pi_target(axis2_xml_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_pi_target(axiom_reader_t *parser,
const axis2_env_t *env)
{
axis2_libxml2_reader_wrapper_impl_t *parser_impl = NULL;
AXIS2_ENV_CHECK( env, NULL);
parser_impl = AXIS2_INTF_TO_IMPL(parser);
- if(parser_impl->current_event == AXIS2_XML_READER_PROCESSING_INSTRUCTION)
+ if(parser_impl->current_event == AXIOM_READER_PROCESSING_INSTRUCTION)
return (axis2_char_t*)xmlTextReaderLocalName(parser_impl->reader);
else
return NULL;
}
axis2_char_t* AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_dtd(axis2_xml_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_dtd(axiom_reader_t *parser,
const axis2_env_t *env)
{
axis2_libxml2_reader_wrapper_impl_t *parser_impl = NULL;
AXIS2_ENV_CHECK( env, NULL);
parser_impl = AXIS2_INTF_TO_IMPL(parser);
- if(parser_impl->current_event == AXIS2_XML_READER_DOCUMENT_TYPE)
+ if(parser_impl->current_event == AXIOM_READER_DOCUMENT_TYPE)
return (axis2_char_t*)xmlTextReaderLocalName(parser_impl->reader);
else
return NULL;
@@ -793,13 +793,13 @@
axis2_char_t* AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_pi_data(axis2_xml_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_pi_data(axiom_reader_t *parser,
const axis2_env_t *env)
{
axis2_libxml2_reader_wrapper_impl_t *parser_impl = NULL;
AXIS2_ENV_CHECK( env, NULL);
parser_impl = AXIS2_INTF_TO_IMPL(parser);
- if(parser_impl->current_event == AXIS2_XML_READER_PROCESSING_INSTRUCTION)
+ if(parser_impl->current_event == AXIOM_READER_PROCESSING_INSTRUCTION)
return (axis2_char_t*)xmlTextReaderValue(parser_impl->reader);
else
{
@@ -808,7 +808,7 @@
}
axis2_status_t AXIS2_CALL
-axis2_libxml2_reader_wrapper_xml_free(axis2_xml_reader_t *parser,
+axis2_libxml2_reader_wrapper_xml_free(axiom_reader_t *parser,
const axis2_env_t *env,
void *data)
{
@@ -819,7 +819,7 @@
}
axis2_char_t* AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_char_set_encoding(axis2_xml_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_char_set_encoding(axiom_reader_t *parser,
const axis2_env_t *env)
{
axis2_libxml2_reader_wrapper_impl_t *reader_impl = NULL;
@@ -830,7 +830,7 @@
axis2_char_t* AXIS2_CALL
axis2_libxml2_reader_wrapper_get_namespace_uri
- (axis2_xml_reader_t *parser,
+ (axiom_reader_t *parser,
const axis2_env_t *env)
{
axis2_libxml2_reader_wrapper_impl_t *parser_impl = NULL;
@@ -841,7 +841,7 @@
axis2_char_t* AXIS2_CALL
axis2_libxml2_reader_wrapper_get_namespace_uri_by_prefix
- (axis2_xml_reader_t *parser,
+ (axiom_reader_t *parser,
const axis2_env_t *env,
axis2_char_t *prefix)
{
@@ -854,7 +854,7 @@
return (axis2_char_t *)xmlTextReaderLookupNamespace(parser_impl->reader, (const xmlChar *)prefix);
}
-axis2_status_t axis2_libxml2_reader_wrapper_fill_maps(axis2_xml_reader_t *parser,
+axis2_status_t axis2_libxml2_reader_wrapper_fill_maps(axiom_reader_t *parser,
const axis2_env_t *env)
{
int libxml2_attribute_count = 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org