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 di...@apache.org on 2006/09/13 07:41:40 UTC
svn commit: r442856 - in /webservices/axis2/trunk/c/guththila:
include/guththila.h samples/guththila_main.c
samples/guththila_writer_main.c src/guththila_xml_pull_parser.c
src/guththila_xml_writer.c
Author: dinesh
Date: Tue Sep 12 22:41:39 2006
New Revision: 442856
URL: http://svn.apache.org/viewvc?view=rev&rev=442856
Log:
added is_whitespace to identifiy whitespace in CHARACTER event
Modified:
webservices/axis2/trunk/c/guththila/include/guththila.h
webservices/axis2/trunk/c/guththila/samples/guththila_main.c
webservices/axis2/trunk/c/guththila/samples/guththila_writer_main.c
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/include/guththila.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/include/guththila.h?view=diff&rev=442856&r1=442855&r2=442856
==============================================================================
--- webservices/axis2/trunk/c/guththila/include/guththila.h (original)
+++ webservices/axis2/trunk/c/guththila/include/guththila.h Tue Sep 12 22:41:39 2006
@@ -30,9 +30,7 @@
#include "guththila_namespace.h"
#include "guththila_depth.h"
#include "guththila_attribute.h"
-/* #include "guththila_stack.h */
#include "guththila_unicode.h"
-/* #include "guththila_environment.h" */
#include "guththila_defines.h"
#include <axis2_env.h>
@@ -90,6 +88,8 @@
int last;
int unicode_state;
int reader_type;
+ int is_whitespace;
+ int is_char;
enum guththila_status status;
enum guththila_event_types guththila_event;
} guththila_t;
Modified: webservices/axis2/trunk/c/guththila/samples/guththila_main.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/samples/guththila_main.c?view=diff&rev=442856&r1=442855&r2=442856
==============================================================================
--- webservices/axis2/trunk/c/guththila/samples/guththila_main.c (original)
+++ webservices/axis2/trunk/c/guththila/samples/guththila_main.c Tue Sep 12 22:41:39 2006
@@ -17,7 +17,7 @@
* @author Dinesh Premalal (xydinesh@gmail.com, premalwd@cse.mrt.ac.lk)
*/
-#include "guththila_xml_pull_parser.h"
+#include "guththila.h"
#include "guththila_defines.h"
#include "buffer.h"
@@ -28,7 +28,7 @@
axis2_allocator_t *allocator;
guththila_reader_t *red;
axis2_env_t *environment;
- guththila_xml_pull_parser_t *parser;
+ guththila_t *parser;
allocator = axis2_allocator_init (NULL);
environment =
axis2_env_create (allocator);
@@ -45,10 +45,10 @@
}
}
- parser = guththila_xml_pull_parser_create (environment, red);
- guththila_xml_pull_parser_read (environment, parser);
+ parser = guththila_create (environment, red);
+ guththila_read (environment, parser);
- while ((c = guththila_xml_pull_parser_next (environment, parser)) != -1)
+ while ((c = guththila_next (environment, parser)) != -1)
{
switch (c)
{
@@ -57,19 +57,19 @@
int ix;
printf ("<?xml ");
- ix = guththila_xml_pull_parser_get_attribute_count
+ ix = guththila_get_attribute_count
(environment, parser);
for (; ix > 0; ix--)
{
guththila_attribute_t *a;
char *p;
- a = guththila_xml_pull_parser_get_attribute (environment,
+ a = guththila_get_attribute (environment,
parser);
- p = guththila_xml_pull_parser_get_attribute_name
+ p = guththila_get_attribute_name
(environment, parser, a);
printf ("%s=\"", p);
AXIS2_FREE (allocator, p);
- p = guththila_xml_pull_parser_get_attribute_value
+ p = guththila_get_attribute_value
(environment, parser, a);
printf ("%s\" ", p);
AXIS2_FREE (allocator, p);
@@ -86,41 +86,41 @@
guththila_depth_t *depth;
printf ("<");
- p = guththila_xml_pull_parser_get_prefix (environment,
+ p = guththila_get_prefix (environment,
parser);
if (p)
{
printf ("%s:", p);
AXIS2_FREE (allocator, p);
}
- p = guththila_xml_pull_parser_get_name (environment, parser);
+ p = guththila_get_name (environment, parser);
printf ("%s", p);
AXIS2_FREE (allocator, p);
- ia = guththila_xml_pull_parser_get_attribute_count
+ ia = guththila_get_attribute_count
(environment, parser);
for (; ia > 0; ia--)
{
- /* p = guththila_xml_pull_parser_get_attribute_prefix_by_number
+ /* p = guththila_get_attribute_prefix_by_number
(parser, ia); */
- p = guththila_xml_pull_parser_get_attribute_namespace_by_number (environment, parser, ia);
+ p = guththila_get_attribute_namespace_by_number (environment, parser, ia);
if (p)
{
printf (" %s:", p);
AXIS2_FREE (allocator, p);
- p = guththila_xml_pull_parser_get_attribute_name_by_number (environment, parser, ia);
+ p = guththila_get_attribute_name_by_number (environment, parser, ia);
printf ("%s=\"", p);
AXIS2_FREE (allocator, p);
- p = guththila_xml_pull_parser_get_attribute_value_by_number (environment, parser, ia);
+ p = guththila_get_attribute_value_by_number (environment, parser, ia);
printf ("%s\"", p);
AXIS2_FREE (allocator, p);
}
else
{
- p = guththila_xml_pull_parser_get_attribute_name_by_number (environment, parser, ia);
+ p = guththila_get_attribute_name_by_number (environment, parser, ia);
printf (" %s=\"", p);
AXIS2_FREE (allocator, p);
- p = guththila_xml_pull_parser_get_attribute_value_by_number (environment, parser, ia);
+ p = guththila_get_attribute_value_by_number (environment, parser, ia);
printf ("%s\"", p);
AXIS2_FREE (allocator, p);
}
@@ -129,12 +129,12 @@
d = depth->count;
for (; d > 0; d--)
{
- p = guththila_xml_pull_parser_get_namespace_prefix_by_number (environment, parser, d);
+ p = guththila_get_namespace_prefix_by_number (environment, parser, d);
if (strncmp (p, "xmlns", 5))
printf (" xmlns:");
printf ("%s=\"", p);
AXIS2_FREE (allocator, p);
- p = guththila_xml_pull_parser_get_namespace_uri_by_number
+ p = guththila_get_namespace_uri_by_number
(environment, parser, d);
printf ("%s\" ", p);
AXIS2_FREE (allocator, p);
@@ -149,14 +149,14 @@
{
char *p;
printf ("</");
- p = guththila_xml_pull_parser_get_prefix (environment,
+ p = guththila_get_prefix (environment,
parser);
if (p)
{
printf ("%s:", p);
AXIS2_FREE (allocator, p);
}
- p = guththila_xml_pull_parser_get_name (environment, parser);
+ p = guththila_get_name (environment, parser);
printf ("%s", p);
AXIS2_FREE (allocator, p);
printf (">");
@@ -165,8 +165,11 @@
case GUTHTHILA_CHARACTER:
{
char *p;
- p = guththila_xml_pull_parser_get_value (environment, parser);
- printf (p);
+ p = guththila_get_value (environment, parser);
+ if (!parser->is_whitespace)
+ {
+ printf (p);
+ }
AXIS2_FREE (allocator, p);
}
break;
@@ -175,7 +178,7 @@
};
}
guththila_reader_free (environment, red);
- guththila_xml_pull_parser_free (environment, parser);
+ guththila_free (environment, parser);
axis2_allocator_free (allocator);
axis2_env_free (environment);
return 0;
Modified: webservices/axis2/trunk/c/guththila/samples/guththila_writer_main.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/samples/guththila_writer_main.c?view=diff&rev=442856&r1=442855&r2=442856
==============================================================================
--- webservices/axis2/trunk/c/guththila/samples/guththila_writer_main.c (original)
+++ webservices/axis2/trunk/c/guththila/samples/guththila_writer_main.c Tue Sep 12 22:41:39 2006
@@ -2,48 +2,29 @@
#include <guththila_buffer.h>
#include <guththila_reader.h>
#include <guththila_writer.h>
-#include <guththila_xml_pull_parser.h>
+#include <guththila.h>
int main ()
{
axis2_allocator_t *allocator = axis2_allocator_init (NULL);
axis2_env_t *env = axis2_env_create (allocator);
- guththila_xml_pull_parser_t *parser = guththila_xml_pull_parser_create (env, NULL);
+ guththila_t *parser = guththila_create (env, NULL);
guththila_writer_t *writer = guththila_writer_create_for_memory (env);
-/* int c = 0; */
-/* c = guththila_writer_write (env, "test", 0, 5, writer); */
-/* char *file = "<Template><Application1 xmlns:xplt=\"http://www.xxxx.com/\" xmlns:xpl=\"http://www.xxxx.com/\">first</Application1><Application2 xmlns:xplt=\"http://www.xxxx.com/\" xmlns:xpl=\"http://www.xxxx.com/\"> second</Application2> </Template>"; */
-/* guththila_writer_write (env, file, 0, strlen (file), writer); */
-/* guththila_writer_write (env, file, 0, strlen (file), writer); */
-/* guththila_writer_write (env, file, 0, strlen (file), writer); */
-/* guththila_writer_write (env, file, 0, strlen (file), writer); */
-/* guththila_writer_write (env, file, 0, strlen (file), writer); */
-/* guththila_writer_write (env, file, 0, strlen (file), writer); */
-/* guththila_writer_write (env, file, 0, strlen (file), writer); */
-/* char *t = guththila_writer_get_buffer (env, writer); */
-/* printf ("print \t %s \n", t); */
- guththila_xml_pull_parser_create_xml_stream_writer_for_memory (env, parser);
- guththila_xml_pull_parser_write_start_document (env, parser);
- guththila_xml_pull_parser_write_start_element (env, parser, "person");
- guththila_xml_pull_parser_write_start_element (env, parser, "name");
- guththila_xml_pull_parser_write_characters (env, parser, "guththila");
- guththila_xml_pull_parser_write_start_element (env, parser, "escape");
- guththila_xml_pull_parser_write_escape_character (env, parser, "&");
- guththila_xml_pull_parser_write_escape_character (env, parser, ">");
- guththila_xml_pull_parser_write_end_element (env, parser);
- guththila_xml_pull_parser_write_start_element (env, parser, "escape");
- guththila_xml_pull_parser_write_default_namespace (env, parser, "http://www.cse.mrt.ac.lk");
- guththila_xml_pull_parser_write_namespace (env, parser, "a", "http://ws.apache.org");
- guththila_xml_pull_parser_write_start_element (env, parser, "test");
- guththila_xml_pull_parser_write_attribute_with_prefix(env, parser, "a", "web", "false");
- guththila_xml_pull_parser_write_start_element (env, parser, "one");
- guththila_xml_pull_parser_write_start_element_with_prefix (env, parser, "a", "two");
- guththila_xml_pull_parser_write_characters (env, parser, "it works !");
- guththila_xml_pull_parser_write_end_document (env, parser);
+ guththila_create_xml_stream_writer_for_memory (env, parser);
+ guththila_write_start_document (env, parser);
+ guththila_write_start_element_with_prefix_and_namespace (env, parser, "my", "http://localhost", "person");
+ guththila_write_start_element_with_prefix_and_namespace (env, parser, "my", "one");
+ guththila_write_characters (env, parser, "test");
+ guththila_write_end_element (env, parser);
+ guththila_write_start_element (env, parser, "two");
+ guththila_write_default_namespace (env, parser, "http://another.host.com");
+ guththila_write_start_element (env, parser, "two.one");
+ guththila_write_end_element (env, parser);
+ guththila_write_end_document (env, parser);
char *t = guththila_writer_get_buffer (env, parser->xsw->writer);
printf ("%s \n", t);
- guththila_xml_pull_parser_xml_writer_free (env, parser);
- guththila_xml_pull_parser_free (env, parser);
+ guththila_xml_writer_free (env, parser);
+ guththila_free (env, parser);
axis2_allocator_free (allocator);
axis2_env_free (env);
return 0;
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=442856&r1=442855&r2=442856
==============================================================================
--- webservices/axis2/trunk/c/guththila/src/guththila_xml_pull_parser.c (original)
+++ webservices/axis2/trunk/c/guththila/src/guththila_xml_pull_parser.c Tue Sep 12 22:41:39 2006
@@ -18,20 +18,13 @@
#include <guththila.h>
-/* static int AXIS2_CALL */
-/* guththila_is_space (int c) */
-/* { */
-/* return (0x20 == c || 0x9 == c || 0xD == c || 0xA == c); */
-/* } */
-
-
AXIS2_EXTERN guththila_t * AXIS2_CALL
guththila_create (axis2_env_t * environment,
- guththila_reader_t * r)
+ guththila_reader_t * r)
{
guththila_t *parser =
(guththila_t *) AXIS2_MALLOC (
- environment->allocator, sizeof (guththila_t));
+ environment->allocator, sizeof (guththila_t));
guththila_reader_impl_t *reader_impl = NULL;
if (r)
{
@@ -62,21 +55,16 @@
parser->status = S_1;
parser->unicode_state = None;
parser->xsw = NULL;
-
+ parser->is_whitespace = 0;
+ parser->is_char = 0;
return parser;
}
AXIS2_EXTERN void AXIS2_CALL
guththila_free (axis2_env_t * environment,
- guththila_t * parser)
+ guththila_t * parser)
{
- /* if (parser->reader_type != GUTHTHILA_MEMORY_READER) */
- /* { */
- /* if (parser->buffer) */
- /* guththila_buffer_free (environment, (void *) parser->buffer); */
- /* } */
-
if (parser->buffer)
guththila_buffer_free (environment, (void *) parser->buffer);
@@ -113,8 +101,8 @@
void AXIS2_CALL
guththila_relocate_tokens (axis2_env_t *environment,
- guththila_t *parser,
- int offset)
+ guththila_t *parser,
+ int offset)
{
guththila_token_t *el = NULL;
int isize = 0;
@@ -130,7 +118,7 @@
void AXIS2_CALL
guththila_shift (axis2_env_t * environment,
- guththila_t * parser)
+ guththila_t * parser)
{
memmove (parser->buffer->buff, parser->buffer->buff + (parser->offset),
(parser->_next) - (parser->offset));
@@ -142,7 +130,7 @@
int AXIS2_CALL
guththila_read (axis2_env_t * environment,
- guththila_t * parser)
+ guththila_t * parser)
{
int c = 0;
if (parser->_next == parser->buffer->size)
@@ -150,7 +138,7 @@
if (parser->offset > 0)
{
guththila_relocate_tokens (environment, parser,
- parser->offset);
+ parser->offset);
guththila_shift (environment, parser);
}
else
@@ -159,7 +147,7 @@
parser->buffer =
guththila_buffer_grow (environment, parser->buffer);
guththila_relocate_tokens (
- environment, parser, (parser->buffer->size - b));
+ environment, parser, (parser->buffer->size - b));
}
}
c = guththila_reader_read (environment, (parser->buffer->buff),
@@ -173,8 +161,8 @@
int AXIS2_CALL
guththila_from_utf16 (axis2_env_t * environment,
- guththila_t * parser,
- int eof)
+ guththila_t * parser,
+ int eof)
{
int c = parser->buffer->buff[parser->_next++];
if (((parser->_next) > (parser->last))
@@ -193,8 +181,8 @@
int AXIS2_CALL
guththila_next_char (axis2_env_t * environment,
- guththila_t * parser,
- int eof)
+ guththila_t * parser,
+ int eof)
{
if (parser->reader_type == GUTHTHILA_MEMORY_READER)
@@ -247,13 +235,13 @@
return parser->buffer->buff[parser->_next++];
else
return guththila_from_utf16 (environment, parser,
- eof);
+ eof);
}
guththila_char_t * AXIS2_CALL
guththila_last_char (axis2_env_t * environment,
- guththila_t * parser)
+ guththila_t * parser)
{
return parser->buffer->buff + (parser->_next - 1);
}
@@ -261,7 +249,7 @@
void AXIS2_CALL
guththila_open_token (axis2_env_t * environment,
- guththila_t * parser)
+ guththila_t * parser)
{
guththila_token_t *t =
(guththila_token_t *) AXIS2_MALLOC (environment->allocator,
@@ -274,8 +262,8 @@
void AXIS2_CALL
guththila_close_token (axis2_env_t * environment,
- guththila_t * parser,
- int t, int refer)
+ guththila_t * parser,
+ int t, int refer)
{
guththila_token_t *token =
(guththila_token_t *) AXIS2_STACK_GET (parser->stack, environment);
@@ -288,8 +276,8 @@
int AXIS2_CALL
guththila_skip_spaces (axis2_env_t * environment,
- guththila_t * parser,
- int c)
+ guththila_t * parser,
+ int c)
{
while (0x20 == c || 0x9 == c || 0xD == c || 0xA == c)
c = guththila_next_char (environment, parser, 0);
@@ -299,8 +287,8 @@
int AXIS2_CALL
guththila_process_eq (axis2_env_t * environment,
- guththila_t * parser,
- int c)
+ guththila_t * parser,
+ int c)
{
int ic;
if (0x3D ==
@@ -308,7 +296,7 @@
{
ic = guththila_next_char (environment, parser, 0);
return guththila_skip_spaces (environment, parser,
- ic);
+ ic);
}
else
guththila_exception (p_FILE, LINE, GUTHTHILA_ERROR_PROCESS_EQUAL);
@@ -318,9 +306,9 @@
int AXIS2_CALL
guththila_process_version_info (axis2_env_t *
- environment,
- guththila_t *
- parser)
+ environment,
+ guththila_t *
+ parser)
{
int ic;
int quote;
@@ -333,33 +321,33 @@
if ('e' ==
guththila_next_char (environment, parser, 0)
&& 'r' == guththila_next_char (environment,
- parser, 0)
+ parser, 0)
&& 's' == guththila_next_char (environment,
- parser, 0)
+ parser, 0)
&& 'i' == guththila_next_char (environment,
- parser, 0)
+ parser, 0)
&& 'o' == guththila_next_char (environment,
- parser, 0)
+ parser, 0)
&& 'n' == guththila_next_char (environment,
- parser, 0))
+ parser, 0))
{
ic = guththila_next_char (environment, parser, 0);
guththila_close_token (environment, parser,
- _attribute, 0);
+ _attribute, 0);
quote =
guththila_process_eq (environment, parser,
- ic);
+ ic);
nc = guththila_next_char (environment, parser, 0);
/* 0, since we don't expect EOF line here */
guththila_open_token (environment, parser);
while (quote != nc)
nc = guththila_next_char (environment, parser,
- 0);
+ 0);
guththila_close_token (environment, parser,
- _attribute_value, 0);
+ _attribute_value, 0);
nc = guththila_next_char (environment, parser, 0);
return guththila_skip_spaces (environment, parser,
- nc);
+ nc);
}
else
guththila_exception (p_FILE, LINE, GUTHTHILA_ERROR_INCORRECT_VERSION_INFO);
@@ -372,9 +360,9 @@
int AXIS2_CALL
guththila_process_encoding_decl (axis2_env_t *
- environment,
- guththila_t *
- parser)
+ environment,
+ guththila_t *
+ parser)
{
int quote;
int nc;
@@ -387,11 +375,11 @@
&& 'i' == guththila_next_char (environment, parser, 0)
&& 'n' == guththila_next_char (environment, parser, 0)
&& 'g' == guththila_next_char (environment, parser,
- 0))
+ 0))
{
ic = guththila_next_char (environment, parser, 0);
guththila_close_token (environment, parser,
- _attribute, 0);
+ _attribute, 0);
quote =
guththila_process_eq (environment, parser, ic);
nc = guththila_next_char (environment, parser, 0);
@@ -399,10 +387,10 @@
while (quote != nc)
nc = guththila_next_char (environment, parser, 0);
guththila_close_token (environment, parser,
- _attribute_value, 0);
+ _attribute_value, 0);
nc = guththila_next_char (environment, parser, 0);
return guththila_skip_spaces (environment, parser,
- nc);
+ nc);
}
else
guththila_exception (p_FILE, LINE, GUTHTHILA_ERROR_ENCODING_DECLARATION_ERROR);
@@ -412,9 +400,9 @@
int AXIS2_CALL
guththila_process_sd_decl (axis2_env_t *
- environment,
- guththila_t *
- parser)
+ environment,
+ guththila_t *
+ parser)
{
int quote = 0;
int nc = 0;
@@ -429,10 +417,10 @@
&& 'o' == guththila_next_char (environment, parser, 0)
&& 'n' == guththila_next_char (environment, parser, 0)
&& 'e' == guththila_next_char (environment, parser,
- 0))
+ 0))
ic = guththila_next_char (environment, parser, 0);
guththila_close_token (environment, parser, _attribute,
- 0);
+ 0);
quote = guththila_process_eq (environment, parser, ic);
nc = guththila_next_char (environment, parser, 0);
guththila_open_token (environment, parser);
@@ -443,11 +431,11 @@
if ('e' !=
guththila_next_char (environment, parser, 0)
|| 's' != guththila_next_char (environment,
- parser, 0))
+ parser, 0))
guththila_exception (p_FILE, LINE, GUTHTHILA_ERROR_STANDALONE_ERROR_IN_YES);
else
nc = guththila_next_char (environment, parser,
- 0);
+ 0);
}
else if ('n' == nc)
{
@@ -456,13 +444,13 @@
guththila_exception (p_FILE, LINE, GUTHTHILA_ERROR_STANDALONE_ERROR_IN_NO);
else
nc = guththila_next_char (environment, parser,
- 0);
+ 0);
}
else
guththila_exception (p_FILE, LINE, GUTHTHILA_ERROR_STANDALONE_ERROR_YES_OR_NO_NOT_AVAILABLE);
}
guththila_close_token (environment, parser,
- _attribute_value, 0);
+ _attribute_value, 0);
nc = guththila_next_char (environment, parser, 0);
return guththila_skip_spaces (environment, parser, nc);
}
@@ -470,26 +458,26 @@
int AXIS2_CALL
guththila_process_xml_decl (axis2_env_t *
- environment,
- guththila_t *
- parser)
+ environment,
+ guththila_t *
+ parser)
{
int ix;
if ('x' == guththila_next_char (environment, parser, 0)
&& 'm' == guththila_next_char (environment, parser, 0)
&& 'l' == guththila_next_char (environment, parser,
- 0))
+ 0))
{
ix = guththila_process_version_info (environment,
- parser);
+ parser);
if ('e' == ix)
ix = guththila_process_encoding_decl (environment,
- parser);
+ parser);
if ('s' == ix)
ix = guththila_process_sd_decl (environment,
- parser);
+ parser);
if ('?' == ix)
{
@@ -512,13 +500,15 @@
void AXIS2_CALL
guththila_reset (axis2_env_t * environment,
- guththila_t * parser)
+ guththila_t * parser)
{
int ii;
parser->offset = parser->_next;
parser->name = NULL;
parser->prefix = NULL;
parser->value = NULL;
+ parser->is_whitespace = 0;
+ parser->is_char = 0;
ii = AXIS2_STACK_SIZE (parser->attrib, environment);
for (; ii > 0; ii--)
@@ -535,8 +525,7 @@
d = AXIS2_STACK_POP (parser->stack, environment);
AXIS2_FREE (environment->allocator, d);
}
- /* guththila_stack_clear (environment, parser->attrib); */
- /* guththila_stack_clear (environment, parser->stack); */
+
if(parser->guththila_event == GUTHTHILA_END_ELEMENT
|| parser->guththila_event == GUTHTHILA_EMPTY_ELEMENT)
guththila_close_element (environment, parser);
@@ -545,7 +534,7 @@
int AXIS2_CALL
guththila_is_space (axis2_env_t * environment,
- int c)
+ int c)
{
if (0x20 == c || 0xD == c || 0xA == c || 0x9 == c)
return 1;
@@ -556,9 +545,9 @@
int AXIS2_CALL
guththila_is_valid_starting_char (axis2_env_t *
- environment,
- guththila_t
- * parser, int c)
+ environment,
+ guththila_t
+ * parser, int c)
{
if (isalpha (c) || '_' == c || ':' == c)
return 1;
@@ -569,7 +558,7 @@
int AXIS2_CALL
guththila_process_name (axis2_env_t * environment,
- guththila_t * parser)
+ guththila_t * parser)
{
int c;
guththila_char_t *x;
@@ -587,7 +576,7 @@
if (':' == c)
{
guththila_close_token (environment, parser,
- _prefix, 0);
+ _prefix, 0);
c = guththila_next_char (environment, parser, 0);
guththila_open_token (environment, parser);
}
@@ -602,9 +591,9 @@
int AXIS2_CALL
guththila_process_attribute_value (axis2_env_t *
- environment,
- guththila_t
- * parser, int quote)
+ environment,
+ guththila_t
+ * parser, int quote)
{
int c = 0;
if ('\'' == quote || '\"' == quote)
@@ -617,9 +606,9 @@
if (quote == c)
{
guththila_close_token (environment, parser,
- _attribute_value, 0);
+ _attribute_value, 0);
return guththila_next_char (environment,
- parser, 0);
+ parser, 0);
}
}
while ('<' != c || '&' != c);
@@ -632,25 +621,25 @@
int AXIS2_CALL
guththila_process_attribute (axis2_env_t *
- environment,
- guththila_t *
- parser, int c)
+ environment,
+ guththila_t *
+ parser, int c)
{
int q;
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);
+ parser, q);
return q;
}
int AXIS2_CALL
guththila_processSTagOrEmptyElem (axis2_env_t *
- environment,
- guththila_t
- * parser)
+ environment,
+ guththila_t
+ * parser)
{
int c;
c = guththila_process_name (environment, parser);
@@ -672,9 +661,9 @@
else
{
c = guththila_process_attribute (environment,
- parser, c);
+ parser, c);
c = guththila_skip_spaces (environment, parser,
- c);
+ c);
}
}
}
@@ -682,49 +671,66 @@
int AXIS2_CALL
guththila_process_char_data (axis2_env_t *
- environment,
- guththila_t *
- parser)
+ environment,
+ guththila_t *
+ parser)
{
- int c;
+ int c = 0;
int ref = 0;
- /* int all_spaces = 1; */
- /* int last_event = parser->guththila_event; */
+ parser->is_whitespace = 0;
+ parser->is_char = 0;
+
parser->guththila_event = GUTHTHILA_CHARACTER;
guththila_open_token (environment, parser);
+
+ c = parser->buffer->buff [parser->_next - 1];
+
+ if (isspace (c))
+ {
+ parser->is_whitespace = 1;
+ }
+
do
{
- c = guththila_next_char (environment, parser, -1);
- /* if (c != '<') */
- /* all_spaces = (all_spaces && guththila_is_space (c)); */
+ c = guththila_next_char (environment, parser, -1);
- if (c == '&')
+ if (isspace (c))
+ {
+ if (!parser->is_char)
+ parser->is_whitespace = 1;
+ else
+ parser->is_whitespace = 0;
+ }
+ else if (c == '&')
ref = 1;
-
- if (c == -1)
+ else if (c == -1) /* first should check for eof then
+ only check of r != < */
{
guththila_close_token (environment, parser,
- _char_data, ref);
+ _char_data, ref);
return 0;
}
+ else if (c != '<')
+ {
+ parser->is_whitespace = 0;
+ parser->is_char = 1;
+ }
+
}
while (c != '<');
-
- /* if (all_spaces) */
- /* parser->guththila_event = GUTHTHILA_SPACE; */
guththila_close_token (environment, parser, _char_data,
- ref);
+ ref);
return c;
}
int AXIS2_CALL
guththila_process_end_tag (axis2_env_t *
- environment,
- guththila_t *
- parser)
+ environment,
+ guththila_t *
+ parser)
{
int c;
c = guththila_next_char (environment, parser, 0);
@@ -740,7 +746,7 @@
int AXIS2_CALL
guththila_process_pi (axis2_env_t * environment,
- guththila_t * parser)
+ guththila_t * parser)
{
int c;
parser->guththila_event = GUTHTHILA_COMMENT;
@@ -753,14 +759,14 @@
int AXIS2_CALL
guththila_process_comment (axis2_env_t *
- environment,
- guththila_t *
- parser)
+ environment,
+ guththila_t *
+ parser)
{
int c;
if ('-' == guththila_next_char (environment, parser, 0)
&& '-' == guththila_next_char (environment, parser,
- 0))
+ 0))
{
c = guththila_next_char (environment, parser, 0);
while (1)
@@ -769,12 +775,12 @@
if ('-' == c)
{
c = guththila_next_char (environment, parser,
- 0);
+ 0);
if ('-' == c)
{
if ('>' ==
guththila_next_char (environment,
- parser, 0))
+ parser, 0))
{
parser->guththila_event = GUTHTHILA_COMMENT;
while ('<' != c)
@@ -804,7 +810,7 @@
int AXIS2_CALL
guththila_tokenize (axis2_env_t * environment,
- guththila_t * parser)
+ guththila_t * parser)
{
do
{
@@ -833,13 +839,13 @@
if ('?' == c)
{
guththila_process_xml_decl (environment,
- parser);
+ parser);
parser->status = S_3;
}
else if ('!' == c)
{
guththila_process_comment (environment,
- parser);
+ parser);
parser->status = S_4;
}
else
@@ -856,7 +862,7 @@
else
{
c = guththila_process_char_data (environment,
- parser);
+ parser);
if ('<' == c)
{
parser->status = S_4;
@@ -872,18 +878,18 @@
if ('/' == c)
{
guththila_process_end_tag (environment,
- parser);
+ parser);
parser->status = S_3;
}
else if ('?' == c)
guththila_process_pi (environment, parser);
else if ('!' == c)
guththila_process_comment (environment,
- parser);
+ parser);
else
{
guththila_processSTagOrEmptyElem (environment,
- parser);
+ parser);
parser->status = S_3;
}
break;
@@ -898,7 +904,7 @@
AXIS2_EXTERN int AXIS2_CALL
guththila_next (axis2_env_t * environment,
- guththila_t * parser)
+ guththila_t * parser)
{
int ix;
guththila_reset (environment, parser);
@@ -925,8 +931,8 @@
ix--;
att_name = token;
guththila_add_attribute (environment,
- parser, att_name,
- att_value);
+ parser, att_name,
+ att_value);
}
}
}
@@ -956,12 +962,12 @@
(environment, token, "xmlns", 5,
parser->unicode_state))
guththila_add_namespace (environment,
- parser, name,
- value);
+ parser, name,
+ value);
else
guththila_add_attribute (environment,
- parser, name,
- value);
+ parser, name,
+ value);
}
else if (token->type == _name)
{
@@ -979,11 +985,11 @@
{
attribute = (guththila_attribute_t *) AXIS2_STACK_POP ( parser->attrib, environment);
guththila_add_namespace (environment,
- parser,
- attribute->
- name,
- attribute->
- value);
+ parser,
+ attribute->
+ name,
+ attribute->
+ value);
}
else
{
@@ -1038,7 +1044,7 @@
void AXIS2_CALL
guththila_open_element (axis2_env_t * environment,
- guththila_t * parser)
+ guththila_t * parser)
{
int ii;
guththila_depth_t *m =
@@ -1069,8 +1075,8 @@
void AXIS2_CALL
guththila_close_element (axis2_env_t *
- environment,
- guththila_t * parser)
+ environment,
+ guththila_t * parser)
{
guththila_depth_t *depth;
guththila_namespace_t *namespace;
@@ -1098,10 +1104,10 @@
void AXIS2_CALL
guththila_add_attribute (axis2_env_t *
- environment,
- guththila_t * parser,
- guththila_token_t * name,
- guththila_token_t * value)
+ environment,
+ guththila_t * parser,
+ guththila_token_t * name,
+ guththila_token_t * value)
{
guththila_attribute_t *att;
att =
@@ -1118,14 +1124,14 @@
void AXIS2_CALL
guththila_add_attribute_with_prefix (axis2_env_t *
- environment,
- guththila_t
- * parser,
- guththila_token_t *
- prefix,
- guththila_token_t * name,
- guththila_token_t *
- value)
+ environment,
+ guththila_t
+ * parser,
+ guththila_token_t *
+ prefix,
+ guththila_token_t * name,
+ guththila_token_t *
+ value)
{
guththila_attribute_t *att;
att =
@@ -1136,17 +1142,17 @@
att->value = value;
att->prefix = prefix;
AXIS2_STACK_PUSH (parser->attrib, environment, att);
- /* guththila_stack_push (environment, parser->attrib, NULL, att); */
+
/* _element can keep , tokens and attributes here token set to null */
}
void AXIS2_CALL
guththila_add_namespace (axis2_env_t *
- environment,
- guththila_t * parser,
- guththila_token_t * name,
- guththila_token_t * uri)
+ environment,
+ guththila_t * parser,
+ guththila_token_t * name,
+ guththila_token_t * uri)
{
guththila_namespace_t *ns;
ns = (guththila_namespace_t *) AXIS2_MALLOC (environment->allocator,
@@ -1159,15 +1165,14 @@
guththila_token_to_string (environment, uri, parser->unicode_state);
ns->lengthuri = AXIS2_STRLEN ( ns->uri);
AXIS2_STACK_PUSH (parser->namesp, environment, ns);
- /* guththila_stack_push_namespace (environment, parser->namesp, ns); */
}
AXIS2_EXTERN int AXIS2_CALL
guththila_get_attribute_count (axis2_env_t *
- environment,
- guththila_t *
- parser)
+ environment,
+ guththila_t *
+ parser)
{
return AXIS2_STACK_SIZE (parser->attrib, environment);
}
@@ -1175,8 +1180,8 @@
AXIS2_EXTERN guththila_attribute_t * AXIS2_CALL
guththila_get_attribute (axis2_env_t *
- environment,
- guththila_t * parser)
+ environment,
+ guththila_t * parser)
{
guththila_attribute_t *attribute;
attribute = (guththila_attribute_t *) AXIS2_STACK_POP (parser->attrib, environment);
@@ -1189,10 +1194,10 @@
AXIS2_EXTERN guththila_char_t * AXIS2_CALL
guththila_get_attribute_name (axis2_env_t *
- environment,
- guththila_t *
- parser,
- guththila_attribute_t * att)
+ environment,
+ guththila_t *
+ parser,
+ guththila_attribute_t * att)
{
if (!att)
guththila_exception (p_FILE, LINE, GUTHTHILA_ERROR_NULL_ATTRIBUTE_NAME);
@@ -1205,10 +1210,10 @@
AXIS2_EXTERN guththila_char_t * AXIS2_CALL
guththila_get_attribute_value (axis2_env_t *
- environment,
- guththila_t *
- parser,
- guththila_attribute_t * att)
+ environment,
+ guththila_t *
+ parser,
+ guththila_attribute_t * att)
{
if (!att)
guththila_exception (p_FILE, LINE, GUTHTHILA_ERROR_NULL_ATTRIBUTE_VALUE);
@@ -1221,10 +1226,10 @@
AXIS2_EXTERN guththila_char_t * AXIS2_CALL
guththila_get_attribute_prefix (axis2_env_t *
- environment,
- guththila_t *
- parser,
- guththila_attribute_t * att)
+ environment,
+ guththila_t *
+ parser,
+ guththila_attribute_t * att)
{
if (!att)
guththila_exception (p_FILE, LINE, GUTHTHILA_ERROR_NULL_ATTRIBUTE_PREFIX);
@@ -1238,14 +1243,12 @@
AXIS2_EXTERN guththila_char_t * AXIS2_CALL
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_exception (p_FILE, LINE, GUTHTHILA_ERROR_REQUESTED_NUMBER_GREATER_THAN_STACK_SIZE);
else
{
- /* e = guththila_stack_last (environment, parser->attrib); */
attribute = (guththila_attribute_t *) AXIS2_STACK_GET_AT (parser->attrib, environment, ix-i);
}
return guththila_token_to_string (environment, attribute->prefix,
@@ -1256,14 +1259,12 @@
AXIS2_EXTERN guththila_char_t * AXIS2_CALL
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_exception (p_FILE, LINE, GUTHTHILA_ERROR_REQUESTED_NUMBER_GREATER_THAN_STACK_SIZE);
else
{
- /* e = guththila_stack_last (environment, parser->attrib); */
attribute = (guththila_attribute_t *) AXIS2_STACK_GET_AT (parser->attrib, environment, ix-i);
}
return guththila_token_to_string (environment, attribute->name,
@@ -1273,16 +1274,14 @@
AXIS2_EXTERN guththila_char_t * AXIS2_CALL
guththila_get_attribute_value_by_number (axis2_env_t * environment,
- guththila_t * parser, int i)
+ 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_exception (p_FILE, LINE, GUTHTHILA_ERROR_REQUESTED_NUMBER_GREATER_THAN_STACK_SIZE);
else
{
- /* e = guththila_stack_last (environment, parser->attrib); */
attribute = (guththila_attribute_t *) AXIS2_STACK_GET_AT (parser->attrib, environment, ix-i);
}
return guththila_token_to_string (environment, attribute->value,
@@ -1292,7 +1291,7 @@
AXIS2_EXTERN guththila_char_t * AXIS2_CALL
guththila_get_name (axis2_env_t * environment,
- guththila_t * parser)
+ guththila_t * parser)
{
if (parser->name->end)
return guththila_token_to_string (environment, parser->name,
@@ -1303,7 +1302,7 @@
AXIS2_EXTERN guththila_char_t * AXIS2_CALL
guththila_get_value (axis2_env_t * environment,
- guththila_t * parser)
+ guththila_t * parser)
{
if (parser->value->end)
return guththila_token_to_string (environment, parser->value,
@@ -1315,7 +1314,7 @@
AXIS2_EXTERN guththila_char_t * AXIS2_CALL
guththila_get_prefix (axis2_env_t * environment,
- guththila_t * parser)
+ guththila_t * parser)
{
if (parser->prefix)
return guththila_token_to_string (environment, parser->prefix,
@@ -1326,9 +1325,9 @@
AXIS2_EXTERN int AXIS2_CALL
guththila_get_namespace_count (axis2_env_t *
- environment,
- guththila_t *
- parser)
+ environment,
+ guththila_t *
+ parser)
{
if (parser->namesp)
return AXIS2_STACK_SIZE (parser->namesp, environment);
@@ -1339,11 +1338,10 @@
AXIS2_EXTERN guththila_namespace_t * AXIS2_CALL
guththila_get_namespace (axis2_env_t *
- environment,
- guththila_t * parser)
+ environment,
+ guththila_t * parser)
{
guththila_namespace_t *namespace;
- /* e = guththila_stack_pull_current (environment, parser->namesp); */
namespace = (guththila_namespace_t *) AXIS2_STACK_GET (parser->namesp, environment);
if (namespace)
return namespace;
@@ -1354,10 +1352,10 @@
AXIS2_EXTERN guththila_char_t * AXIS2_CALL
guththila_get_namespace_prefix (axis2_env_t *
- environment,
- guththila_t *
- parser,
- guththila_namespace_t * ns)
+ environment,
+ guththila_t *
+ parser,
+ guththila_namespace_t * ns)
{
if (ns)
return AXIS2_STRDUP (ns->name, environment);
@@ -1368,10 +1366,10 @@
AXIS2_EXTERN guththila_char_t * AXIS2_CALL
guththila_get_namespace_uri (axis2_env_t *
- environment,
- guththila_t *
- parser,
- guththila_namespace_t * ns)
+ environment,
+ guththila_t *
+ parser,
+ guththila_namespace_t * ns)
{
if (ns)
return AXIS2_STRDUP (ns->uri, environment);
@@ -1382,17 +1380,15 @@
AXIS2_EXTERN guththila_char_t * AXIS2_CALL
guththila_get_namespace_prefix_by_number (axis2_env_t * environment,
- guththila_t * parser,
- int i)
+ 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_exception (p_FILE, LINE, GUTHTHILA_ERROR_REQUESTED_NUMBER_GREATER_THAN_STACK_SIZE);
else
{
- /* e = guththila_stack_get (environment, parser->namesp, i); */
ns = (guththila_namespace_t *) AXIS2_STACK_GET_AT (parser->namesp, environment, ix-i);
}
return AXIS2_STRDUP (ns->name, environment);
@@ -1401,18 +1397,16 @@
AXIS2_EXTERN guththila_char_t * AXIS2_CALL
guththila_get_namespace_uri_by_number (axis2_env_t
- * environment,
- guththila_t
- * parser, int i)
+ * 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_exception (p_FILE, LINE, GUTHTHILA_ERROR_REQUESTED_NUMBER_GREATER_THAN_STACK_SIZE);
else
{
- /* e = guththila_stack_get (environment, parser->namesp, i); */
ns = (guththila_namespace_t *) AXIS2_STACK_GET_AT (parser->namesp, environment, ix-i);
}
return AXIS2_STRDUP (ns->uri, environment);
@@ -1421,21 +1415,19 @@
AXIS2_EXTERN guththila_char_t * AXIS2_CALL
guththila_get_attribute_namespace_by_number (axis2_env_t * environment,
- guththila_t * parser,
- int i)
+ guththila_t * parser,
+ int i)
{
guththila_char_t *att_prefix;
int ii;
- /* int ix = parser->namesp->pointer; */
int ix = AXIS2_STACK_SIZE (parser->namesp, environment);
guththila_namespace_t *ns = NULL;
att_prefix =
guththila_get_attribute_prefix_by_number (environment,
- parser, i);
+ parser, i);
for (ii = 0; ii <= ix; ii++)
{
- /* e = guththila_stack_get (environment, parser->namesp, ii); */
ns = (guththila_namespace_t *) AXIS2_STACK_GET_AT (parser->namesp, environment, ix-ii);
if (ns)
{
@@ -1453,7 +1445,7 @@
AXIS2_EXTERN guththila_char_t * AXIS2_CALL
guththila_get_encoding(axis2_env_t *environment,
- guththila_t *parser)
+ guththila_t *parser)
{
/* parser will find character encoding base on Byte Order Mark
(BOM). */
Modified: webservices/axis2/trunk/c/guththila/src/guththila_xml_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/src/guththila_xml_writer.c?view=diff&rev=442856&r1=442855&r2=442856
==============================================================================
--- webservices/axis2/trunk/c/guththila/src/guththila_xml_writer.c (original)
+++ webservices/axis2/trunk/c/guththila/src/guththila_xml_writer.c Tue Sep 12 22:41:39 2006
@@ -74,8 +74,8 @@
size = 0;
guththila_check_xml_stream_writer (env, p);
-/* guththila_flush (env, p); */
- guththila_write_end_document (env, p);
+ /* guththila_flush (env, p); */
+ guththila_write_end_document (env, p);
if (p->xsw->writer_buffer)
{
guththila_buffer_free (env, p->xsw->writer_buffer);
@@ -186,7 +186,7 @@
AXIS2_EXTERN void AXIS2_CALL
guththila_write_start_document(axis2_env_t *env,
- guththila_t *p)
+ guththila_t *p)
{
char *sd = NULL;
guththila_check_xml_stream_writer (env, p);
@@ -207,7 +207,7 @@
}
else
{
- guththila_close_start_element (env, p);
+ guththila_close_start_element (env, p);
if (element)
{
guththila_write_to_buffer (env, p, "</");
@@ -253,7 +253,7 @@
guththila_open_depth_element (env, p);
size = AXIS2_STACK_SIZE (p->xsw->element, env);
- if (size)
+ if (size)
{
element = AXIS2_STACK_GET_AT (p->xsw->element, env, 0);
if (!strcmp ((char *)element, start_element))
@@ -323,14 +323,12 @@
p->xsw->start_element_open = 0;
p->xsw->empty_element_open = 0;
guththila_write_to_buffer (env, p,"/>");
- /* Stack_clear (p->xsw->attribute); */
}
if (p->xsw->start_element_open && !p->xsw->empty_element_open)
{
p->xsw->start_element_open = 0;
guththila_write_to_buffer (env, p,">");
- /* Stack_clear (p->xsw->attribute); */
}
stack_size = AXIS2_STACK_SIZE (p->xsw->attribute, env);
@@ -352,7 +350,7 @@
p->xsw->empty_element_open = 0;
}
-/* guththila_open_depth_element (env, p); */
+ /* guththila_open_depth_element (env, p); */
}
@@ -504,9 +502,9 @@
AXIS2_EXTERN void AXIS2_CALL
guththila_do_write_attribute (axis2_env_t *env,
- guththila_t *p,
- const char *local_name,
- const char *value)
+ guththila_t *p,
+ const char *local_name,
+ const char *value)
{
guththila_attribute_t *attr = (guththila_attribute_t *) AXIS2_MALLOC (env->allocator, sizeof (guththila_attribute_t));
@@ -670,26 +668,26 @@
void AXIS2_CALL
guththila_do_write_namespace (axis2_env_t *env, guththila_t *p, char *prefix, char *uri)
{
-guththila_namespace_t *ns = (guththila_namespace_t *) AXIS2_MALLOC (env->allocator, sizeof (guththila_namespace_t));
-ns->name = prefix;
-ns->length = strlen (prefix);
-ns->uri = uri;
-ns->lengthuri = strlen (uri);
-AXIS2_STACK_PUSH (p->xsw->namespace, env, ( void *)ns);
+ guththila_namespace_t *ns = (guththila_namespace_t *) AXIS2_MALLOC (env->allocator, sizeof (guththila_namespace_t));
+ ns->name = prefix;
+ ns->length = strlen (prefix);
+ ns->uri = uri;
+ ns->lengthuri = strlen (uri);
+ AXIS2_STACK_PUSH (p->xsw->namespace, env, ( void *)ns);
-guththila_write_to_buffer (env, p," ");
-guththila_write_to_buffer (env, p,"xmlns:");
-guththila_write_to_buffer (env, p,prefix);
-guththila_write_to_buffer (env, p," = \'");
-guththila_write_to_buffer (env, p,uri);
-guththila_write_to_buffer (env, p,"\'");
+ guththila_write_to_buffer (env, p," ");
+ guththila_write_to_buffer (env, p,"xmlns:");
+ guththila_write_to_buffer (env, p,prefix);
+ guththila_write_to_buffer (env, p," = \'");
+ guththila_write_to_buffer (env, p,uri);
+ guththila_write_to_buffer (env, p,"\'");
}
AXIS2_EXTERN void AXIS2_CALL
guththila_write_attribute_with_prefix_and_namespace (axis2_env_t *env, guththila_t *p,
- const char *prefix, const char *namespace,
- const char *local_name, const char *value)
+ const char *prefix, const char *namespace,
+ const char *local_name, const char *value)
{
int size = 0;
void *element;
@@ -743,8 +741,8 @@
void AXIS2_CALL
guththila_do_write_attribute_with_prefix_and_namespace (axis2_env_t *env, guththila_t *p,
- const char *prefix, const char *namespace_uri,
- const char *local_name, const char *value)
+ const char *prefix, const char *namespace_uri,
+ const char *local_name, const char *value)
{
guththila_attribute_t *attr = (guththila_attribute_t *) AXIS2_MALLOC (env->allocator, sizeof (guththila_attribute_t));
@@ -787,7 +785,7 @@
AXIS2_EXTERN void AXIS2_CALL
guththila_write_attribute_with_prefix (axis2_env_t *env, guththila_t *p, const char *prefix,
- const char *local_name, const char *value)
+ const char *local_name, const char *value)
{
int size = 0;
void *element;
@@ -844,7 +842,7 @@
void AXIS2_CALL
guththila_do_write_attribute_with_prefix(axis2_env_t *env, guththila_t *p, const char *prefix,
- const char *local_name, const char *value)
+ const char *local_name, const char *value)
{
guththila_do_write_attribute_with_prefix_and_namespace (env, p,prefix, NULL, local_name, value);
}
@@ -912,7 +910,7 @@
AXIS2_EXTERN void AXIS2_CALL
guththila_write_attribute_with_namespace (axis2_env_t *env, guththila_t *p, const char *namespace,
- const char *local_name, const char *value)
+ const char *local_name, const char *value)
{
int size = 0;
void *element;
@@ -999,7 +997,7 @@
AXIS2_EXTERN void AXIS2_CALL
guththila_write_start_element_with_prefix_and_namespace (axis2_env_t *env, guththila_t *p, const char *prefix,
- const char *namespace_uri, const char *local_name)
+ const char *namespace_uri, const char *local_name)
{
int size;
void *element;
@@ -1153,7 +1151,7 @@
AXIS2_EXTERN void AXIS2_CALL
guththila_write_empty_element_with_prefix_and_namespace (axis2_env_t *env, guththila_t *p,const char *prefix,
- const char *namespace_uri, const char *empty_element)
+ const char *namespace_uri, const char *empty_element)
{
guththila_check_xml_stream_writer (env, p);
guththila_close_start_element (env, p);
@@ -1245,7 +1243,7 @@
AXIS2_EXTERN void AXIS2_CALL
guththila_close (axis2_env_t *env,
- guththila_t *p)
+ guththila_t *p)
{
guththila_flush (env, p);
fclose (((guththila_writer_impl_t *)p->xsw->writer)->outputstream);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org