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:40:36 UTC
svn commit: r414563 [2/3] - in /webservices/axis2/trunk/c: axiom/include/
axiom/src/om/ axiom/src/parser/guththila/ axiom/src/parser/libxml2/
axiom/src/soap/ axiom/test/om/ axiom/test/soap/ include/
modules/core/clientapi/ modules/core/clientapi/diclie...
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=414563&r1=414562&r2=414563&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:40:33 2006
@@ -15,7 +15,7 @@
*
*/
-#include <axiom_reader.h>
+#include <axiom_xml_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(axiom_reader_t *parser,
+guththila_xml_reader_wrapper_next(axiom_xml_reader_t *parser,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-guththila_xml_reader_wrapper_free(axiom_reader_t *parser,
+guththila_xml_reader_wrapper_free(axiom_xml_reader_t *parser,
const axis2_env_t *env);
int AXIS2_CALL
-guththila_xml_reader_wrapper_get_attribute_count(axiom_reader_t *parser,
+guththila_xml_reader_wrapper_get_attribute_count(axiom_xml_reader_t *parser,
const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
-guththila_xml_reader_wrapper_get_attribute_name_by_number(axiom_reader_t *parser,
+guththila_xml_reader_wrapper_get_attribute_name_by_number(axiom_xml_reader_t *parser,
const axis2_env_t *env,
int i);
axis2_char_t* AXIS2_CALL
-guththila_xml_reader_wrapper_get_attribute_prefix_by_number(axiom_reader_t *parser,
+guththila_xml_reader_wrapper_get_attribute_prefix_by_number(axiom_xml_reader_t *parser,
const axis2_env_t *env,
int i);
axis2_char_t* AXIS2_CALL
guththila_xml_reader_wrapper_get_attribute_value_by_number(
- axiom_reader_t *parser,
+ axiom_xml_reader_t *parser,
const axis2_env_t *env,
int i);
axis2_char_t* AXIS2_CALL
guththila_xml_reader_wrapper_get_attribute_namespace_by_number(
- axiom_reader_t *parser,
+ axiom_xml_reader_t *parser,
const axis2_env_t *env,
int i);
axis2_char_t* AXIS2_CALL
-guththila_xml_reader_wrapper_get_value(axiom_reader_t *parser,
+guththila_xml_reader_wrapper_get_value(axiom_xml_reader_t *parser,
const axis2_env_t *env);
int AXIS2_CALL
-guththila_xml_reader_wrapper_get_namespace_count(axiom_reader_t *parser,
+guththila_xml_reader_wrapper_get_namespace_count(axiom_xml_reader_t *parser,
const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
-guththila_xml_reader_wrapper_get_namespace_uri_by_number(axiom_reader_t *parser,
+guththila_xml_reader_wrapper_get_namespace_uri_by_number(axiom_xml_reader_t *parser,
const axis2_env_t *env,
int i);
axis2_char_t* AXIS2_CALL
guththila_xml_reader_wrapper_get_namespace_prefix_by_number(
- axiom_reader_t *parser,
+ axiom_xml_reader_t *parser,
const axis2_env_t *env,
int i);
axis2_char_t* AXIS2_CALL
-guththila_xml_reader_wrapper_get_prefix(axiom_reader_t *parser,
+guththila_xml_reader_wrapper_get_prefix(axiom_xml_reader_t *parser,
const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
-guththila_xml_reader_wrapper_get_name(axiom_reader_t *parser,
+guththila_xml_reader_wrapper_get_name(axiom_xml_reader_t *parser,
const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
-guththila_xml_reader_wrapper_get_pi_target(axiom_reader_t *parser,
+guththila_xml_reader_wrapper_get_pi_target(axiom_xml_reader_t *parser,
const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
-guththila_xml_reader_wrapper_get_pi_data(axiom_reader_t *parser,
+guththila_xml_reader_wrapper_get_pi_data(axiom_xml_reader_t *parser,
const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
-guththila_xml_reader_wrapper_get_dtd(axiom_reader_t *parser,
+guththila_xml_reader_wrapper_get_dtd(axiom_xml_reader_t *parser,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-guththila_xml_reader_wrapper_xml_free(axiom_reader_t *parser,
+guththila_xml_reader_wrapper_xml_free(axiom_xml_reader_t *parser,
const axis2_env_t *env,
void *data);
@@ -111,7 +111,7 @@
typedef struct guththila_xml_reader_wrapper_impl
{
- axiom_reader_t parser;
+ axiom_xml_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] = 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;
+ parser->event_map[GUTHTHILA_START_DOCUMENT] = AXIOM_XML_READER_START_DOCUMENT;
+ parser->event_map[GUTHTHILA_START_ELEMENT] = AXIOM_XML_READER_START_ELEMENT;
+ parser->event_map[GUTHTHILA_END_ELEMENT] = AXIOM_XML_READER_END_ELEMENT;
+ parser->event_map[GUTHTHILA_SPACE] = AXIOM_XML_READER_SPACE;
+ parser->event_map[GUTHTHILA_EMPTY_ELEMENT] = AXIOM_XML_READER_EMPTY_ELEMENT;
+ parser->event_map[GUTHTHILA_CHARACTER] = AXIOM_XML_READER_CHARACTER;
+ parser->event_map[GUTHTHILA_ENTITY_REFERANCE] = AXIOM_XML_READER_ENTITY_REFERANCE;
+ parser->event_map[GUTHTHILA_COMMENT] = AXIOM_XML_READER_COMMENT;
return AXIS2_SUCCESS;
}
return AXIS2_FAILURE;
@@ -147,8 +147,8 @@
/********************************************************************************/
-AXIS2_EXTERN axiom_reader_t * AXIS2_CALL
-axiom_reader_create_for_file(const axis2_env_t *env,
+AXIS2_EXTERN axiom_xml_reader_t * AXIS2_CALL
+axiom_xml_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 = (axiom_reader_ops_t*)AXIS2_MALLOC(
+ guththila_impl->parser.ops = (axiom_xml_reader_ops_t*)AXIS2_MALLOC(
env->allocator,
- sizeof(axiom_reader_ops_t));
+ sizeof(axiom_xml_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 axiom_reader_t * AXIS2_CALL
-axiom_reader_create_for_io(const axis2_env_t *env,
+AXIS2_EXTERN axiom_xml_reader_t * AXIS2_CALL
+axiom_xml_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 = (axiom_reader_ops_t*)AXIS2_MALLOC(
+ guththila_impl->parser.ops = (axiom_xml_reader_ops_t*)AXIS2_MALLOC(
env->allocator,
- sizeof(axiom_reader_ops_t));
+ sizeof(axiom_xml_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(axiom_reader_t *parser,
+guththila_xml_reader_wrapper_next(axiom_xml_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(axiom_reader_t *parser,
+guththila_xml_reader_wrapper_free(axiom_xml_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(axiom_reader_t *parser,
+guththila_xml_reader_wrapper_get_attribute_count(axiom_xml_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(axiom_reader_t *parser,
+guththila_xml_reader_wrapper_get_attribute_name_by_number(axiom_xml_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(axiom_reader_t *parser,
+guththila_xml_reader_wrapper_get_attribute_prefix_by_number(axiom_xml_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(axiom_reader_t *parser,
+guththila_xml_reader_wrapper_get_attribute_value_by_number(axiom_xml_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(
- axiom_reader_t *parser,
+ axiom_xml_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(axiom_reader_t *parser,
+guththila_xml_reader_wrapper_get_value(axiom_xml_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(axiom_reader_t *parser,
+guththila_xml_reader_wrapper_get_namespace_count(axiom_xml_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(axiom_reader_t *parser,
+guththila_xml_reader_wrapper_get_namespace_uri_by_number(axiom_xml_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(
- axiom_reader_t *parser,
+ axiom_xml_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(axiom_reader_t *parser,
+guththila_xml_reader_wrapper_get_prefix(axiom_xml_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(axiom_reader_t *parser,
+guththila_xml_reader_wrapper_get_name(axiom_xml_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(axiom_reader_t *parser,
+guththila_xml_reader_wrapper_get_pi_target(axiom_xml_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(axiom_reader_t *parser,
+guththila_xml_reader_wrapper_get_pi_data(axiom_xml_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(axiom_reader_t *parser,
+guththila_xml_reader_wrapper_get_dtd(axiom_xml_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(axiom_reader_t *parser,
+guththila_xml_reader_wrapper_xml_free(axiom_xml_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=414563&r1=414562&r2=414563&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:40:33 2006
@@ -17,32 +17,32 @@
#include <guththila_xml_stream_writer.h>
#include <axis2_utils.h>
#include <axis2_env.h>
-#include <axiom_writer.h>
+#include <axiom_xml_writer.h>
/*********************** function prototypes ***********************************/
axis2_status_t AXIS2_CALL
-guththila_xml_writer_wrapper_free(axiom_writer_t *writer,
+guththila_xml_writer_wrapper_free(axiom_xml_writer_t *writer,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_start_element(
- axiom_writer_t *writer,
+ axiom_xml_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *localname);
axis2_status_t AXIS2_CALL
-guththila_xml_writer_wrapper_end_start_element(axiom_writer_t *writer,
+guththila_xml_writer_wrapper_end_start_element(axiom_xml_writer_t *writer,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_start_element_with_namespace(
- axiom_writer_t *writer,
+ axiom_xml_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(
- axiom_writer_t *writer,
+ axiom_xml_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(
- axiom_writer_t *writer,
+ axiom_xml_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(
- axiom_writer_t *writer,
+ axiom_xml_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(
- axiom_writer_t *writer,
+ axiom_xml_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(axiom_writer_t *writer,
+guththila_xml_writer_wrapper_write_end_element(axiom_xml_writer_t *writer,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-guththila_xml_writer_wrapper_write_end_document(axiom_writer_t *writer,
+guththila_xml_writer_wrapper_write_end_document(axiom_xml_writer_t *writer,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-guththila_xml_writer_wrapper_write_attribute(axiom_writer_t *writer,
+guththila_xml_writer_wrapper_write_attribute(axiom_xml_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(
- axiom_writer_t *writer,
+ axiom_xml_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(
- axiom_writer_t *writer,
+ axiom_xml_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(axiom_writer_t *writer,
+guththila_xml_writer_wrapper_write_namespace(axiom_xml_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
- (axiom_writer_t *writer,
+ (axiom_xml_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *namespace_uri);
axis2_status_t AXIS2_CALL
-guththila_xml_writer_wrapper_write_comment(axiom_writer_t *writer,
+guththila_xml_writer_wrapper_write_comment(axiom_xml_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *value);
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_processing_instruction(
- axiom_writer_t *writer,
+ axiom_xml_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(
- axiom_writer_t *writer,
+ axiom_xml_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(axiom_writer_t *writer,
+guththila_xml_writer_wrapper_write_cdata(axiom_xml_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *data);
axis2_status_t AXIS2_CALL
-guththila_xml_writer_wrapper_write_dtd(axiom_writer_t *writer,
+guththila_xml_writer_wrapper_write_dtd(axiom_xml_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *dtd);
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_entity_ref(
- axiom_writer_t *writer,
+ axiom_xml_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *name);
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_start_document(
- axiom_writer_t *writer,
+ axiom_xml_writer_t *writer,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_start_document_with_version(
- axiom_writer_t *writer,
+ axiom_xml_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(
- axiom_writer_t *writer,
+ axiom_xml_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(
- axiom_writer_t *writer,
+ axiom_xml_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *text);
axis2_char_t* AXIS2_CALL
-guththila_xml_writer_wrapper_get_prefix( axiom_writer_t *writer,
+guththila_xml_writer_wrapper_get_prefix( axiom_xml_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *uri);
axis2_status_t AXIS2_CALL
-guththila_xml_writer_wrapper_set_prefix( axiom_writer_t *writer,
+guththila_xml_writer_wrapper_set_prefix( axiom_xml_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(
- axiom_writer_t *writer,
+ axiom_xml_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *uri);
axis2_status_t AXIS2_CALL
guththila_xml_writer_wrapper_write_encoded(
- axiom_writer_t *writer,
+ axiom_xml_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *text,
int in_attr);
void* AXIS2_CALL
-guththila_xml_writer_wrapper_get_xml(axiom_writer_t *writer,
+guththila_xml_writer_wrapper_get_xml(axiom_xml_writer_t *writer,
const axis2_env_t *env);
@@ -204,7 +204,7 @@
typedef struct guththila_xml_writer_wrapper_impl
{
- axiom_writer_t writer;
+ axiom_xml_writer_t writer;
guththila_xml_stream_writer_t *guththila_writer;
guththila_environment_t *guththila_env;
@@ -217,8 +217,8 @@
/****************************** End macro **************************************/
-AXIS2_EXTERN axiom_writer_t * AXIS2_CALL
-axiom_writer_create(const axis2_env_t *env,
+AXIS2_EXTERN axiom_xml_writer_t * AXIS2_CALL
+axiom_xml_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 = (axiom_writer_ops_t*)AXIS2_MALLOC(env->allocator,
- sizeof(axiom_writer_ops_t));
+ writer_impl->writer.ops = (axiom_xml_writer_ops_t*)AXIS2_MALLOC(env->allocator,
+ sizeof(axiom_xml_writer_ops_t));
if(!(writer_impl->writer.ops))
{
AXIS2_FREE(env->allocator,writer_impl);
@@ -328,19 +328,19 @@
return &(writer_impl->writer);
}
-AXIS2_EXTERN axiom_writer_t * AXIS2_CALL
-axiom_writer_create_for_memory(const axis2_env_t *env,
+AXIS2_EXTERN axiom_xml_writer_t * AXIS2_CALL
+axiom_xml_writer_create_for_memory(const axis2_env_t *env,
axis2_char_t *encoding,
int is_prefix_default,
int compression,
int type)
{
- return axiom_writer_create(env, NULL, encoding, is_prefix_default, compression);
+ return axiom_xml_writer_create(env, NULL, encoding, is_prefix_default, compression);
}
axis2_status_t AXIS2_CALL
-guththila_xml_writer_wrapper_free(axiom_writer_t *writer,
+guththila_xml_writer_wrapper_free(axiom_xml_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(
- axiom_writer_t *writer,
+ axiom_xml_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(axiom_writer_t *writer,
+guththila_xml_writer_wrapper_end_start_element(axiom_xml_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(
- axiom_writer_t *writer,
+ axiom_xml_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(
- axiom_writer_t *writer,
+ axiom_xml_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(
- axiom_writer_t *writer,
+ axiom_xml_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(
- axiom_writer_t *writer,
+ axiom_xml_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(
- axiom_writer_t *writer,
+ axiom_xml_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(axiom_writer_t *writer,
+guththila_xml_writer_wrapper_write_end_element(axiom_xml_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(axiom_writer_t *writer,
+guththila_xml_writer_wrapper_write_end_document(axiom_xml_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(axiom_writer_t *writer,
+guththila_xml_writer_wrapper_write_attribute(axiom_xml_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(
- axiom_writer_t *writer,
+ axiom_xml_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(
- axiom_writer_t *writer,
+ axiom_xml_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(axiom_writer_t *writer,
+guththila_xml_writer_wrapper_write_namespace(axiom_xml_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
- (axiom_writer_t *writer,
+ (axiom_xml_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(axiom_writer_t *writer,
+guththila_xml_writer_wrapper_write_comment(axiom_xml_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(
- axiom_writer_t *writer,
+ axiom_xml_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(
- axiom_writer_t *writer,
+ axiom_xml_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(axiom_writer_t *writer,
+guththila_xml_writer_wrapper_write_cdata(axiom_xml_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(axiom_writer_t *writer,
+guththila_xml_writer_wrapper_write_dtd(axiom_xml_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(
- axiom_writer_t *writer,
+ axiom_xml_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(
- axiom_writer_t *writer,
+ axiom_xml_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(
- axiom_writer_t *writer,
+ axiom_xml_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(
- axiom_writer_t *writer,
+ axiom_xml_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(
- axiom_writer_t *writer,
+ axiom_xml_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( axiom_writer_t *writer,
+guththila_xml_writer_wrapper_get_prefix( axiom_xml_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( axiom_writer_t *writer,
+guththila_xml_writer_wrapper_set_prefix( axiom_xml_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(
- axiom_writer_t *writer,
+ axiom_xml_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(
- axiom_writer_t *writer,
+ axiom_xml_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(axiom_writer_t *writer,
+guththila_xml_writer_wrapper_get_xml(axiom_xml_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=414563&r1=414562&r2=414563&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:40:33 2006
@@ -15,7 +15,7 @@
*
*/
- #include <axiom_reader.h>
+ #include <axiom_xml_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(axiom_reader_t *parser,
+axis2_libxml2_reader_wrapper_next(axiom_xml_reader_t *parser,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_libxml2_reader_wrapper_free(axiom_reader_t *parser,
+axis2_libxml2_reader_wrapper_free(axiom_xml_reader_t *parser,
const axis2_env_t *env);
int AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_attribute_count(axiom_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_attribute_count(axiom_xml_reader_t *parser,
const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_attribute_name_by_number(axiom_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_attribute_name_by_number(axiom_xml_reader_t *parser,
const axis2_env_t *env,
int i);
axis2_char_t* AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_attribute_prefix_by_number(axiom_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_attribute_prefix_by_number(axiom_xml_reader_t *parser,
const axis2_env_t *env,
int i);
axis2_char_t* AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_attribute_value_by_number(axiom_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_attribute_value_by_number(axiom_xml_reader_t *parser,
const axis2_env_t *env,
int i);
axis2_char_t* AXIS2_CALL
axis2_libxml2_reader_wrapper_get_attribute_namespace_by_number
- (axiom_reader_t *parser,
+ (axiom_xml_reader_t *parser,
const axis2_env_t *env,
int i);
axis2_char_t* AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_value(axiom_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_value(axiom_xml_reader_t *parser,
const axis2_env_t *env);
int AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_namespace_count(axiom_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_namespace_count(axiom_xml_reader_t *parser,
const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_namespace_uri_by_number(axiom_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_namespace_uri_by_number(axiom_xml_reader_t *parser,
const axis2_env_t *env,
int i);
axis2_char_t* AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_namespace_prefix_by_number(axiom_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_namespace_prefix_by_number(axiom_xml_reader_t *parser,
const axis2_env_t *env,
int i);
axis2_char_t* AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_prefix(axiom_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_prefix(axiom_xml_reader_t *parser,
const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_name(axiom_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_name(axiom_xml_reader_t *parser,
const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_pi_target(axiom_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_pi_target(axiom_xml_reader_t *parser,
const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_pi_data(axiom_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_pi_data(axiom_xml_reader_t *parser,
const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_dtd(axiom_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_dtd(axiom_xml_reader_t *parser,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_libxml2_reader_wrapper_xml_free(axiom_reader_t *parser,
+axis2_libxml2_reader_wrapper_xml_free(axiom_xml_reader_t *parser,
const axis2_env_t *env,
void *data);
axis2_char_t* AXIS2_CALL
-axis2_libxml2_reader_wrapper_get_char_set_encoding(axiom_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_char_set_encoding(axiom_xml_reader_t *parser,
const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
axis2_libxml2_reader_wrapper_get_namespace_uri
- (axiom_reader_t *parser,
+ (axiom_xml_reader_t *parser,
const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
axis2_libxml2_reader_wrapper_get_namespace_uri_by_prefix
- (axiom_reader_t *parser,
+ (axiom_xml_reader_t *parser,
const axis2_env_t *env,
axis2_char_t *prefix);
axis2_status_t
-axis2_libxml2_reader_wrapper_fill_maps(axiom_reader_t *parser,
+axis2_libxml2_reader_wrapper_fill_maps(axiom_xml_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(axiom_reader_t *reader);
+axis2_libxml2_reader_wrapper_init_ops(axiom_xml_reader_t *reader);
/************* End function parameters , axis2_libxml2_reader_wrapper_impl_t struct ***/
typedef struct axis2_libxml2_reader_wrapper_impl_t
{
- axiom_reader_t parser;
+ axiom_xml_reader_t parser;
xmlTextReaderPtr reader;
@@ -186,47 +186,47 @@
parser->event_map[i] = -1;
parser->event_map[XML_READER_TYPE_ELEMENT] =
- AXIOM_READER_START_ELEMENT;
+ AXIOM_XML_READER_START_ELEMENT;
parser->event_map[XML_READER_TYPE_ELEMENT] =
- AXIOM_READER_START_ELEMENT;
+ AXIOM_XML_READER_START_ELEMENT;
parser->event_map[XML_READER_TYPE_DOCUMENT] =
- AXIOM_READER_START_DOCUMENT;
+ AXIOM_XML_READER_START_DOCUMENT;
- parser->event_map[XML_READER_TYPE_TEXT] = AXIOM_READER_CHARACTER;
+ parser->event_map[XML_READER_TYPE_TEXT] = AXIOM_XML_READER_CHARACTER;
- parser->event_map[XML_READER_TYPE_CDATA] = AXIOM_READER_CDATA;
+ parser->event_map[XML_READER_TYPE_CDATA] = AXIOM_XML_READER_CDATA;
parser->event_map[XML_READER_TYPE_SIGNIFICANT_WHITESPACE] =
- AXIOM_READER_SPACE;
+ AXIOM_XML_READER_SPACE;
- parser->event_map[XML_READER_TYPE_WHITESPACE] = AXIOM_READER_SPACE;
+ parser->event_map[XML_READER_TYPE_WHITESPACE] = AXIOM_XML_READER_SPACE;
parser->event_map[XML_READER_TYPE_END_ELEMENT] =
- AXIOM_READER_END_ELEMENT;
+ AXIOM_XML_READER_END_ELEMENT;
parser->event_map [XML_READER_TYPE_ENTITY_REFERENCE] =
- AXIOM_READER_ENTITY_REFERENCE;
+ AXIOM_XML_READER_ENTITY_REFERENCE;
- parser->event_map [XML_READER_TYPE_END_ENTITY] = AXIOM_READER_SPACE;
+ parser->event_map [XML_READER_TYPE_END_ENTITY] = AXIOM_XML_READER_SPACE;
- parser->event_map[XML_READER_TYPE_ENTITY] = AXIOM_READER_SPACE;
+ parser->event_map[XML_READER_TYPE_ENTITY] = AXIOM_XML_READER_SPACE;
parser->event_map[XML_READER_TYPE_PROCESSING_INSTRUCTION] =
- AXIOM_READER_PROCESSING_INSTRUCTION;
+ AXIOM_XML_READER_PROCESSING_INSTRUCTION;
- parser->event_map[XML_READER_TYPE_COMMENT] = AXIOM_READER_COMMENT;
+ parser->event_map[XML_READER_TYPE_COMMENT] = AXIOM_XML_READER_COMMENT;
parser->event_map[XML_READER_TYPE_DOCUMENT_TYPE] =
- AXIOM_READER_DOCUMENT_TYPE;
+ AXIOM_XML_READER_DOCUMENT_TYPE;
return AXIS2_SUCCESS;
}
return AXIS2_FAILURE;
}
static void
-axis2_libxml2_reader_wrapper_init_ops(axiom_reader_t *parser)
+axis2_libxml2_reader_wrapper_init_ops(axiom_xml_reader_t *parser)
{
parser->ops->free =
axis2_libxml2_reader_wrapper_free;
@@ -273,22 +273,22 @@
/*******************************************************************************/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_reader_init()
+axiom_xml_reader_init()
{
xmlInitParser();
return AXIS2_SUCCESS;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_reader_cleanup()
+axiom_xml_reader_cleanup()
{
xmlCleanupParser();
return AXIS2_SUCCESS;
}
/*******************************************************************************/
-AXIS2_EXTERN axiom_reader_t * AXIS2_CALL
-axiom_reader_create_for_file(const axis2_env_t *env,
+AXIS2_EXTERN axiom_xml_reader_t * AXIS2_CALL
+axiom_xml_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 = (axiom_reader_ops_t*)AXIS2_MALLOC(env->allocator,
- sizeof(axiom_reader_ops_t));
+ wrapper_impl->parser.ops = (axiom_xml_reader_ops_t*)AXIS2_MALLOC(env->allocator,
+ sizeof(axiom_xml_reader_ops_t));
if(!(wrapper_impl->parser.ops))
{
@@ -339,8 +339,8 @@
/************** create function for io callback function **********************/
-AXIS2_EXTERN axiom_reader_t * AXIS2_CALL
-axiom_reader_create_for_io(const axis2_env_t *env,
+AXIS2_EXTERN axiom_xml_reader_t * AXIS2_CALL
+axiom_xml_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 = (axiom_reader_ops_t*)AXIS2_MALLOC(env->allocator,
- sizeof(axiom_reader_ops_t));
+ wrapper_impl->parser.ops = (axiom_xml_reader_ops_t*)AXIS2_MALLOC(env->allocator,
+ sizeof(axiom_xml_reader_ops_t));
if(!(wrapper_impl->parser.ops))
{
@@ -411,8 +411,8 @@
}
/***************** create function for character buffer or xml doc ************************/
-AXIS2_EXTERN axiom_reader_t * AXIS2_CALL
-axiom_reader_create_for_memory(const axis2_env_t *env,
+AXIS2_EXTERN axiom_xml_reader_t * AXIS2_CALL
+axiom_xml_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 = (axiom_reader_ops_t*)AXIS2_MALLOC(env->allocator,
- sizeof(axiom_reader_ops_t));
+ wrapper_impl->parser.ops = (axiom_xml_reader_ops_t*)AXIS2_MALLOC(env->allocator,
+ sizeof(axiom_xml_reader_ops_t));
if(!(wrapper_impl->parser.ops))
{
@@ -488,7 +488,7 @@
int AXIS2_CALL
-axis2_libxml2_reader_wrapper_next(axiom_reader_t *parser,
+axis2_libxml2_reader_wrapper_next(axiom_xml_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 == AXIOM_READER_EMPTY_ELEMENT)
+ if(parser_impl->current_event == AXIOM_XML_READER_EMPTY_ELEMENT)
{
if the previous event was a empty element then create an end element
event
- parser_impl->current_event = AXIOM_READER_END_ELEMENT;
- return AXIOM_READER_END_ELEMENT;
+ parser_impl->current_event = AXIOM_XML_READER_END_ELEMENT;
+ return AXIOM_XML_READER_END_ELEMENT;
}
*/
ret_val = xmlTextReaderRead(parser_impl->reader);
@@ -532,8 +532,8 @@
}
if(empty_check == 1)
{
- parser_impl->current_event = AXIOM_READER_EMPTY_ELEMENT;
- return AXIOM_READER_EMPTY_ELEMENT;
+ parser_impl->current_event = AXIOM_XML_READER_EMPTY_ELEMENT;
+ return AXIOM_XML_READER_EMPTY_ELEMENT;
}
return parser_impl->event_map[node];
}
@@ -542,7 +542,7 @@
}
axis2_status_t AXIS2_CALL
-axis2_libxml2_reader_wrapper_free(axiom_reader_t *parser,
+axis2_libxml2_reader_wrapper_free(axiom_xml_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(axiom_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_attribute_count(axiom_xml_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 == AXIOM_READER_START_ELEMENT ||
- parser_impl->current_event == AXIOM_READER_EMPTY_ELEMENT )
+ if(parser_impl->current_event == AXIOM_XML_READER_START_ELEMENT ||
+ parser_impl->current_event == AXIOM_XML_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(axiom_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_attribute_name_by_number(axiom_xml_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(axiom_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_attribute_prefix_by_number(axiom_xml_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(axiom_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_attribute_value_by_number(axiom_xml_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
- (axiom_reader_t *parser,
+ (axiom_xml_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(axiom_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_value(axiom_xml_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(axiom_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_namespace_count(axiom_xml_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 == AXIOM_READER_START_ELEMENT ||
- parser_impl->current_event == AXIOM_READER_EMPTY_ELEMENT)
+ if(parser_impl->current_event == AXIOM_XML_READER_START_ELEMENT ||
+ parser_impl->current_event == AXIOM_XML_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(axiom_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_namespace_uri_by_number(axiom_xml_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(axiom_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_namespace_prefix_by_number(axiom_xml_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(axiom_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_prefix(axiom_xml_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(axiom_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_name(axiom_xml_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(axiom_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_pi_target(axiom_xml_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 == AXIOM_READER_PROCESSING_INSTRUCTION)
+ if(parser_impl->current_event == AXIOM_XML_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(axiom_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_dtd(axiom_xml_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 == AXIOM_READER_DOCUMENT_TYPE)
+ if(parser_impl->current_event == AXIOM_XML_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(axiom_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_pi_data(axiom_xml_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 == AXIOM_READER_PROCESSING_INSTRUCTION)
+ if(parser_impl->current_event == AXIOM_XML_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(axiom_reader_t *parser,
+axis2_libxml2_reader_wrapper_xml_free(axiom_xml_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(axiom_reader_t *parser,
+axis2_libxml2_reader_wrapper_get_char_set_encoding(axiom_xml_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
- (axiom_reader_t *parser,
+ (axiom_xml_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
- (axiom_reader_t *parser,
+ (axiom_xml_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(axiom_reader_t *parser,
+axis2_status_t axis2_libxml2_reader_wrapper_fill_maps(axiom_xml_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