You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by du...@apache.org on 2007/03/09 11:17:31 UTC
svn commit: r516351 - in /webservices/axis2/trunk/c/axiom:
include/axiom_xml_reader.h
src/parser/guththila/guththila_xml_reader_wrapper.c src/util/om_util.c
Author: dushshantha
Date: Fri Mar 9 02:17:30 2007
New Revision: 516351
URL: http://svn.apache.org/viewvc?view=rev&rev=516351
Log:
indentation corrected
Modified:
webservices/axis2/trunk/c/axiom/include/axiom_xml_reader.h
webservices/axis2/trunk/c/axiom/src/parser/guththila/guththila_xml_reader_wrapper.c
webservices/axis2/trunk/c/axiom/src/util/om_util.c
Modified: webservices/axis2/trunk/c/axiom/include/axiom_xml_reader.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_xml_reader.h?view=diff&rev=516351&r1=516350&r2=516351
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_xml_reader.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_xml_reader.h Fri Mar 9 02:17:30 2007
@@ -79,8 +79,8 @@
*/
int(AXIS2_CALL *
- next)(axiom_xml_reader_t *parser,
- const axis2_env_t *env);
+ next)(axiom_xml_reader_t *parser,
+ const axis2_env_t *env);
/**
* free pull_parser
@@ -90,8 +90,8 @@
*/
axis2_status_t(AXIS2_CALL *
- free)(axiom_xml_reader_t *parser,
- const axis2_env_t *env);
+ free)(axiom_xml_reader_t *parser,
+ const axis2_env_t *env);
/**
* Get the Number of attributes in the current element
* @param parser axiom_xml_reader
@@ -100,8 +100,8 @@
*/
int(AXIS2_CALL *
- get_attribute_count)(axiom_xml_reader_t *parser,
- const axis2_env_t *env);
+ get_attribute_count)(axiom_xml_reader_t *parser,
+ const axis2_env_t *env);
/** This is used to get an attribute's localname using an index relative to
@@ -114,9 +114,9 @@
* caller must free the value using AXIOM_XML_READER_XML_FREE macro
*/
axis2_char_t*(AXIS2_CALL *
- get_attribute_name_by_number)(axiom_xml_reader_t *parser,
- const axis2_env_t *env,
- int i);
+ get_attribute_name_by_number)(axiom_xml_reader_t *parser,
+ const axis2_env_t *env,
+ int i);
/** This is used to get an attribute's prefix using an index relative to
* current element. The iterations are not zero based.
@@ -129,11 +129,11 @@
*/
axis2_char_t*(AXIS2_CALL *
- get_attribute_prefix_by_number)(axiom_xml_reader_t *parser,
- const axis2_env_t *env,
- int i);
+ get_attribute_prefix_by_number)(axiom_xml_reader_t *parser,
+ const axis2_env_t *env,
+ int i);
- /** get an attribute's value using an index relative to
+ /** Gets an attribute's value using an index relative to
* current element. The iterations are not zero based.
* To access the first attribute use 1 for parameter i
* @param parser parser struct
@@ -144,11 +144,11 @@
*/
axis2_char_t*(AXIS2_CALL *
- get_attribute_value_by_number)(axiom_xml_reader_t *parser,
- const axis2_env_t *env,
- int i);
+ get_attribute_value_by_number)(axiom_xml_reader_t *parser,
+ const axis2_env_t *env,
+ int i);
- /** get an attribute's namespace uri using an index relative to
+ /** Gets an attribute's namespace uri using an index relative to
* current element. The iterations are not zero based.
* To access the first attribute use 1 for parameter i
* @param parser parser struct
@@ -159,20 +159,19 @@
*/
axis2_char_t*(AXIS2_CALL *
- get_attribute_namespace_by_number)(axiom_xml_reader_t *parser,
- const axis2_env_t *env,
- int i);
+ get_attribute_namespace_by_number)(axiom_xml_reader_t *parser,
+ const axis2_env_t *env,
+ int i);
- /** returns the text value of current element
+ /** Returns the text value of current element
* @param parser pointer to parser
* @param env environment, MUST not be NULL
* @returns Text Value, NULL on error
* caller must free the value using AXIOM_XML_READER_XML_FREE macro
*/
-
axis2_char_t*(AXIS2_CALL *
- get_value)(axiom_xml_reader_t *parser,
- const axis2_env_t *env);
+ get_value)(axiom_xml_reader_t *parser,
+ const axis2_env_t *env);
/**
* Returns the namespace count of current element
@@ -181,23 +180,23 @@
* @returns namespace count of current element,
*/
int(AXIS2_CALL *
- get_namespace_count)(axiom_xml_reader_t *parser,
- const axis2_env_t *env);
+ get_namespace_count)(axiom_xml_reader_t *parser,
+ const axis2_env_t *env);
/**
- * access the namespace uri of the namespaces declared in current element
+ * Accesses the namespace uri of the namespaces declared in current element
* using an index
* @param parser parser struct
* @param env environment
* @param i index
- * @returns namespace uri of corresponding namespace
- * caller must free the value using AXIOM_XML_READER_XML_FREE macro
+ * @returns namespace uri of corresponding namespace
+ * caller must free the value using AXIOM_XML_READER_XML_FREE macro
*/
axis2_char_t*(AXIS2_CALL *
- get_namespace_uri_by_number)(axiom_xml_reader_t *parser,
- const axis2_env_t *env,
- int i);
+ get_namespace_uri_by_number)(axiom_xml_reader_t *parser,
+ const axis2_env_t *env,
+ int i);
/**
- * access the namespace prefix of the namespaces declared in current element
+ * Accesses the namespace prefix of the namespaces declared in current element
* using an index
* @param parser parser struct
* @param env environment
@@ -206,9 +205,10 @@
* caller must free the value using AXIOM_XML_READER_XML_FREE macro
*/
axis2_char_t*(AXIS2_CALL *
- get_namespace_prefix_by_number)(axiom_xml_reader_t *parser,
- const axis2_env_t *env,
- int i);
+ get_namespace_prefix_by_number)(axiom_xml_reader_t *parser,
+ const axis2_env_t *env,
+ int i);
+
/**
* Used to obtain the current element prefix
* @param parser parser struct
@@ -216,55 +216,54 @@
* @returns prefix , NULL on error
* caller must free the value using AXIOM_XML_READER_XML_FREE macro
*/
-
axis2_char_t*(AXIS2_CALL *
- get_prefix)(axiom_xml_reader_t *parser,
- const axis2_env_t *env);
+ get_prefix)(axiom_xml_reader_t *parser,
+ const axis2_env_t *env);
+
/**
- * Used to obtain the current element localname
+ * Used to obtain the current element localname
* @param parser parser struct
* @param env environment struct
* @returns localname , NULL on error
* caller must free the value using AXIOM_XML_READER_XML_FREE macro
*/
axis2_char_t*(AXIS2_CALL *
- get_name)(axiom_xml_reader_t *parser,
- const axis2_env_t *env);
+ get_name)(axiom_xml_reader_t *parser,
+ const axis2_env_t *env);
+
/**
* Used to get the processingInstruction target
* @param parser parser struct
* @param env environment, MUST NOT be NULL.
* @returns target value of processingInstruction
- * caller must free the value using AXIOM_XML_READER_XML_FREE macro
+ * caller must free the value using AXIOM_XML_READER_XML_FREE macro
*/
-
-
-
axis2_char_t*(AXIS2_CALL *
- get_pi_target)(axiom_xml_reader_t *parser,
- const axis2_env_t *env);
+ get_pi_target)(axiom_xml_reader_t *parser,
+ const axis2_env_t *env);
+
/**
- * gets the processingInstruction data
- *@param parser parser struct
- *@param env environment, MUST NOT be NULL.
- *@returns data of processingInstruction
- * caller must free the value using AXIOM_XML_READER_XML_FREE macro
+ * Gets the processingInstruction data
+ * @param parser parser struct
+ * @param env environment, MUST NOT be NULL.
+ * @returns data of processingInstruction
+ * caller must free the value using AXIOM_XML_READER_XML_FREE macro
*/
-
-
axis2_char_t*(AXIS2_CALL *
- get_pi_data)(axiom_xml_reader_t *parser,
- const axis2_env_t *env);
+ get_pi_data)(axiom_xml_reader_t *parser,
+ const axis2_env_t *env);
+
/**
- * used to get the DTD
+ * Used to get the DTD
* @param parser pointer to pull parser struct
* @param env environment, MUST NOT be NULL.
* @return text of doctype declaration. NULL is returns of no data
- * exists.
+ * exists.
*/
axis2_char_t*(AXIS2_CALL *
- get_dtd)(axiom_xml_reader_t *parser,
- const axis2_env_t *env);
+ get_dtd)(axiom_xml_reader_t *parser,
+ const axis2_env_t *env);
+
/**
* Free function , this function wraps the underlying parser's
* xml free function. For freeing values obatined by calling
@@ -273,34 +272,33 @@
* @param env environment, MUST NOT be NULL.
* @param data data values to be destroyed
* @return status of the op, AXIS2_SUCCESS on success,
- * AXIS2_FAILURE on error.
+ * AXIS2_FAILURE on error.
*/
axis2_status_t(AXIS2_CALL *
- xml_free)(axiom_xml_reader_t *parser,
- const axis2_env_t *env,
- void *data);
+ xml_free)(axiom_xml_reader_t *parser,
+ const axis2_env_t *env,
+ void *data);
/**
- * get the char set encoding of the parser
+ * Gets the char set encoding of the parser
* @param parser xml parser
* @param env environment
* @returns char set encoding string or NULL in failure
*/
axis2_char_t*(AXIS2_CALL *
- get_char_set_encoding)(axiom_xml_reader_t *parser,
- const axis2_env_t *env);
- /** returns the namespace uri associated with current node */
- axis2_char_t*(AXIS2_CALL *
- get_namespace_uri)(axiom_xml_reader_t *parser,
- const axis2_env_t *env);
+ get_char_set_encoding)(axiom_xml_reader_t *parser,
+ const axis2_env_t *env);
+ /** Returns the namespace uri associated with current node */
axis2_char_t*(AXIS2_CALL *
- get_namespace_uri_by_prefix)(axiom_xml_reader_t *parser,
- const axis2_env_t *env,
- axis2_char_t *prefix);
-
+ get_namespace_uri)(axiom_xml_reader_t *parser,
+ const axis2_env_t *env);
+ axis2_char_t*(AXIS2_CALL *
+ get_namespace_uri_by_prefix)(axiom_xml_reader_t *parser,
+ const axis2_env_t *env,
+ axis2_char_t *prefix);
};
/**
@@ -313,18 +311,18 @@
};
/**
- * create an instance of axiom_xml_reader to parse
+ * Creates an instance of axiom_xml_reader to parse
* a file using an xml document in a file system
* @param env environment struct, must not be null
* @param filename url of an xml document
* @returns a pointer to xml_pull_parser_t struct
- * NULL on error with error code set in the environment's error
+ * NULL on error with error code set in the environment's error
*/
-
- AXIS2_EXTERN axiom_xml_reader_t * AXIS2_CALL
+ 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);
+ char *filename,
+ const axis2_char_t *encoding);
+
/**
* This create an instance of axiom_xml_reader to
* parse a xml document in a buffer. It takes a callback
@@ -335,38 +333,36 @@
* buffer on the fly while parsing.
* @param env environment MUST NOT be NULL.
* @param read_input_callback() callback function that fills
- * a char buffer with size @size
- * @param buffer a character buffer
- * @param size size of the buffer to be filled
+ * a char buffer with size @size
+ * @param buffer a character buffer
+ * @param size size of the buffer to be filled
* @param encoding encoding scheme of the xml stream
*/
-
- AXIS2_EXTERN axiom_xml_reader_t * AXIS2_CALL
+ AXIS2_EXTERN axiom_xml_reader_t *AXIS2_CALL
axiom_xml_reader_create_for_io(const axis2_env_t *env,
- AXIS2_READ_INPUT_CALLBACK,
- AXIS2_CLOSE_INPUT_CALLBACK,
- void *ctx,
- const axis2_char_t *encoding);
+ AXIS2_READ_INPUT_CALLBACK,
+ AXIS2_CLOSE_INPUT_CALLBACK,
+ void *ctx,
+ const axis2_char_t *encoding);
/**
- * create an axiom_xml_reader_t using a buffer, which is the xml input
+ * Create an axiom_xml_reader_t using a buffer, which is the xml input
* @param env environment, MUST not be NULL
* @param buffer xml input string in a char buffer
* @param size size of the @buffer
* @param encoding encoding of the xml
* @return pointer to axiom_xml_reader_t struct on success , NULL otherwise
*/
- AXIS2_EXTERN axiom_xml_reader_t * AXIS2_CALL
+ 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,
- int type);
+ void *container,
+ int size,
+ const axis2_char_t *encoding,
+ int type);
/**
* init function initializes the parser
*/
-
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_xml_reader_init();
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?view=diff&rev=516351&r1=516350&r2=516351
==============================================================================
--- 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 Fri Mar 9 02:17:30 2007
@@ -27,86 +27,78 @@
int AXIS2_CALL
guththila_xml_reader_wrapper_next(axiom_xml_reader_t *parser,
- const axis2_env_t *env);
-
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
guththila_xml_reader_wrapper_free(axiom_xml_reader_t *parser,
- const axis2_env_t *env);
-
+ const axis2_env_t *env);
int AXIS2_CALL
guththila_xml_reader_wrapper_get_attribute_count(axiom_xml_reader_t *parser,
- const axis2_env_t *env);
+ const axis2_env_t *env);
-axis2_char_t* AXIS2_CALL
+axis2_char_t *AXIS2_CALL
guththila_xml_reader_wrapper_get_attribute_name_by_number(axiom_xml_reader_t *parser,
- const axis2_env_t *env,
- int i);
+ const axis2_env_t *env,
+ int i);
-axis2_char_t* AXIS2_CALL
+axis2_char_t *AXIS2_CALL
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_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_xml_reader_t *parser,
+axis2_char_t *AXIS2_CALL
+guththila_xml_reader_wrapper_get_attribute_value_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_namespace_by_number(axiom_xml_reader_t *parser,
+ const axis2_env_t *env,
+ int i);
-axis2_char_t* AXIS2_CALL
+axis2_char_t *AXIS2_CALL
guththila_xml_reader_wrapper_get_value(axiom_xml_reader_t *parser,
- const axis2_env_t *env);
+ const axis2_env_t *env);
int AXIS2_CALL
guththila_xml_reader_wrapper_get_namespace_count(axiom_xml_reader_t *parser,
- const axis2_env_t *env);
+ const axis2_env_t *env);
-axis2_char_t* AXIS2_CALL
+axis2_char_t *AXIS2_CALL
guththila_xml_reader_wrapper_get_namespace_uri_by_number(axiom_xml_reader_t *parser,
- const axis2_env_t *env,
- int i);
+ const axis2_env_t *env,
+ int i);
-axis2_char_t* AXIS2_CALL
-guththila_xml_reader_wrapper_get_namespace_prefix_by_number(
- axiom_xml_reader_t *parser,
+axis2_char_t *AXIS2_CALL
+guththila_xml_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_char_t *AXIS2_CALL
guththila_xml_reader_wrapper_get_prefix(axiom_xml_reader_t *parser,
- const axis2_env_t *env);
+ const axis2_env_t *env);
-axis2_char_t* AXIS2_CALL
+axis2_char_t *AXIS2_CALL
guththila_xml_reader_wrapper_get_name(axiom_xml_reader_t *parser,
- const axis2_env_t *env);
+ const axis2_env_t *env);
-axis2_char_t* AXIS2_CALL
+axis2_char_t *AXIS2_CALL
guththila_xml_reader_wrapper_get_pi_target(axiom_xml_reader_t *parser,
- const axis2_env_t *env);
+ const axis2_env_t *env);
-axis2_char_t* AXIS2_CALL
+axis2_char_t *AXIS2_CALL
guththila_xml_reader_wrapper_get_pi_data(axiom_xml_reader_t *parser,
- const axis2_env_t *env);
+ const axis2_env_t *env);
-axis2_char_t* AXIS2_CALL
+axis2_char_t *AXIS2_CALL
guththila_xml_reader_wrapper_get_dtd(axiom_xml_reader_t *parser,
- const axis2_env_t *env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
guththila_xml_reader_wrapper_xml_free(axiom_xml_reader_t *parser,
- const axis2_env_t *env,
- void *data);
-
+ const axis2_env_t *env,
+ void *data);
/*********** guththila_xml_reader_wrapper_impl_t wrapper struct *******************/
@@ -129,7 +121,7 @@
/**********End macros -- event_map initializing function *********************/
static axis2_status_t guththila_xml_reader_wrapper_init_map(
- guththila_xml_reader_wrapper_impl_t *parser)
+guththila_xml_reader_wrapper_impl_t *parser)
{
if (parser)
{
@@ -148,18 +140,18 @@
/********************************************************************************/
-AXIS2_EXTERN axiom_xml_reader_t * AXIS2_CALL
+AXIS2_EXTERN axiom_xml_reader_t *AXIS2_CALL
axiom_xml_reader_create_for_file(const axis2_env_t *env,
- char* filename,
- const char *encoding)
+ char* filename,
+ const char *encoding)
{
guththila_xml_reader_wrapper_impl_t *guththila_impl = NULL;
guththila_t *guththila = NULL;
AXIS2_ENV_CHECK(env, NULL);
- guththila_impl = AXIS2_MALLOC(env->allocator,
- sizeof(guththila_xml_reader_wrapper_impl_t));
+ guththila_impl =
+ AXIS2_MALLOC(env->allocator, sizeof(guththila_xml_reader_wrapper_impl_t));
if (!guththila_impl)
{
@@ -179,7 +171,7 @@
}
guththila = guththila_create((axis2_env_t *)env,
- guththila_impl->reader);
+ guththila_impl->reader);
if (!guththila)
{
AXIS2_FREE(env->allocator, guththila_impl);
@@ -187,12 +179,11 @@
return NULL;
}
-
guththila_impl->guththila_parser = guththila;
guththila_impl->parser.ops = NULL;
guththila_impl->parser.ops = (axiom_xml_reader_ops_t*)AXIS2_MALLOC(
- env->allocator,
- sizeof(axiom_xml_reader_ops_t));
+ env->allocator,
+ sizeof(axiom_xml_reader_ops_t));
if (!(guththila_impl->parser.ops))
{
guththila_free((axis2_env_t *)env, guththila);
@@ -245,10 +236,10 @@
axiom_xml_reader_t * AXIS2_CALL
axiom_xml_reader_create_for_io(const axis2_env_t *env,
- AXIS2_READ_INPUT_CALLBACK read_input_callback,
- int(*close_input_callback)(void *ctx),
- void *ctx,
- const char *encoding)
+ AXIS2_READ_INPUT_CALLBACK read_input_callback,
+ int(*close_input_callback)(void *ctx),
+ void *ctx,
+ const char *encoding)
{
guththila_xml_reader_wrapper_impl_t *guththila_impl = NULL;
guththila_t *guththila = NULL;
@@ -256,7 +247,7 @@
AXIS2_ENV_CHECK(env, NULL);
guththila_impl = AXIS2_MALLOC(env->allocator,
- sizeof(guththila_xml_reader_wrapper_impl_t));
+ sizeof(guththila_xml_reader_wrapper_impl_t));
if (!guththila_impl)
{
@@ -264,7 +255,6 @@
return NULL;
}
-
/*-------difference of two create function is here--------*/
guththila_impl->reader =
guththila_reader_create_for_io((axis2_env_t *)env, read_input_callback, ctx);
@@ -277,7 +267,7 @@
}
guththila = guththila_create((axis2_env_t *)env,
- guththila_impl->reader);
+ guththila_impl->reader);
if (!guththila)
{
AXIS2_FREE(env->allocator, guththila_impl);
@@ -285,12 +275,11 @@
return NULL;
}
-
guththila_impl->guththila_parser = guththila;
guththila_impl->parser.ops = NULL;
guththila_impl->parser.ops = (axiom_xml_reader_ops_t*)AXIS2_MALLOC(
- env->allocator,
- sizeof(axiom_xml_reader_ops_t));
+ env->allocator,
+ sizeof(axiom_xml_reader_ops_t));
if (!(guththila_impl->parser.ops))
{
guththila_free((axis2_env_t *)env, guththila);
@@ -299,10 +288,8 @@
return NULL;
}
-
guththila_xml_reader_wrapper_init_map(guththila_impl);
-
/************** ops *****/
guththila_impl->parser.ops->next = guththila_xml_reader_wrapper_next;
@@ -352,10 +339,10 @@
AXIS2_EXTERN axiom_xml_reader_t * AXIS2_CALL
axiom_xml_reader_create_for_memory(const axis2_env_t *env,
- void *buffer,
- int size,
- const char *encoding,
- int type)
+ void *buffer,
+ int size,
+ const char *encoding,
+ int type)
{
guththila_xml_reader_wrapper_impl_t *guththila_impl = NULL;
axis2_allocator_t *allocator = NULL;
@@ -364,7 +351,7 @@
AXIS2_ENV_CHECK(env, NULL);
guththila_impl = AXIS2_MALLOC(env->allocator,
- sizeof(guththila_xml_reader_wrapper_impl_t));
+ sizeof(guththila_xml_reader_wrapper_impl_t));
if (!guththila_impl)
{
@@ -386,7 +373,7 @@
}
guththila = guththila_create((axis2_env_t *)env,
- guththila_impl->reader);
+ guththila_impl->reader);
if (!guththila)
{
AXIS2_FREE(env->allocator, guththila_impl);
@@ -397,9 +384,9 @@
guththila_impl->guththila_parser = guththila;
guththila_impl->parser.ops = NULL;
- guththila_impl->parser.ops = (axiom_xml_reader_ops_t*)AXIS2_MALLOC(
- env->allocator,
- sizeof(axiom_xml_reader_ops_t));
+ guththila_impl->parser.ops = (axiom_xml_reader_ops_t*)
+ AXIS2_MALLOC(env->allocator,
+ sizeof(axiom_xml_reader_ops_t));
if (!(guththila_impl->parser.ops))
{
guththila_free((axis2_env_t *)env, guththila);
@@ -445,210 +432,166 @@
return &(guththila_impl->parser);
}
-
-
-
-
int AXIS2_CALL
guththila_xml_reader_wrapper_next(axiom_xml_reader_t *parser,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
int i = -1;
AXIS2_ENV_CHECK(env, -1);
i = guththila_next((axis2_env_t*) env, AXIS2_INTF_TO_IMPL(parser)->guththila_parser);
-/* while (i == GUTHTHILA_CHARACTER && AXIS2_INTF_TO_IMPL(parser)->guththila_parser->is_whitespace)
- i = guththila_next((axis2_env_t*) env, AXIS2_INTF_TO_IMPL(parser)->guththila_parser);*/
return i == -1 ? -1 : AXIS2_INTF_TO_IMPL(parser)->event_map[i];
}
-
axis2_status_t AXIS2_CALL
guththila_xml_reader_wrapper_free(axiom_xml_reader_t *parser,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
guththila_xml_reader_wrapper_impl_t *parser_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
parser_impl = AXIS2_INTF_TO_IMPL(parser);
if (parser_impl->reader)
-
- guththila_reader_free(
- (axis2_env_t *)env,
- parser_impl->reader);
+ {
+ guththila_reader_free((axis2_env_t *)env, parser_impl->reader);
+ }
if (parser_impl->guththila_parser)
- guththila_free(
- (axis2_env_t *)env,
- parser_impl->guththila_parser);
-
+ {
+ guththila_free((axis2_env_t *)env, parser_impl->guththila_parser);
+ }
if (parser->ops)
+ {
AXIS2_FREE(env->allocator, parser->ops);
+ }
AXIS2_FREE(env->allocator, parser_impl);
return AXIS2_SUCCESS;
}
-
int AXIS2_CALL
guththila_xml_reader_wrapper_get_attribute_count(axiom_xml_reader_t *parser,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- return guththila_get_attribute_count(
- (axis2_env_t *)env,
- AXIS2_INTF_TO_IMPL(parser)->guththila_parser);
+ return guththila_get_attribute_count((axis2_env_t *)env,
+ AXIS2_INTF_TO_IMPL(parser)->guththila_parser);
}
-axis2_char_t* AXIS2_CALL
+axis2_char_t *AXIS2_CALL
guththila_xml_reader_wrapper_get_attribute_name_by_number(axiom_xml_reader_t *parser,
- const axis2_env_t *env,
- int i)
+ const axis2_env_t *env,
+ int i)
{
AXIS2_ENV_CHECK(env, NULL);
- return guththila_get_attribute_name_by_number(
- (axis2_env_t *)env,
- AXIS2_INTF_TO_IMPL(parser)->guththila_parser, i);
-
-
+ return guththila_get_attribute_name_by_number((axis2_env_t *)env,
+ AXIS2_INTF_TO_IMPL(parser)->guththila_parser, i);
}
-axis2_char_t* AXIS2_CALL
+axis2_char_t *AXIS2_CALL
guththila_xml_reader_wrapper_get_attribute_prefix_by_number(axiom_xml_reader_t *parser,
- const axis2_env_t *env,
- int i)
+ const axis2_env_t *env,
+ int i)
{
AXIS2_ENV_CHECK(env, NULL);
- return guththila_get_attribute_prefix_by_number(
- (axis2_env_t *)env,
- AXIS2_INTF_TO_IMPL(parser)->guththila_parser, i);
-
-
+ return guththila_get_attribute_prefix_by_number((axis2_env_t *)env,
+ AXIS2_INTF_TO_IMPL(parser)->guththila_parser, i);
}
-
-axis2_char_t* AXIS2_CALL
+axis2_char_t *AXIS2_CALL
guththila_xml_reader_wrapper_get_attribute_value_by_number(axiom_xml_reader_t *parser,
- const axis2_env_t *env,
- int i)
+ const axis2_env_t *env,
+ int i)
{
AXIS2_ENV_CHECK(env, NULL);
- return guththila_get_attribute_value_by_number(
- (axis2_env_t *)env,
- AXIS2_INTF_TO_IMPL(parser)->guththila_parser, i);
-
-
+ return guththila_get_attribute_value_by_number((axis2_env_t *)env,
+ AXIS2_INTF_TO_IMPL(parser)->guththila_parser, i);
}
-
-axis2_char_t* AXIS2_CALL
-guththila_xml_reader_wrapper_get_attribute_namespace_by_number(
- axiom_xml_reader_t *parser,
+axis2_char_t *AXIS2_CALL
+guththila_xml_reader_wrapper_get_attribute_namespace_by_number(axiom_xml_reader_t *parser,
const axis2_env_t *env,
int i)
{
AXIS2_ENV_CHECK(env, NULL);
- return guththila_get_attribute_namespace_by_number(
- (axis2_env_t *)env,
- AXIS2_INTF_TO_IMPL(parser)->guththila_parser, i);
-
-
+ return guththila_get_attribute_namespace_by_number((axis2_env_t *)env,
+ AXIS2_INTF_TO_IMPL(parser)->guththila_parser, i);
}
-
-axis2_char_t* AXIS2_CALL
+axis2_char_t *AXIS2_CALL
guththila_xml_reader_wrapper_get_value(axiom_xml_reader_t *parser,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
- return guththila_get_value(
- (axis2_env_t *)env,
- AXIS2_INTF_TO_IMPL(parser)->guththila_parser);
-
-
+ return guththila_get_value((axis2_env_t *)env,
+ AXIS2_INTF_TO_IMPL(parser)->guththila_parser);
}
int AXIS2_CALL
guththila_xml_reader_wrapper_get_namespace_count(axiom_xml_reader_t *parser,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- return guththila_get_namespace_count(
- (axis2_env_t *)env,
- AXIS2_INTF_TO_IMPL(parser)->guththila_parser);
-
-
+ return guththila_get_namespace_count((axis2_env_t *)env,
+ AXIS2_INTF_TO_IMPL(parser)->guththila_parser);
}
-axis2_char_t* AXIS2_CALL
+axis2_char_t *AXIS2_CALL
guththila_xml_reader_wrapper_get_namespace_uri_by_number(axiom_xml_reader_t *parser,
- const axis2_env_t *env,
- int i)
+ const axis2_env_t *env,
+ int i)
{
AXIS2_ENV_CHECK(env, NULL);
- return guththila_get_namespace_uri_by_number(
- (axis2_env_t *)env,
- AXIS2_INTF_TO_IMPL(parser)->guththila_parser, i);
-
-
+ return guththila_get_namespace_uri_by_number((axis2_env_t *)env,
+ AXIS2_INTF_TO_IMPL(parser)->guththila_parser, i);
}
-axis2_char_t* AXIS2_CALL
-guththila_xml_reader_wrapper_get_namespace_prefix_by_number(
- axiom_xml_reader_t *parser,
+axis2_char_t *AXIS2_CALL
+guththila_xml_reader_wrapper_get_namespace_prefix_by_number(axiom_xml_reader_t *parser,
const axis2_env_t *env,
int i)
{
AXIS2_ENV_CHECK(env, NULL);
- return guththila_get_namespace_prefix_by_number(
- (axis2_env_t *)env,
- AXIS2_INTF_TO_IMPL(parser)->guththila_parser, i);
-
-
+ return guththila_get_namespace_prefix_by_number((axis2_env_t *)env,
+ AXIS2_INTF_TO_IMPL(parser)->guththila_parser, i);
}
-axis2_char_t* AXIS2_CALL
+axis2_char_t *AXIS2_CALL
guththila_xml_reader_wrapper_get_prefix(axiom_xml_reader_t *parser,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
- return guththila_get_prefix(
- (axis2_env_t *)env,
- AXIS2_INTF_TO_IMPL(parser)->guththila_parser);
-
-
+ return guththila_get_prefix((axis2_env_t *)env,
+ AXIS2_INTF_TO_IMPL(parser)->guththila_parser);
}
-axis2_char_t* AXIS2_CALL
+axis2_char_t *AXIS2_CALL
guththila_xml_reader_wrapper_get_name(axiom_xml_reader_t *parser,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
- return guththila_get_name(
- (axis2_env_t *)env,
- AXIS2_INTF_TO_IMPL(parser)->guththila_parser);
-
-
+ return guththila_get_name((axis2_env_t *)env,
+ AXIS2_INTF_TO_IMPL(parser)->guththila_parser);
}
-axis2_char_t* AXIS2_CALL
+axis2_char_t *AXIS2_CALL
guththila_xml_reader_wrapper_get_pi_target(axiom_xml_reader_t *parser,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
/* guththila_does not support pi's yet*/
return NULL;
}
-axis2_char_t* AXIS2_CALL
+axis2_char_t *AXIS2_CALL
guththila_xml_reader_wrapper_get_pi_data(axiom_xml_reader_t *parser,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
/* guththila_dose not support yet */
return NULL;
}
-axis2_char_t* AXIS2_CALL
+axis2_char_t *AXIS2_CALL
guththila_xml_reader_wrapper_get_dtd(axiom_xml_reader_t *parser,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
printf("not implemented in guththila");
return NULL;
@@ -656,12 +599,13 @@
axis2_status_t AXIS2_CALL
guththila_xml_reader_wrapper_xml_free(axiom_xml_reader_t *parser,
- const axis2_env_t *env,
- void *data)
+ const axis2_env_t *env,
+ void *data)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, data, AXIS2_FAILURE);
- AXIS2_FREE(env->allocator,
- data);
+ AXIS2_FREE(env->allocator, data);
return AXIS2_SUCCESS;
}
+
+
Modified: webservices/axis2/trunk/c/axiom/src/util/om_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/util/om_util.c?view=diff&rev=516351&r1=516350&r2=516351
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/util/om_util.c (original)
+++ webservices/axis2/trunk/c/axiom/src/util/om_util.c Fri Mar 9 02:17:30 2007
@@ -1096,3 +1096,5 @@
return doc;
}
+
+
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org