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 di...@apache.org on 2006/09/08 16:10:44 UTC
svn commit: r441499 [1/2] - in /webservices/axis2/trunk/c/guththila/src:
guththila_xml_pull_parser.c guththila_xml_writer.c
Author: dinesh
Date: Fri Sep 8 07:10:43 2006
New Revision: 441499
URL: http://svn.apache.org/viewvc?view=rev&rev=441499
Log:
rename guththila_xml_pull_parser_ prefix to guththila_
Modified:
webservices/axis2/trunk/c/guththila/src/guththila_xml_pull_parser.c
webservices/axis2/trunk/c/guththila/src/guththila_xml_writer.c
Modified: webservices/axis2/trunk/c/guththila/src/guththila_xml_pull_parser.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/src/guththila_xml_pull_parser.c?view=diff&rev=441499&r1=441498&r2=441499
==============================================================================
--- webservices/axis2/trunk/c/guththila/src/guththila_xml_pull_parser.c (original)
+++ webservices/axis2/trunk/c/guththila/src/guththila_xml_pull_parser.c Fri Sep 8 07:10:43 2006
@@ -16,7 +16,7 @@
*
*/
-#include <guththila_xml_pull_parser.h>
+#include <guththila.h>
/* static int AXIS2_CALL */
/* guththila_is_space (int c) */
@@ -25,13 +25,13 @@
/* } */
-AXIS2_EXTERN guththila_xml_pull_parser_t * AXIS2_CALL
-guththila_xml_pull_parser_create (axis2_env_t * environment,
+AXIS2_EXTERN guththila_t * AXIS2_CALL
+guththila_create (axis2_env_t * environment,
guththila_reader_t * r)
{
- guththila_xml_pull_parser_t *parser =
- (guththila_xml_pull_parser_t *) AXIS2_MALLOC (
- environment->allocator, sizeof (guththila_xml_pull_parser_t));
+ guththila_t *parser =
+ (guththila_t *) AXIS2_MALLOC (
+ environment->allocator, sizeof (guththila_t));
guththila_reader_impl_t *reader_impl = NULL;
if (r)
{
@@ -68,8 +68,8 @@
AXIS2_EXTERN void AXIS2_CALL
-guththila_xml_pull_parser_free (axis2_env_t * environment,
- guththila_xml_pull_parser_t * parser)
+guththila_free (axis2_env_t * environment,
+ guththila_t * parser)
{
/* if (parser->reader_type != GUTHTHILA_MEMORY_READER) */
/* { */
@@ -94,9 +94,9 @@
AXIS2_EXTERN int AXIS2_CALL
-guththila_xml_pull_parser_exception (guththila_char_t * file, int line, int error_code)
+guththila_exception (guththila_char_t * file, int line, int error_code)
{
- printf ("Throws guththila_xml_pull_parser_exception \t %s \t %d \n", file,
+ printf ("Throws guththila_exception \t %s \t %d \n", file,
line);
/* Samisa: we should define a set of error codes and a corresponding error message set
rather than printing the above line to the console, we should be appending the
@@ -112,8 +112,8 @@
void AXIS2_CALL
-guththila_xml_pull_parser_relocate_tokens (axis2_env_t *environment,
- guththila_xml_pull_parser_t *parser,
+guththila_relocate_tokens (axis2_env_t *environment,
+ guththila_t *parser,
int offset)
{
guththila_token_t *el = NULL;
@@ -129,8 +129,8 @@
void AXIS2_CALL
-guththila_xml_pull_parser_shift (axis2_env_t * environment,
- guththila_xml_pull_parser_t * parser)
+guththila_shift (axis2_env_t * environment,
+ guththila_t * parser)
{
memmove (parser->buffer->buff, parser->buffer->buff + (parser->offset),
(parser->_next) - (parser->offset));
@@ -141,24 +141,24 @@
int AXIS2_CALL
-guththila_xml_pull_parser_read (axis2_env_t * environment,
- guththila_xml_pull_parser_t * parser)
+guththila_read (axis2_env_t * environment,
+ guththila_t * parser)
{
int c = 0;
if (parser->_next == parser->buffer->size)
{
if (parser->offset > 0)
{
- guththila_xml_pull_parser_relocate_tokens (environment, parser,
+ guththila_relocate_tokens (environment, parser,
parser->offset);
- guththila_xml_pull_parser_shift (environment, parser);
+ guththila_shift (environment, parser);
}
else
{
int b = parser->buffer->size;
parser->buffer =
guththila_buffer_grow (environment, parser->buffer);
- guththila_xml_pull_parser_relocate_tokens (
+ guththila_relocate_tokens (
environment, parser, (parser->buffer->size - b));
}
}
@@ -172,18 +172,18 @@
int AXIS2_CALL
-guththila_xml_pull_parser_from_utf16 (axis2_env_t * environment,
- guththila_xml_pull_parser_t * parser,
+guththila_from_utf16 (axis2_env_t * environment,
+ guththila_t * parser,
int eof)
{
int c = parser->buffer->buff[parser->_next++];
if (((parser->_next) > (parser->last))
- && guththila_xml_pull_parser_read (environment, parser))
+ && guththila_read (environment, parser))
{
if (eof)
return -1;
else
- guththila_xml_pull_parser_exception (p_FILE, LINE, GUTHTHILA_ERROR_UNEXPECTED_UTF16_EOF);
+ guththila_exception (p_FILE, LINE, GUTHTHILA_ERROR_UNEXPECTED_UTF16_EOF);
}
while (!c)
c = parser->buffer->buff[parser->_next++];
@@ -192,8 +192,8 @@
int AXIS2_CALL
-guththila_xml_pull_parser_next_char (axis2_env_t * environment,
- guththila_xml_pull_parser_t * parser,
+guththila_next_char (axis2_env_t * environment,
+ guththila_t * parser,
int eof)
{
@@ -203,12 +203,12 @@
return -1;
}
else if (((parser->_next) > (parser->last))
- && guththila_xml_pull_parser_read (environment, parser))
+ && guththila_read (environment, parser))
{
if (eof)
return -1;
else
- guththila_xml_pull_parser_exception (p_FILE, LINE, GUTHTHILA_ERROR_UNEXPECTED_EOF);
+ guththila_exception (p_FILE, LINE, GUTHTHILA_ERROR_UNEXPECTED_EOF);
}
if (parser->_next == 0)
@@ -246,35 +246,35 @@
if (parser->unicode_state == None)
return parser->buffer->buff[parser->_next++];
else
- return guththila_xml_pull_parser_from_utf16 (environment, parser,
+ return guththila_from_utf16 (environment, parser,
eof);
}
guththila_char_t * AXIS2_CALL
-guththila_xml_pull_parser_last_char (axis2_env_t * environment,
- guththila_xml_pull_parser_t * parser)
+guththila_last_char (axis2_env_t * environment,
+ guththila_t * parser)
{
return parser->buffer->buff + (parser->_next - 1);
}
void AXIS2_CALL
-guththila_xml_pull_parser_open_token (axis2_env_t * environment,
- guththila_xml_pull_parser_t * parser)
+guththila_open_token (axis2_env_t * environment,
+ guththila_t * parser)
{
guththila_token_t *t =
(guththila_token_t *) AXIS2_MALLOC (environment->allocator,
sizeof (guththila_token_t));
t->type = Unknown;
- t->start = guththila_xml_pull_parser_last_char (environment, parser);
+ t->start = guththila_last_char (environment, parser);
AXIS2_STACK_PUSH (parser->stack, environment, t);
}
void AXIS2_CALL
-guththila_xml_pull_parser_close_token (axis2_env_t * environment,
- guththila_xml_pull_parser_t * parser,
+guththila_close_token (axis2_env_t * environment,
+ guththila_t * parser,
int t, int refer)
{
guththila_token_t *token =
@@ -282,237 +282,237 @@
token->type = t;
token->ref = refer;
token->end =
- guththila_xml_pull_parser_last_char (environment, parser) - 1;
+ guththila_last_char (environment, parser) - 1;
}
int AXIS2_CALL
-guththila_xml_pull_parser_skip_spaces (axis2_env_t * environment,
- guththila_xml_pull_parser_t * parser,
+guththila_skip_spaces (axis2_env_t * environment,
+ guththila_t * parser,
int c)
{
while (0x20 == c || 0x9 == c || 0xD == c || 0xA == c)
- c = guththila_xml_pull_parser_next_char (environment, parser, 0);
+ c = guththila_next_char (environment, parser, 0);
return c;
}
int AXIS2_CALL
-guththila_xml_pull_parser_process_eq (axis2_env_t * environment,
- guththila_xml_pull_parser_t * parser,
+guththila_process_eq (axis2_env_t * environment,
+ guththila_t * parser,
int c)
{
int ic;
if (0x3D ==
- guththila_xml_pull_parser_skip_spaces (environment, parser, c))
+ guththila_skip_spaces (environment, parser, c))
{
- ic = guththila_xml_pull_parser_next_char (environment, parser, 0);
- return guththila_xml_pull_parser_skip_spaces (environment, parser,
+ ic = guththila_next_char (environment, parser, 0);
+ return guththila_skip_spaces (environment, parser,
ic);
}
else
- guththila_xml_pull_parser_exception (p_FILE, LINE, GUTHTHILA_ERROR_PROCESS_EQUAL);
+ guththila_exception (p_FILE, LINE, GUTHTHILA_ERROR_PROCESS_EQUAL);
return 0;
}
int AXIS2_CALL
-guththila_xml_pull_parser_process_version_info (axis2_env_t *
+guththila_process_version_info (axis2_env_t *
environment,
- guththila_xml_pull_parser_t *
+ guththila_t *
parser)
{
int ic;
int quote;
int nc;
- ic = guththila_xml_pull_parser_next_char (environment, parser, 0);
- ic = guththila_xml_pull_parser_skip_spaces (environment, parser, ic);
+ ic = guththila_next_char (environment, parser, 0);
+ ic = guththila_skip_spaces (environment, parser, ic);
if (ic == 'v')
{
- guththila_xml_pull_parser_open_token (environment, parser);
+ guththila_open_token (environment, parser);
if ('e' ==
- guththila_xml_pull_parser_next_char (environment, parser, 0)
- && 'r' == guththila_xml_pull_parser_next_char (environment,
+ guththila_next_char (environment, parser, 0)
+ && 'r' == guththila_next_char (environment,
parser, 0)
- && 's' == guththila_xml_pull_parser_next_char (environment,
+ && 's' == guththila_next_char (environment,
parser, 0)
- && 'i' == guththila_xml_pull_parser_next_char (environment,
+ && 'i' == guththila_next_char (environment,
parser, 0)
- && 'o' == guththila_xml_pull_parser_next_char (environment,
+ && 'o' == guththila_next_char (environment,
parser, 0)
- && 'n' == guththila_xml_pull_parser_next_char (environment,
+ && 'n' == guththila_next_char (environment,
parser, 0))
{
- ic = guththila_xml_pull_parser_next_char (environment, parser, 0);
- guththila_xml_pull_parser_close_token (environment, parser,
+ ic = guththila_next_char (environment, parser, 0);
+ guththila_close_token (environment, parser,
_attribute, 0);
quote =
- guththila_xml_pull_parser_process_eq (environment, parser,
+ guththila_process_eq (environment, parser,
ic);
- nc = guththila_xml_pull_parser_next_char (environment, parser, 0);
+ nc = guththila_next_char (environment, parser, 0);
/* 0, since we don't expect EOF line here */
- guththila_xml_pull_parser_open_token (environment, parser);
+ guththila_open_token (environment, parser);
while (quote != nc)
- nc = guththila_xml_pull_parser_next_char (environment, parser,
+ nc = guththila_next_char (environment, parser,
0);
- guththila_xml_pull_parser_close_token (environment, parser,
+ guththila_close_token (environment, parser,
_attribute_value, 0);
- nc = guththila_xml_pull_parser_next_char (environment, parser, 0);
- return guththila_xml_pull_parser_skip_spaces (environment, parser,
+ nc = guththila_next_char (environment, parser, 0);
+ return guththila_skip_spaces (environment, parser,
nc);
}
else
- guththila_xml_pull_parser_exception (p_FILE, LINE, GUTHTHILA_ERROR_INCORRECT_VERSION_INFO);
+ guththila_exception (p_FILE, LINE, GUTHTHILA_ERROR_INCORRECT_VERSION_INFO);
}
else
- guththila_xml_pull_parser_exception (p_FILE, LINE, GUTHTHILA_ERROR_VERSION_INFO_NOT_FOUND);
+ guththila_exception (p_FILE, LINE, GUTHTHILA_ERROR_VERSION_INFO_NOT_FOUND);
return 0;
}
int AXIS2_CALL
-guththila_xml_pull_parser_process_encoding_decl (axis2_env_t *
+guththila_process_encoding_decl (axis2_env_t *
environment,
- guththila_xml_pull_parser_t *
+ guththila_t *
parser)
{
int quote;
int nc;
int ic;
- guththila_xml_pull_parser_open_token (environment, parser);
- if ('n' == guththila_xml_pull_parser_next_char (environment, parser, 0)
- && 'c' == guththila_xml_pull_parser_next_char (environment, parser, 0)
- && 'o' == guththila_xml_pull_parser_next_char (environment, parser, 0)
- && 'd' == guththila_xml_pull_parser_next_char (environment, parser, 0)
- && 'i' == guththila_xml_pull_parser_next_char (environment, parser, 0)
- && 'n' == guththila_xml_pull_parser_next_char (environment, parser, 0)
- && 'g' == guththila_xml_pull_parser_next_char (environment, parser,
+ guththila_open_token (environment, parser);
+ if ('n' == guththila_next_char (environment, parser, 0)
+ && 'c' == guththila_next_char (environment, parser, 0)
+ && 'o' == guththila_next_char (environment, parser, 0)
+ && 'd' == guththila_next_char (environment, parser, 0)
+ && 'i' == guththila_next_char (environment, parser, 0)
+ && 'n' == guththila_next_char (environment, parser, 0)
+ && 'g' == guththila_next_char (environment, parser,
0))
{
- ic = guththila_xml_pull_parser_next_char (environment, parser, 0);
- guththila_xml_pull_parser_close_token (environment, parser,
+ ic = guththila_next_char (environment, parser, 0);
+ guththila_close_token (environment, parser,
_attribute, 0);
quote =
- guththila_xml_pull_parser_process_eq (environment, parser, ic);
- nc = guththila_xml_pull_parser_next_char (environment, parser, 0);
- guththila_xml_pull_parser_open_token (environment, parser);
+ guththila_process_eq (environment, parser, ic);
+ nc = guththila_next_char (environment, parser, 0);
+ guththila_open_token (environment, parser);
while (quote != nc)
- nc = guththila_xml_pull_parser_next_char (environment, parser, 0);
- guththila_xml_pull_parser_close_token (environment, parser,
+ nc = guththila_next_char (environment, parser, 0);
+ guththila_close_token (environment, parser,
_attribute_value, 0);
- nc = guththila_xml_pull_parser_next_char (environment, parser, 0);
- return guththila_xml_pull_parser_skip_spaces (environment, parser,
+ nc = guththila_next_char (environment, parser, 0);
+ return guththila_skip_spaces (environment, parser,
nc);
}
else
- guththila_xml_pull_parser_exception (p_FILE, LINE, GUTHTHILA_ERROR_ENCODING_DECLARATION_ERROR);
+ guththila_exception (p_FILE, LINE, GUTHTHILA_ERROR_ENCODING_DECLARATION_ERROR);
return 0;
}
int AXIS2_CALL
-guththila_xml_pull_parser_process_sd_decl (axis2_env_t *
+guththila_process_sd_decl (axis2_env_t *
environment,
- guththila_xml_pull_parser_t *
+ guththila_t *
parser)
{
int quote = 0;
int nc = 0;
int ic = 0;
- guththila_xml_pull_parser_open_token (environment, parser);
- if ('t' == guththila_xml_pull_parser_next_char (environment, parser, 0)
- && 'a' == guththila_xml_pull_parser_next_char (environment, parser, 0)
- && 'n' == guththila_xml_pull_parser_next_char (environment, parser, 0)
- && 'd' == guththila_xml_pull_parser_next_char (environment, parser, 0)
- && 'a' == guththila_xml_pull_parser_next_char (environment, parser, 0)
- && 'l' == guththila_xml_pull_parser_next_char (environment, parser, 0)
- && 'o' == guththila_xml_pull_parser_next_char (environment, parser, 0)
- && 'n' == guththila_xml_pull_parser_next_char (environment, parser, 0)
- && 'e' == guththila_xml_pull_parser_next_char (environment, parser,
+ guththila_open_token (environment, parser);
+ if ('t' == guththila_next_char (environment, parser, 0)
+ && 'a' == guththila_next_char (environment, parser, 0)
+ && 'n' == guththila_next_char (environment, parser, 0)
+ && 'd' == guththila_next_char (environment, parser, 0)
+ && 'a' == guththila_next_char (environment, parser, 0)
+ && 'l' == guththila_next_char (environment, parser, 0)
+ && 'o' == guththila_next_char (environment, parser, 0)
+ && 'n' == guththila_next_char (environment, parser, 0)
+ && 'e' == guththila_next_char (environment, parser,
0))
- ic = guththila_xml_pull_parser_next_char (environment, parser, 0);
- guththila_xml_pull_parser_close_token (environment, parser, _attribute,
+ ic = guththila_next_char (environment, parser, 0);
+ guththila_close_token (environment, parser, _attribute,
0);
- quote = guththila_xml_pull_parser_process_eq (environment, parser, ic);
- nc = guththila_xml_pull_parser_next_char (environment, parser, 0);
- guththila_xml_pull_parser_open_token (environment, parser);
+ quote = guththila_process_eq (environment, parser, ic);
+ nc = guththila_next_char (environment, parser, 0);
+ guththila_open_token (environment, parser);
while (quote != nc)
{
if ('y' == nc)
{
if ('e' !=
- guththila_xml_pull_parser_next_char (environment, parser, 0)
- || 's' != guththila_xml_pull_parser_next_char (environment,
+ guththila_next_char (environment, parser, 0)
+ || 's' != guththila_next_char (environment,
parser, 0))
- guththila_xml_pull_parser_exception (p_FILE, LINE, GUTHTHILA_ERROR_STANDALONE_ERROR_IN_YES);
+ guththila_exception (p_FILE, LINE, GUTHTHILA_ERROR_STANDALONE_ERROR_IN_YES);
else
- nc = guththila_xml_pull_parser_next_char (environment, parser,
+ nc = guththila_next_char (environment, parser,
0);
}
else if ('n' == nc)
{
if ('o' !=
- guththila_xml_pull_parser_next_char (environment, parser, 0))
- guththila_xml_pull_parser_exception (p_FILE, LINE, GUTHTHILA_ERROR_STANDALONE_ERROR_IN_NO);
+ guththila_next_char (environment, parser, 0))
+ guththila_exception (p_FILE, LINE, GUTHTHILA_ERROR_STANDALONE_ERROR_IN_NO);
else
- nc = guththila_xml_pull_parser_next_char (environment, parser,
+ nc = guththila_next_char (environment, parser,
0);
}
else
- guththila_xml_pull_parser_exception (p_FILE, LINE, GUTHTHILA_ERROR_STANDALONE_ERROR_YES_OR_NO_NOT_AVAILABLE);
+ guththila_exception (p_FILE, LINE, GUTHTHILA_ERROR_STANDALONE_ERROR_YES_OR_NO_NOT_AVAILABLE);
}
- guththila_xml_pull_parser_close_token (environment, parser,
+ guththila_close_token (environment, parser,
_attribute_value, 0);
- nc = guththila_xml_pull_parser_next_char (environment, parser, 0);
- return guththila_xml_pull_parser_skip_spaces (environment, parser, nc);
+ nc = guththila_next_char (environment, parser, 0);
+ return guththila_skip_spaces (environment, parser, nc);
}
int AXIS2_CALL
-guththila_xml_pull_parser_process_xml_decl (axis2_env_t *
+guththila_process_xml_decl (axis2_env_t *
environment,
- guththila_xml_pull_parser_t *
+ guththila_t *
parser)
{
int ix;
- if ('x' == guththila_xml_pull_parser_next_char (environment, parser, 0)
- && 'm' == guththila_xml_pull_parser_next_char (environment, parser, 0)
- && 'l' == guththila_xml_pull_parser_next_char (environment, parser,
+ if ('x' == guththila_next_char (environment, parser, 0)
+ && 'm' == guththila_next_char (environment, parser, 0)
+ && 'l' == guththila_next_char (environment, parser,
0))
{
- ix = guththila_xml_pull_parser_process_version_info (environment,
+ ix = guththila_process_version_info (environment,
parser);
if ('e' == ix)
- ix = guththila_xml_pull_parser_process_encoding_decl (environment,
+ ix = guththila_process_encoding_decl (environment,
parser);
if ('s' == ix)
- ix = guththila_xml_pull_parser_process_sd_decl (environment,
+ ix = guththila_process_sd_decl (environment,
parser);
if ('?' == ix)
{
if ('>' !=
- guththila_xml_pull_parser_next_char (environment, parser, 0))
- guththila_xml_pull_parser_exception (p_FILE, LINE, GUTHTHILA_ERROR_MISSING_GREATER_SIGN_IN_XML_DECLARATION);
+ guththila_next_char (environment, parser, 0))
+ guththila_exception (p_FILE, LINE, GUTHTHILA_ERROR_MISSING_GREATER_SIGN_IN_XML_DECLARATION);
else
{
- while (guththila_xml_pull_parser_is_space (environment, guththila_xml_pull_parser_next_char (environment, parser, 0)));
+ while (guththila_is_space (environment, guththila_next_char (environment, parser, 0)));
parser->_next--;
parser->guththila_event = GUTHTHILA_START_DOCUMENT;
}
}
}
else
- guththila_xml_pull_parser_exception (p_FILE, LINE, GUTHTHILA_ERROR_INCORRECT_XML_DECLARATION);
+ guththila_exception (p_FILE, LINE, GUTHTHILA_ERROR_INCORRECT_XML_DECLARATION);
return 0;
}
void AXIS2_CALL
-guththila_xml_pull_parser_reset (axis2_env_t * environment,
- guththila_xml_pull_parser_t * parser)
+guththila_reset (axis2_env_t * environment,
+ guththila_t * parser)
{
int ii;
parser->offset = parser->_next;
@@ -539,12 +539,12 @@
/* guththila_stack_clear (environment, parser->stack); */
if(parser->guththila_event == GUTHTHILA_END_ELEMENT
|| parser->guththila_event == GUTHTHILA_EMPTY_ELEMENT)
- guththila_xml_pull_parser_close_element (environment, parser);
+ guththila_close_element (environment, parser);
}
int AXIS2_CALL
-guththila_xml_pull_parser_is_space (axis2_env_t * environment,
+guththila_is_space (axis2_env_t * environment,
int c)
{
if (0x20 == c || 0xD == c || 0xA == c || 0x9 == c)
@@ -555,9 +555,9 @@
int AXIS2_CALL
-guththila_xml_pull_parser_is_valid_starting_char (axis2_env_t *
+guththila_is_valid_starting_char (axis2_env_t *
environment,
- guththila_xml_pull_parser_t
+ guththila_t
* parser, int c)
{
if (isalpha (c) || '_' == c || ':' == c)
@@ -568,93 +568,93 @@
int AXIS2_CALL
-guththila_xml_pull_parser_process_name (axis2_env_t * environment,
- guththila_xml_pull_parser_t * parser)
+guththila_process_name (axis2_env_t * environment,
+ guththila_t * parser)
{
int c;
guththila_char_t *x;
- x = guththila_xml_pull_parser_last_char (environment, parser);
- if (!guththila_xml_pull_parser_is_valid_starting_char
+ x = guththila_last_char (environment, parser);
+ if (!guththila_is_valid_starting_char
(environment, parser, x[0]))
- guththila_xml_pull_parser_exception (p_FILE, LINE, GUTHTHILA_ERROR_INVALID_NAME_STARTING_CHARACTER);
+ guththila_exception (p_FILE, LINE, GUTHTHILA_ERROR_INVALID_NAME_STARTING_CHARACTER);
- guththila_xml_pull_parser_open_token (environment, parser);
- c = guththila_xml_pull_parser_next_char (environment, parser, 0);
+ guththila_open_token (environment, parser);
+ c = guththila_next_char (environment, parser, 0);
while (!
- (guththila_xml_pull_parser_is_space (environment, c) || '/' == c
+ (guththila_is_space (environment, c) || '/' == c
|| '=' == c || '?' == c || '>' == c))
{
if (':' == c)
{
- guththila_xml_pull_parser_close_token (environment, parser,
+ guththila_close_token (environment, parser,
_prefix, 0);
- c = guththila_xml_pull_parser_next_char (environment, parser, 0);
- guththila_xml_pull_parser_open_token (environment, parser);
+ c = guththila_next_char (environment, parser, 0);
+ guththila_open_token (environment, parser);
}
else
- c = guththila_xml_pull_parser_next_char (environment, parser, 0);
+ c = guththila_next_char (environment, parser, 0);
}
- guththila_xml_pull_parser_close_token (environment, parser, _name, 0);
+ guththila_close_token (environment, parser, _name, 0);
return c;
}
int AXIS2_CALL
-guththila_xml_pull_parser_process_attribute_value (axis2_env_t *
+guththila_process_attribute_value (axis2_env_t *
environment,
- guththila_xml_pull_parser_t
+ guththila_t
* parser, int quote)
{
int c = 0;
if ('\'' == quote || '\"' == quote)
{
- c = guththila_xml_pull_parser_next_char (environment, parser, 0);
- guththila_xml_pull_parser_open_token (environment, parser);
+ c = guththila_next_char (environment, parser, 0);
+ guththila_open_token (environment, parser);
do
{
- c = guththila_xml_pull_parser_next_char (environment, parser, 0);
+ c = guththila_next_char (environment, parser, 0);
if (quote == c)
{
- guththila_xml_pull_parser_close_token (environment, parser,
+ guththila_close_token (environment, parser,
_attribute_value, 0);
- return guththila_xml_pull_parser_next_char (environment,
+ return guththila_next_char (environment,
parser, 0);
}
}
while ('<' != c || '&' != c);
}
else
- guththila_xml_pull_parser_exception (p_FILE, LINE, GUTHTHILA_ERROR_QUOTES_NOT_FOUND_BEFORE_ATTRIBUTE_VALUE );
+ guththila_exception (p_FILE, LINE, GUTHTHILA_ERROR_QUOTES_NOT_FOUND_BEFORE_ATTRIBUTE_VALUE );
return c;
}
int AXIS2_CALL
-guththila_xml_pull_parser_process_attribute (axis2_env_t *
+guththila_process_attribute (axis2_env_t *
environment,
- guththila_xml_pull_parser_t *
+ guththila_t *
parser, int c)
{
int q;
- q = guththila_xml_pull_parser_skip_spaces (environment, parser, c);
- q = guththila_xml_pull_parser_process_name (environment, parser);
- q = guththila_xml_pull_parser_process_eq (environment, parser, q);
- q = guththila_xml_pull_parser_process_attribute_value (environment,
+ q = guththila_skip_spaces (environment, parser, c);
+ q = guththila_process_name (environment, parser);
+ q = guththila_process_eq (environment, parser, q);
+ q = guththila_process_attribute_value (environment,
parser, q);
return q;
}
int AXIS2_CALL
-guththila_xml_pull_parser_processSTagOrEmptyElem (axis2_env_t *
+guththila_processSTagOrEmptyElem (axis2_env_t *
environment,
- guththila_xml_pull_parser_t
+ guththila_t
* parser)
{
int c;
- c = guththila_xml_pull_parser_process_name (environment, parser);
- c = guththila_xml_pull_parser_skip_spaces (environment, parser, c);
+ c = guththila_process_name (environment, parser);
+ c = guththila_skip_spaces (environment, parser, c);
parser->guththila_event = GUTHTHILA_START_ELEMENT;
for (;;)
{
@@ -662,18 +662,18 @@
{
parser->guththila_event = GUTHTHILA_EMPTY_ELEMENT;
if ('>' ==
- guththila_xml_pull_parser_next_char (environment, parser, 0))
+ guththila_next_char (environment, parser, 0))
return c;
else
- guththila_xml_pull_parser_exception (p_FILE, LINE, GUTHTHILA_ERROR_EMPTY_ELEMENT_NOT_CLOSED);
+ guththila_exception (p_FILE, LINE, GUTHTHILA_ERROR_EMPTY_ELEMENT_NOT_CLOSED);
}
else if ('>' == c)
return c;
else
{
- c = guththila_xml_pull_parser_process_attribute (environment,
+ c = guththila_process_attribute (environment,
parser, c);
- c = guththila_xml_pull_parser_skip_spaces (environment, parser,
+ c = guththila_skip_spaces (environment, parser,
c);
}
}
@@ -681,9 +681,9 @@
int AXIS2_CALL
-guththila_xml_pull_parser_process_char_data (axis2_env_t *
+guththila_process_char_data (axis2_env_t *
environment,
- guththila_xml_pull_parser_t *
+ guththila_t *
parser)
{
int c;
@@ -691,10 +691,10 @@
/* int all_spaces = 1; */
/* int last_event = parser->guththila_event; */
parser->guththila_event = GUTHTHILA_CHARACTER;
- guththila_xml_pull_parser_open_token (environment, parser);
+ guththila_open_token (environment, parser);
do
{
- c = guththila_xml_pull_parser_next_char (environment, parser, -1);
+ c = guththila_next_char (environment, parser, -1);
/* if (c != '<') */
/* all_spaces = (all_spaces && guththila_is_space (c)); */
@@ -704,7 +704,7 @@
if (c == -1)
{
- guththila_xml_pull_parser_close_token (environment, parser,
+ guththila_close_token (environment, parser,
_char_data, ref);
return 0;
}
@@ -714,72 +714,72 @@
/* if (all_spaces) */
/* parser->guththila_event = GUTHTHILA_SPACE; */
- guththila_xml_pull_parser_close_token (environment, parser, _char_data,
+ guththila_close_token (environment, parser, _char_data,
ref);
return c;
}
int AXIS2_CALL
-guththila_xml_pull_parser_process_end_tag (axis2_env_t *
+guththila_process_end_tag (axis2_env_t *
environment,
- guththila_xml_pull_parser_t *
+ guththila_t *
parser)
{
int c;
- c = guththila_xml_pull_parser_next_char (environment, parser, 0);
- c = guththila_xml_pull_parser_process_name (environment, parser);
- c = guththila_xml_pull_parser_skip_spaces (environment, parser, c);
+ c = guththila_next_char (environment, parser, 0);
+ c = guththila_process_name (environment, parser);
+ c = guththila_skip_spaces (environment, parser, c);
if ('>' == c)
parser->guththila_event = GUTHTHILA_END_ELEMENT;
else
- guththila_xml_pull_parser_exception (p_FILE, LINE, GUTHTHILA_ERROR_END_TAG_NOT_CLOSED);
+ guththila_exception (p_FILE, LINE, GUTHTHILA_ERROR_END_TAG_NOT_CLOSED);
return c;
}
int AXIS2_CALL
-guththila_xml_pull_parser_process_pi (axis2_env_t * environment,
- guththila_xml_pull_parser_t * parser)
+guththila_process_pi (axis2_env_t * environment,
+ guththila_t * parser)
{
int c;
parser->guththila_event = GUTHTHILA_COMMENT;
- c = guththila_xml_pull_parser_next_char (environment, parser, 0);
+ c = guththila_next_char (environment, parser, 0);
while ('<' != c)
- c = guththila_xml_pull_parser_next_char (environment, parser, 0);
+ c = guththila_next_char (environment, parser, 0);
return c;
}
int AXIS2_CALL
-guththila_xml_pull_parser_process_comment (axis2_env_t *
+guththila_process_comment (axis2_env_t *
environment,
- guththila_xml_pull_parser_t *
+ guththila_t *
parser)
{
int c;
- if ('-' == guththila_xml_pull_parser_next_char (environment, parser, 0)
- && '-' == guththila_xml_pull_parser_next_char (environment, parser,
+ if ('-' == guththila_next_char (environment, parser, 0)
+ && '-' == guththila_next_char (environment, parser,
0))
{
- c = guththila_xml_pull_parser_next_char (environment, parser, 0);
+ c = guththila_next_char (environment, parser, 0);
while (1)
{
- c = guththila_xml_pull_parser_next_char (environment, parser, 0);
+ c = guththila_next_char (environment, parser, 0);
if ('-' == c)
{
- c = guththila_xml_pull_parser_next_char (environment, parser,
+ c = guththila_next_char (environment, parser,
0);
if ('-' == c)
{
if ('>' ==
- guththila_xml_pull_parser_next_char (environment,
+ guththila_next_char (environment,
parser, 0))
{
parser->guththila_event = GUTHTHILA_COMMENT;
while ('<' != c)
{
- c = guththila_xml_pull_parser_next_char
+ c = guththila_next_char
(environment, parser, -1);
if (c == -1)
return c;
@@ -787,29 +787,29 @@
return c;
}
else
- guththila_xml_pull_parser_exception (p_FILE, LINE, GUTHTHILA_ERROR_MORE_HYPENS_OCCURED_IN_COMMENT);
+ guththila_exception (p_FILE, LINE, GUTHTHILA_ERROR_MORE_HYPENS_OCCURED_IN_COMMENT);
}
}
}
}
else
{
- c = guththila_xml_pull_parser_next_char (environment, parser, 0);
+ c = guththila_next_char (environment, parser, 0);
while ('<' != c)
- c = guththila_xml_pull_parser_next_char (environment, parser, -1);
+ c = guththila_next_char (environment, parser, -1);
}
return 0;
}
int AXIS2_CALL
-guththila_xml_pull_parser_tokenize (axis2_env_t * environment,
- guththila_xml_pull_parser_t * parser)
+guththila_tokenize (axis2_env_t * environment,
+ guththila_t * parser)
{
do
{
int c;
- c = guththila_xml_pull_parser_next_char (environment, parser, -1);
+ c = guththila_next_char (environment, parser, -1);
if (c == -1)
return -1;
@@ -818,7 +818,7 @@
case S_1:
while (isspace(c))
{
- c = guththila_xml_pull_parser_next_char (environment, parser, -1);
+ c = guththila_next_char (environment, parser, -1);
if (c == -1)
return -1;
}
@@ -832,19 +832,19 @@
{
if ('?' == c)
{
- guththila_xml_pull_parser_process_xml_decl (environment,
+ guththila_process_xml_decl (environment,
parser);
parser->status = S_3;
}
else if ('!' == c)
{
- guththila_xml_pull_parser_process_comment (environment,
+ guththila_process_comment (environment,
parser);
parser->status = S_4;
}
else
{
- guththila_xml_pull_parser_processSTagOrEmptyElem
+ guththila_processSTagOrEmptyElem
(environment, parser);
parser->status = S_3;
}
@@ -855,7 +855,7 @@
parser->status = S_4;
else
{
- c = guththila_xml_pull_parser_process_char_data (environment,
+ c = guththila_process_char_data (environment,
parser);
if ('<' == c)
{
@@ -871,24 +871,24 @@
case S_4:
if ('/' == c)
{
- guththila_xml_pull_parser_process_end_tag (environment,
+ guththila_process_end_tag (environment,
parser);
parser->status = S_3;
}
else if ('?' == c)
- guththila_xml_pull_parser_process_pi (environment, parser);
+ guththila_process_pi (environment, parser);
else if ('!' == c)
- guththila_xml_pull_parser_process_comment (environment,
+ guththila_process_comment (environment,
parser);
else
{
- guththila_xml_pull_parser_processSTagOrEmptyElem (environment,
+ guththila_processSTagOrEmptyElem (environment,
parser);
parser->status = S_3;
}
break;
case S_0:
- guththila_xml_pull_parser_exception (p_FILE, LINE, GUTHTHILA_ERROR_TOKENIZE_ERROR);
+ guththila_exception (p_FILE, LINE, GUTHTHILA_ERROR_TOKENIZE_ERROR);
}
}
while (parser->status != S_3);
@@ -897,12 +897,12 @@
AXIS2_EXTERN int AXIS2_CALL
-guththila_xml_pull_parser_next (axis2_env_t * environment,
- guththila_xml_pull_parser_t * parser)
+guththila_next (axis2_env_t * environment,
+ guththila_t * parser)
{
int ix;
- guththila_xml_pull_parser_reset (environment, parser);
- ix = guththila_xml_pull_parser_tokenize (environment, parser);
+ guththila_reset (environment, parser);
+ ix = guththila_tokenize (environment, parser);
switch (ix)
{
case -1:
@@ -924,7 +924,7 @@
token = (guththila_token_t *)AXIS2_STACK_POP (parser->stack, environment);
ix--;
att_name = token;
- guththila_xml_pull_parser_add_attribute (environment,
+ guththila_add_attribute (environment,
parser, att_name,
att_value);
}
@@ -955,11 +955,11 @@
if (!guththila_token_compare
(environment, token, "xmlns", 5,
parser->unicode_state))
- guththila_xml_pull_parser_add_namespace (environment,
+ guththila_add_namespace (environment,
parser, name,
value);
else
- guththila_xml_pull_parser_add_attribute (environment,
+ guththila_add_attribute (environment,
parser, name,
value);
}
@@ -978,7 +978,7 @@
parser->unicode_state))
{
attribute = (guththila_attribute_t *) AXIS2_STACK_POP ( parser->attrib, environment);
- guththila_xml_pull_parser_add_namespace (environment,
+ guththila_add_namespace (environment,
parser,
attribute->
name,
@@ -992,16 +992,16 @@
else
{
attribute = (guththila_attribute_t *) AXIS2_STACK_POP ( parser->attrib, environment);
- guththila_xml_pull_parser_add_attribute_with_prefix
+ guththila_add_attribute_with_prefix
(environment, parser, token,
attribute->name, attribute->value);
}
}
}
else
- guththila_xml_pull_parser_exception (p_FILE, LINE, GUTHTHILA_ERROR_INVALID_TOKEN_TYPE);
+ guththila_exception (p_FILE, LINE, GUTHTHILA_ERROR_INVALID_TOKEN_TYPE);
}
- guththila_xml_pull_parser_open_element (environment, parser);
+ guththila_open_element (environment, parser);
}
break;
case GUTHTHILA_END_ELEMENT:
@@ -1037,8 +1037,8 @@
void AXIS2_CALL
-guththila_xml_pull_parser_open_element (axis2_env_t * environment,
- guththila_xml_pull_parser_t * parser)
+guththila_open_element (axis2_env_t * environment,
+ guththila_t * parser)
{
int ii;
guththila_depth_t *m =
@@ -1068,9 +1068,9 @@
void AXIS2_CALL
-guththila_xml_pull_parser_close_element (axis2_env_t *
+guththila_close_element (axis2_env_t *
environment,
- guththila_xml_pull_parser_t * parser)
+ guththila_t * parser)
{
guththila_depth_t *depth;
guththila_namespace_t *namespace;
@@ -1097,9 +1097,9 @@
void AXIS2_CALL
-guththila_xml_pull_parser_add_attribute (axis2_env_t *
+guththila_add_attribute (axis2_env_t *
environment,
- guththila_xml_pull_parser_t * parser,
+ guththila_t * parser,
guththila_token_t * name,
guththila_token_t * value)
{
@@ -1117,9 +1117,9 @@
void AXIS2_CALL
-guththila_xml_pull_parser_add_attribute_with_prefix (axis2_env_t *
+guththila_add_attribute_with_prefix (axis2_env_t *
environment,
- guththila_xml_pull_parser_t
+ guththila_t
* parser,
guththila_token_t *
prefix,
@@ -1142,9 +1142,9 @@
void AXIS2_CALL
-guththila_xml_pull_parser_add_namespace (axis2_env_t *
+guththila_add_namespace (axis2_env_t *
environment,
- guththila_xml_pull_parser_t * parser,
+ guththila_t * parser,
guththila_token_t * name,
guththila_token_t * uri)
{
@@ -1164,9 +1164,9 @@
AXIS2_EXTERN int AXIS2_CALL
-guththila_xml_pull_parser_get_attribute_count (axis2_env_t *
+guththila_get_attribute_count (axis2_env_t *
environment,
- guththila_xml_pull_parser_t *
+ guththila_t *
parser)
{
return AXIS2_STACK_SIZE (parser->attrib, environment);
@@ -1174,9 +1174,9 @@
AXIS2_EXTERN guththila_attribute_t * AXIS2_CALL
-guththila_xml_pull_parser_get_attribute (axis2_env_t *
+guththila_get_attribute (axis2_env_t *
environment,
- guththila_xml_pull_parser_t * parser)
+ guththila_t * parser)
{
guththila_attribute_t *attribute;
attribute = (guththila_attribute_t *) AXIS2_STACK_POP (parser->attrib, environment);
@@ -1188,14 +1188,14 @@
AXIS2_EXTERN guththila_char_t * AXIS2_CALL
-guththila_xml_pull_parser_get_attribute_name (axis2_env_t *
+guththila_get_attribute_name (axis2_env_t *
environment,
- guththila_xml_pull_parser_t *
+ guththila_t *
parser,
guththila_attribute_t * att)
{
if (!att)
- guththila_xml_pull_parser_exception (p_FILE, LINE, GUTHTHILA_ERROR_NULL_ATTRIBUTE_NAME);
+ guththila_exception (p_FILE, LINE, GUTHTHILA_ERROR_NULL_ATTRIBUTE_NAME);
if (att->name->end)
return guththila_token_to_string (environment, att->name,
parser->unicode_state);
@@ -1204,14 +1204,14 @@
AXIS2_EXTERN guththila_char_t * AXIS2_CALL
-guththila_xml_pull_parser_get_attribute_value (axis2_env_t *
+guththila_get_attribute_value (axis2_env_t *
environment,
- guththila_xml_pull_parser_t *
+ guththila_t *
parser,
guththila_attribute_t * att)
{
if (!att)
- guththila_xml_pull_parser_exception (p_FILE, LINE, GUTHTHILA_ERROR_NULL_ATTRIBUTE_VALUE);
+ guththila_exception (p_FILE, LINE, GUTHTHILA_ERROR_NULL_ATTRIBUTE_VALUE);
if (att->value->end)
return guththila_token_to_string (environment, att->value,
parser->unicode_state);
@@ -1220,14 +1220,14 @@
AXIS2_EXTERN guththila_char_t * AXIS2_CALL
-guththila_xml_pull_parser_get_attribute_prefix (axis2_env_t *
+guththila_get_attribute_prefix (axis2_env_t *
environment,
- guththila_xml_pull_parser_t *
+ guththila_t *
parser,
guththila_attribute_t * att)
{
if (!att)
- guththila_xml_pull_parser_exception (p_FILE, LINE, GUTHTHILA_ERROR_NULL_ATTRIBUTE_PREFIX);
+ guththila_exception (p_FILE, LINE, GUTHTHILA_ERROR_NULL_ATTRIBUTE_PREFIX);
if (att->prefix->end)
return guththila_token_to_string (environment, att->prefix,
parser->unicode_state);
@@ -1236,13 +1236,13 @@
AXIS2_EXTERN guththila_char_t * AXIS2_CALL
-guththila_xml_pull_parser_get_attribute_prefix_by_number (axis2_env_t * environment, guththila_xml_pull_parser_t * parser, int i)
+guththila_get_attribute_prefix_by_number (axis2_env_t * environment, guththila_t * parser, int i)
{
/* int ix = parser->attrib->pointer; */
int ix = AXIS2_STACK_SIZE (parser->attrib, environment);
guththila_attribute_t *attribute = NULL;
if (i > ix)
- guththila_xml_pull_parser_exception (p_FILE, LINE, GUTHTHILA_ERROR_REQUESTED_NUMBER_GREATER_THAN_STACK_SIZE);
+ guththila_exception (p_FILE, LINE, GUTHTHILA_ERROR_REQUESTED_NUMBER_GREATER_THAN_STACK_SIZE);
else
{
/* e = guththila_stack_last (environment, parser->attrib); */
@@ -1254,13 +1254,13 @@
AXIS2_EXTERN guththila_char_t * AXIS2_CALL
-guththila_xml_pull_parser_get_attribute_name_by_number (axis2_env_t * environment, guththila_xml_pull_parser_t * parser, int i)
+guththila_get_attribute_name_by_number (axis2_env_t * environment, guththila_t * parser, int i)
{
/* int ix = parser->attrib->pointer; */
int ix = AXIS2_STACK_SIZE (parser->attrib, environment);
guththila_attribute_t *attribute = NULL;
if (i > ix)
- guththila_xml_pull_parser_exception (p_FILE, LINE, GUTHTHILA_ERROR_REQUESTED_NUMBER_GREATER_THAN_STACK_SIZE);
+ guththila_exception (p_FILE, LINE, GUTHTHILA_ERROR_REQUESTED_NUMBER_GREATER_THAN_STACK_SIZE);
else
{
/* e = guththila_stack_last (environment, parser->attrib); */
@@ -1272,14 +1272,14 @@
AXIS2_EXTERN guththila_char_t * AXIS2_CALL
-guththila_xml_pull_parser_get_attribute_value_by_number (axis2_env_t * environment,
- guththila_xml_pull_parser_t * parser, int i)
+guththila_get_attribute_value_by_number (axis2_env_t * environment,
+ guththila_t * parser, int i)
{
/* int ix = parser->attrib->pointer; */
int ix = AXIS2_STACK_SIZE (parser->attrib, environment);
guththila_attribute_t *attribute = NULL;
if (i > ix)
- guththila_xml_pull_parser_exception (p_FILE, LINE, GUTHTHILA_ERROR_REQUESTED_NUMBER_GREATER_THAN_STACK_SIZE);
+ guththila_exception (p_FILE, LINE, GUTHTHILA_ERROR_REQUESTED_NUMBER_GREATER_THAN_STACK_SIZE);
else
{
/* e = guththila_stack_last (environment, parser->attrib); */
@@ -1291,8 +1291,8 @@
AXIS2_EXTERN guththila_char_t * AXIS2_CALL
-guththila_xml_pull_parser_get_name (axis2_env_t * environment,
- guththila_xml_pull_parser_t * parser)
+guththila_get_name (axis2_env_t * environment,
+ guththila_t * parser)
{
if (parser->name->end)
return guththila_token_to_string (environment, parser->name,
@@ -1302,8 +1302,8 @@
AXIS2_EXTERN guththila_char_t * AXIS2_CALL
-guththila_xml_pull_parser_get_value (axis2_env_t * environment,
- guththila_xml_pull_parser_t * parser)
+guththila_get_value (axis2_env_t * environment,
+ guththila_t * parser)
{
if (parser->value->end)
return guththila_token_to_string (environment, parser->value,
@@ -1314,8 +1314,8 @@
AXIS2_EXTERN guththila_char_t * AXIS2_CALL
-guththila_xml_pull_parser_get_prefix (axis2_env_t * environment,
- guththila_xml_pull_parser_t * parser)
+guththila_get_prefix (axis2_env_t * environment,
+ guththila_t * parser)
{
if (parser->prefix)
return guththila_token_to_string (environment, parser->prefix,
@@ -1325,9 +1325,9 @@
AXIS2_EXTERN int AXIS2_CALL
-guththila_xml_pull_parser_get_namespace_count (axis2_env_t *
+guththila_get_namespace_count (axis2_env_t *
environment,
- guththila_xml_pull_parser_t *
+ guththila_t *
parser)
{
if (parser->namesp)
@@ -1338,9 +1338,9 @@
AXIS2_EXTERN guththila_namespace_t * AXIS2_CALL
-guththila_xml_pull_parser_get_namespace (axis2_env_t *
+guththila_get_namespace (axis2_env_t *
environment,
- guththila_xml_pull_parser_t * parser)
+ guththila_t * parser)
{
guththila_namespace_t *namespace;
/* e = guththila_stack_pull_current (environment, parser->namesp); */
@@ -1353,9 +1353,9 @@
AXIS2_EXTERN guththila_char_t * AXIS2_CALL
-guththila_xml_pull_parser_get_namespace_prefix (axis2_env_t *
+guththila_get_namespace_prefix (axis2_env_t *
environment,
- guththila_xml_pull_parser_t *
+ guththila_t *
parser,
guththila_namespace_t * ns)
{
@@ -1367,9 +1367,9 @@
AXIS2_EXTERN guththila_char_t * AXIS2_CALL
-guththila_xml_pull_parser_get_namespace_uri (axis2_env_t *
+guththila_get_namespace_uri (axis2_env_t *
environment,
- guththila_xml_pull_parser_t *
+ guththila_t *
parser,
guththila_namespace_t * ns)
{
@@ -1381,15 +1381,15 @@
AXIS2_EXTERN guththila_char_t * AXIS2_CALL
-guththila_xml_pull_parser_get_namespace_prefix_by_number (axis2_env_t * environment,
- guththila_xml_pull_parser_t * parser,
+guththila_get_namespace_prefix_by_number (axis2_env_t * environment,
+ guththila_t * parser,
int i)
{
/* int ix = parser->namesp->pointer; */
int ix = AXIS2_STACK_SIZE (parser->namesp, environment);
guththila_namespace_t *ns = NULL;
if (i > ix)
- guththila_xml_pull_parser_exception (p_FILE, LINE, GUTHTHILA_ERROR_REQUESTED_NUMBER_GREATER_THAN_STACK_SIZE);
+ guththila_exception (p_FILE, LINE, GUTHTHILA_ERROR_REQUESTED_NUMBER_GREATER_THAN_STACK_SIZE);
else
{
/* e = guththila_stack_get (environment, parser->namesp, i); */
@@ -1400,16 +1400,16 @@
AXIS2_EXTERN guththila_char_t * AXIS2_CALL
-guththila_xml_pull_parser_get_namespace_uri_by_number (axis2_env_t
+guththila_get_namespace_uri_by_number (axis2_env_t
* environment,
- guththila_xml_pull_parser_t
+ guththila_t
* parser, int i)
{
/* int ix = parser->namesp->pointer; */
int ix = AXIS2_STACK_SIZE (parser->namesp, environment);
guththila_namespace_t *ns = NULL;
if (i > ix)
- guththila_xml_pull_parser_exception (p_FILE, LINE, GUTHTHILA_ERROR_REQUESTED_NUMBER_GREATER_THAN_STACK_SIZE);
+ guththila_exception (p_FILE, LINE, GUTHTHILA_ERROR_REQUESTED_NUMBER_GREATER_THAN_STACK_SIZE);
else
{
/* e = guththila_stack_get (environment, parser->namesp, i); */
@@ -1420,8 +1420,8 @@
AXIS2_EXTERN guththila_char_t * AXIS2_CALL
-guththila_xml_pull_parser_get_attribute_namespace_by_number (axis2_env_t * environment,
- guththila_xml_pull_parser_t * parser,
+guththila_get_attribute_namespace_by_number (axis2_env_t * environment,
+ guththila_t * parser,
int i)
{
guththila_char_t *att_prefix;
@@ -1430,7 +1430,7 @@
int ix = AXIS2_STACK_SIZE (parser->namesp, environment);
guththila_namespace_t *ns = NULL;
att_prefix =
- guththila_xml_pull_parser_get_attribute_prefix_by_number (environment,
+ guththila_get_attribute_prefix_by_number (environment,
parser, i);
for (ii = 0; ii <= ix; ii++)
@@ -1452,8 +1452,8 @@
}
AXIS2_EXTERN guththila_char_t * AXIS2_CALL
-guththila_xml_pull_parser_get_encoding(axis2_env_t *environment,
- guththila_xml_pull_parser_t *parser)
+guththila_get_encoding(axis2_env_t *environment,
+ guththila_t *parser)
{
/* parser will find character encoding base on Byte Order Mark
(BOM). */
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org