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 na...@apache.org on 2006/08/08 11:07:57 UTC
svn commit: r429612 - in /webservices/axis2/trunk/c/guththila:
include/guththila_writer.h include/guththila_xml_pull_parser.h
src/guththila_writer.c src/guththila_xml_pull_parser.c
src/guththila_xml_writer.c
Author: nandika
Date: Tue Aug 8 02:07:54 2006
New Revision: 429612
URL: http://svn.apache.org/viewvc?rev=429612&view=rev
Log:
compilation errors fixed in win32
Modified:
webservices/axis2/trunk/c/guththila/include/guththila_writer.h
webservices/axis2/trunk/c/guththila/include/guththila_xml_pull_parser.h
webservices/axis2/trunk/c/guththila/src/guththila_writer.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_writer.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/include/guththila_writer.h?rev=429612&r1=429611&r2=429612&view=diff
==============================================================================
--- webservices/axis2/trunk/c/guththila/include/guththila_writer.h (original)
+++ webservices/axis2/trunk/c/guththila/include/guththila_writer.h Tue Aug 8 02:07:54 2006
@@ -42,19 +42,17 @@
FILE *outputstream;
}guththila_writer_impl_t;
-AXIS2_EXTERN guththila_writer_t *
-guththila_writer_create_for_file
-(axis2_env_t *env,
-char *fp);
+AXIS2_EXTERN guththila_writer_t* AXIS2_CALL
+guththila_writer_create_for_file(axis2_env_t *env,
+ char *fp);
-AXIS2_EXTERN int
-guththila_writer_write
-(axis2_env_t *env,
-char *buffer,
-int offset,
-int length,
-guththila_writer_t *wt);
+AXIS2_EXTERN int AXIS2_CALL
+guththila_writer_write(axis2_env_t *env,
+ char *buffer,
+ int offset,
+ int length,
+ guththila_writer_t *wt);
AXIS2_EXTERN void
Modified: webservices/axis2/trunk/c/guththila/include/guththila_xml_pull_parser.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/include/guththila_xml_pull_parser.h?rev=429612&r1=429611&r2=429612&view=diff
==============================================================================
--- webservices/axis2/trunk/c/guththila/include/guththila_xml_pull_parser.h (original)
+++ webservices/axis2/trunk/c/guththila/include/guththila_xml_pull_parser.h Tue Aug 8 02:07:54 2006
@@ -108,7 +108,7 @@
guththila_xml_pull_parser_t * p);
-int AXIS2_CALL
+AXIS2_EXTERN int AXIS2_CALL
guththila_xml_pull_parser_exception (guththila_char_t * s, int line, int error_code);
int AXIS2_CALL
@@ -366,53 +366,53 @@
char *fp);
-void AXIS2_CALL
+AXIS2_EXTERN void AXIS2_CALL
guththila_xml_pull_parser_write_to_buffer (axis2_env_t *env,
guththila_xml_pull_parser_t *p,
const char *buff);
-void AXIS2_CALL
+AXIS2_EXTERN void AXIS2_CALL
guththila_xml_pull_parser_close_start_element (axis2_env_t *environment,
guththila_xml_pull_parser_t *p);
-void AXIS2_CALL
+AXIS2_EXTERN void AXIS2_CALL
guththila_xml_pull_parser_close_depth_element (axis2_env_t *environment,
guththila_xml_pull_parser_t *p);
-void AXIS2_CALL
+AXIS2_EXTERN void AXIS2_CALL
guththila_xml_pull_parser_check_name_validity (axis2_env_t *environment,
guththila_xml_pull_parser_t *p,
char *start_element);
-void AXIS2_CALL
+AXIS2_EXTERN void AXIS2_CALL
guththila_xml_pull_parser_open_depth_element (axis2_env_t *environment,
guththila_xml_pull_parser_t *p);
-void AXIS2_CALL
+AXIS2_EXTERN void AXIS2_CALL
guththila_xml_pull_parser_do_write_attribute (axis2_env_t *environment,
guththila_xml_pull_parser_t *p,
const char *local_name,
const char *value);
-int AXIS2_CALL
+AXIS2_EXTERN int AXIS2_CALL
guththila_xml_pull_parser_check_default_namespace (axis2_env_t *env,
guththila_xml_pull_parser_t *p,
char *ns_uri);
-void AXIS2_CALL
+AXIS2_EXTERN void AXIS2_CALL
guththila_xml_pull_parser_do_write_default_namespace (axis2_env_t *env,
guththila_xml_pull_parser_t *p,
char *ns_uri);
-int AXIS2_CALL
+AXIS2_EXTERN int AXIS2_CALL
guththila_xml_pull_parser_check_prefix_validity (axis2_env_t *env,
guththila_xml_pull_parser_t *p,
char *prefix,
@@ -445,7 +445,7 @@
const char *value);
-int AXIS2_CALL
+AXIS2_EXTERN int AXIS2_CALL
guththila_xml_pull_parser_is_exsisting_prefix (axis2_env_t *env,
guththila_xml_pull_parser_t *p,
const char *prefix);
@@ -487,7 +487,7 @@
guththila_xml_pull_parser_t *p);
-void AXIS2_CALL
+AXIS2_EXTERN void AXIS2_CALL
guththila_xml_pull_parser_close (axis2_env_t *environment,
guththila_xml_pull_parser_t *p);
@@ -610,7 +610,7 @@
char *element_name,
char *characters);
-void
+AXIS2_EXTERN void AXIS2_CALL
guththila_xml_pull_parser_xml_writer_free (axis2_env_t *environment,
guththila_xml_pull_parser_t *t);
Modified: webservices/axis2/trunk/c/guththila/src/guththila_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/src/guththila_writer.c?rev=429612&r1=429611&r2=429612&view=diff
==============================================================================
--- webservices/axis2/trunk/c/guththila/src/guththila_writer.c (original)
+++ webservices/axis2/trunk/c/guththila/src/guththila_writer.c Tue Aug 8 02:07:54 2006
@@ -19,24 +19,18 @@
#include "guththila_writer.h"
-AXIS2_EXTERN guththila_writer_t *
+AXIS2_EXTERN guththila_writer_t * AXIS2_CALL
guththila_writer_create_for_file (axis2_env_t *env, char *fp)
{
-
- if (!fp)
- return NULL;
-
- guththila_writer_impl_t *wt = NULL;
-
- wt = (guththila_writer_impl_t *) AXIS2_MALLOC (env->allocator, sizeof (guththila_writer_impl_t));
-
- wt->outputstream = fopen (fp, "w");
-
- if (!wt->outputstream)
- return NULL;
-
- wt->writer.guththila_writer_type = GUTHTHILA_WRITER_CREATE_FOR_FILE;
- return &(wt->writer);
+ guththila_writer_impl_t *wt = NULL;
+ if(!fp)
+ return NULL;
+ wt = (guththila_writer_impl_t *) AXIS2_MALLOC (env->allocator, sizeof (guththila_writer_impl_t));
+ wt->outputstream = fopen (fp, "w");
+ if (!wt->outputstream)
+ return NULL;
+ wt->writer.guththila_writer_type = GUTHTHILA_WRITER_CREATE_FOR_FILE;
+ return &(wt->writer);
}
AXIS2_EXTERN void
@@ -55,16 +49,17 @@
}
}
-AXIS2_EXTERN int
-guththila_writer_write (axis2_env_t *env, char *buffer, int offset, int length, guththila_writer_t *wt)
+AXIS2_EXTERN int AXIS2_CALL
+guththila_writer_write (axis2_env_t *env,
+ char *buffer, int offset,
+ int length, guththila_writer_t *wt)
{
-
- if (wt->guththila_writer_type == GUTHTHILA_WRITER_CREATE_FOR_FILE)
+ if (wt->guththila_writer_type == GUTHTHILA_WRITER_CREATE_FOR_FILE)
{
- int c;
- c = fwrite (buffer+offset, 1, length, ((guththila_writer_impl_t *)wt)->outputstream);
- return c;
+ int c;
+ c = fwrite (buffer+offset, 1, length, ((guththila_writer_impl_t *)wt)->outputstream);
+ return c;
}
- else
- return 0;
+ else
+ 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?rev=429612&r1=429611&r2=429612&view=diff
==============================================================================
--- webservices/axis2/trunk/c/guththila/src/guththila_xml_pull_parser.c (original)
+++ webservices/axis2/trunk/c/guththila/src/guththila_xml_pull_parser.c Tue Aug 8 02:07:54 2006
@@ -481,31 +481,32 @@
guththila_xml_pull_parser_reset (axis2_env_t * environment,
guththila_xml_pull_parser_t * parser)
{
- parser->offset = parser->_next;
- parser->name = NULL;
- parser->prefix = NULL;
- parser->value = NULL;
- int ii;
- ii = AXIS2_STACK_SIZE (parser->attrib, environment);
- for (; ii > 0; ii--)
+ int ii;
+ parser->offset = parser->_next;
+ parser->name = NULL;
+ parser->prefix = NULL;
+ parser->value = NULL;
+
+ ii = AXIS2_STACK_SIZE (parser->attrib, environment);
+ for (; ii > 0; ii--)
{
- void *d;
- d = AXIS2_STACK_POP (parser->attrib, environment);
- AXIS2_FREE (environment->allocator, d);
+ void *d;
+ d = AXIS2_STACK_POP (parser->attrib, environment);
+ AXIS2_FREE (environment->allocator, d);
}
- ii = AXIS2_STACK_SIZE (parser->stack, environment);
- for (; ii > 0; ii--)
+ ii = AXIS2_STACK_SIZE (parser->stack, environment);
+ for (; ii > 0; ii--)
{
- void *d;
- d = AXIS2_STACK_POP (parser->stack, environment);
- AXIS2_FREE (environment->allocator, d);
+ void *d;
+ 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
+ if(parser->guththila_event == GUTHTHILA_END_ELEMENT
|| parser->guththila_event == GUTHTHILA_EMPTY_ELEMENT)
- guththila_xml_pull_parser_close_element (environment, parser);
+ guththila_xml_pull_parser_close_element (environment, parser);
}
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?rev=429612&r1=429611&r2=429612&view=diff
==============================================================================
--- webservices/axis2/trunk/c/guththila/src/guththila_xml_writer.c (original)
+++ webservices/axis2/trunk/c/guththila/src/guththila_xml_writer.c Tue Aug 8 02:07:54 2006
@@ -44,7 +44,7 @@
AXIS2_EXTERN void AXIS2_CALL
-guththila_xml_pull_parser_xml_writer_free (axis2_env_t *env, guththila_xml_pull_parser_t *p)
+guththila_xml_pull_parser_xml_writer_free(axis2_env_t *env, guththila_xml_pull_parser_t *p)
{
int size;
size = 0;
@@ -53,8 +53,9 @@
if (p->xsw->element)
{
- size = 0;
- void *element;
+ void *element;
+ size = 0;
+
size = AXIS2_STACK_SIZE (p->xsw->element, env);
if (size)
{
@@ -157,37 +158,38 @@
AXIS2_EXTERN void AXIS2_CALL
-guththila_xml_pull_parser_write_start_document (axis2_env_t *env, guththila_xml_pull_parser_t *p)
+guththila_xml_pull_parser_write_start_document(axis2_env_t *env,
+ guththila_xml_pull_parser_t *p)
{
- guththila_xml_pull_parser_check_xml_stream_writer (env, p);
- char *sd = NULL;
- sd = "<?xml version = \"1.0\" encoding = \"utf-8\" ?>";
- guththila_xml_pull_parser_write_to_buffer (env, p, sd);
+ char *sd = NULL;
+ guththila_xml_pull_parser_check_xml_stream_writer (env, p);
+ sd = "<?xml version = \"1.0\" encoding = \"utf-8\" ?>";
+ guththila_xml_pull_parser_write_to_buffer (env, p, sd);
}
AXIS2_EXTERN void AXIS2_CALL
guththila_xml_pull_parser_write_end_element (axis2_env_t *env, guththila_xml_pull_parser_t *p)
{
- guththila_xml_pull_parser_check_xml_stream_writer (env, p);
- void *element;
- element = AXIS2_STACK_POP (p->xsw->element, env);
- if (p->xsw->empty_element_open)
+ void *element = NULL;
+ guththila_xml_pull_parser_check_xml_stream_writer (env, p);
+ element = AXIS2_STACK_POP (p->xsw->element, env);
+ if(p->xsw->empty_element_open)
{
- guththila_xml_pull_parser_close_start_element (env, p);
+ guththila_xml_pull_parser_close_start_element (env, p);
}
- else
+ else
{
- guththila_xml_pull_parser_close_start_element (env, p);
- if (element)
- {
- guththila_xml_pull_parser_write_to_buffer (env, p, "</");
- guththila_xml_pull_parser_write_to_buffer (env, p, element);
- guththila_xml_pull_parser_write_to_buffer (env, p, ">");
- guththila_xml_pull_parser_close_depth_element (env, p);
- }
- else
- guththila_xml_pull_parser_exception (p_FILE, LINE, GUTHTHILA_WRITER_ERROR_EMPTY_ARGUMENTS);
+ guththila_xml_pull_parser_close_start_element (env, p);
+ if (element)
+ {
+ guththila_xml_pull_parser_write_to_buffer (env, p, "</");
+ guththila_xml_pull_parser_write_to_buffer (env, p, element);
+ guththila_xml_pull_parser_write_to_buffer (env, p, ">");
+ guththila_xml_pull_parser_close_depth_element (env, p);
+ }
+ else
+ guththila_xml_pull_parser_exception (p_FILE, LINE, GUTHTHILA_WRITER_ERROR_EMPTY_ARGUMENTS);
}
}
@@ -195,10 +197,10 @@
AXIS2_EXTERN void AXIS2_CALL
guththila_xml_pull_parser_flush (axis2_env_t *env, guththila_xml_pull_parser_t *p)
{
- guththila_xml_pull_parser_check_xml_stream_writer (env, p);
- int c;
- int ii = 0;
- if (p->xsw->writer_buffer->buff)
+ int c;
+ int ii = 0;
+ guththila_xml_pull_parser_check_xml_stream_writer (env, p);
+ if(p->xsw->writer_buffer->buff)
{
ii = strlen (p->xsw->writer_buffer->buff);
c = guththila_writer_write (env, p->xsw->writer_buffer->buff, 0, ii, p->xsw->writer);
@@ -367,54 +369,54 @@
AXIS2_EXTERN void AXIS2_CALL
guththila_xml_pull_parser_write_comment (axis2_env_t *env, guththila_xml_pull_parser_t *p, const char *buff)
{
- guththila_xml_pull_parser_check_xml_stream_writer (env, p);
- guththila_xml_pull_parser_close_start_element (env, p);
- char *s = strchr (buff, '-');
- if (s && s[1] == '-')
- guththila_xml_pull_parser_exception (p_FILE, LINE, GUTHTHILA_WRITER_ERROR_EXCESS_HYPENS_IN_COMMENT);
-
- guththila_xml_pull_parser_write_to_buffer (env, p,"<!--");
- guththila_xml_pull_parser_write_to_buffer (env, p,buff);
- guththila_xml_pull_parser_write_to_buffer (env, p,"-->");
+ char *s = NULL;
+ guththila_xml_pull_parser_check_xml_stream_writer (env, p);
+ guththila_xml_pull_parser_close_start_element (env, p);
+ s = strchr (buff, '-');
+ if(s && s[1] == '-')
+ guththila_xml_pull_parser_exception (p_FILE, LINE, GUTHTHILA_WRITER_ERROR_EXCESS_HYPENS_IN_COMMENT);
+ guththila_xml_pull_parser_write_to_buffer (env, p,"<!--");
+ guththila_xml_pull_parser_write_to_buffer (env, p,buff);
+ guththila_xml_pull_parser_write_to_buffer (env, p,"-->");
}
AXIS2_EXTERN void AXIS2_CALL
guththila_xml_pull_parser_write_escape_character (axis2_env_t *env, guththila_xml_pull_parser_t *p, const char *buff)
{
- guththila_xml_pull_parser_close_start_element (env, p);
- if (buff)
+ guththila_xml_pull_parser_close_start_element (env, p);
+ if(buff)
{
- switch (buff[0])
- {
- case '>':
- {
- guththila_xml_pull_parser_write_to_buffer (env, p,">");
- }
- break;
- case '<':
- {
- guththila_xml_pull_parser_write_to_buffer (env, p,"<");
- }
- break;
- case '\'':
- {
- guththila_xml_pull_parser_write_to_buffer (env, p,"'");
- }
- break;
- case '"':
- {
- guththila_xml_pull_parser_write_to_buffer (env, p,""");
- }
- break;
- case '&':
- {
- guththila_xml_pull_parser_write_to_buffer (env, p,"&");
- }
- break;
- };
+ switch (buff[0])
+ {
+ case '>':
+ {
+ guththila_xml_pull_parser_write_to_buffer (env, p,">");
+ }
+ break;
+ case '<':
+ {
+ guththila_xml_pull_parser_write_to_buffer (env, p,"<");
+ }
+ break;
+ case '\'':
+ {
+ guththila_xml_pull_parser_write_to_buffer (env, p,"'");
+ }
+ break;
+ case '"':
+ {
+ guththila_xml_pull_parser_write_to_buffer (env, p,""");
+ }
+ break;
+ case '&':
+ {
+ guththila_xml_pull_parser_write_to_buffer (env, p,"&");
+ }
+ break;
+ };
}
- else
+ else
guththila_xml_pull_parser_exception (p_FILE, LINE, GUTHTHILA_WRITER_ERROR_INVALID_BUFFER);
}
@@ -457,8 +459,11 @@
}
-void
-guththila_xml_pull_parser_do_write_attribute (axis2_env_t *env, guththila_xml_pull_parser_t *p, const char *local_name, const char *value)
+AXIS2_EXTERN void AXIS2_CALL
+guththila_xml_pull_parser_do_write_attribute (axis2_env_t *env,
+ guththila_xml_pull_parser_t *p,
+ const char *local_name,
+ const char *value)
{
guththila_attribute_t *attr = (guththila_attribute_t *) AXIS2_MALLOC (env->allocator, sizeof (guththila_attribute_t));
@@ -513,7 +518,7 @@
}
-int
+AXIS2_EXTERN int AXIS2_CALL
guththila_xml_pull_parser_check_default_namespace (axis2_env_t *env, guththila_xml_pull_parser_t *p, char *ns_uri)
{
int size;
@@ -579,7 +584,7 @@
}
-int
+AXIS2_EXTERN int AXIS2_CALL
guththila_xml_pull_parser_check_prefix_validity (axis2_env_t *env, guththila_xml_pull_parser_t *p, char *prefix, char *uri)
{
int size;
@@ -800,7 +805,7 @@
}
-int
+AXIS2_EXTERN int AXIS2_CALL
guththila_xml_pull_parser_is_exsisting_prefix (axis2_env_t *env, guththila_xml_pull_parser_t *p, const char *prefix)
{
int size;
@@ -917,7 +922,7 @@
}
-char *
+AXIS2_EXTERN char* AXIS2_CALL
guththila_xml_pull_parser_get_prefix_for_namespace (axis2_env_t *env, guththila_xml_pull_parser_t *p, const char *namespace)
{
int size;
@@ -999,37 +1004,38 @@
guththila_xml_pull_parser_exception (p_FILE, LINE, GUTHTHILA_WRITER_ERROR_EMPTY_ARGUMENTS);
else
{
- guththila_xml_pull_parser_check_xml_stream_writer (env, p);
- guththila_xml_pull_parser_close_start_element (env, p);
- char *prefix = guththila_xml_pull_parser_get_prefix_for_namespace (env, p,namespace_uri);
- if (prefix)
- start_element = (char *) calloc ((strlen (prefix) + strlen (local_name) +2), 1);
- else
- start_element = (char *) calloc ((strlen (local_name) +2), 1);
+ char *prefix = NULL;
+ guththila_xml_pull_parser_check_xml_stream_writer (env, p);
+ guththila_xml_pull_parser_close_start_element (env, p);
+ prefix = guththila_xml_pull_parser_get_prefix_for_namespace (env, p,namespace_uri);
+ if(prefix)
+ start_element = (char *) calloc ((strlen (prefix) + strlen (local_name) +2), 1);
+ else
+ start_element = (char *) calloc ((strlen (local_name) +2), 1);
- if (prefix)
+ if(prefix)
{
- strcat (start_element, prefix);
- strcat (start_element, ":");
- strcat (start_element, local_name);
+ strcat (start_element, prefix);
+ strcat (start_element, ":");
+ strcat (start_element, local_name);
}
- else
- strcat (start_element, local_name);
- size = AXIS2_STACK_SIZE (p->xsw->element, env);
- if (size)
+ else
+ strcat (start_element, local_name);
+ size = AXIS2_STACK_SIZE (p->xsw->element, env);
+ if(size)
{
- element = AXIS2_STACK_GET_AT (p->xsw->element, env, size);
- if (!strcmp ((char *)element, start_element))
- guththila_xml_pull_parser_exception (p_FILE, LINE, GUTHTHILA_WRITER_ERROR_NON_MATCHING_ELEMENTS);
+ element = AXIS2_STACK_GET_AT (p->xsw->element, env, size);
+ if (!strcmp ((char *)element, start_element))
+ guththila_xml_pull_parser_exception (p_FILE, LINE, GUTHTHILA_WRITER_ERROR_NON_MATCHING_ELEMENTS);
}
- guththila_xml_pull_parser_check_name_validity (env, p,start_element);
- p->xsw->start_element_open = 1;
+ guththila_xml_pull_parser_check_name_validity (env, p,start_element);
+ p->xsw->start_element_open = 1;
- if (!p->xsw->empty_element_open)
- AXIS2_STACK_PUSH (p->xsw->element, env, start_element);
- guththila_xml_pull_parser_write_to_buffer (env, p,"<");
- guththila_xml_pull_parser_write_to_buffer (env, p,start_element);
+ if (!p->xsw->empty_element_open)
+ AXIS2_STACK_PUSH (p->xsw->element, env, start_element);
+ guththila_xml_pull_parser_write_to_buffer (env, p,"<");
+ guththila_xml_pull_parser_write_to_buffer (env, p,start_element);
}
}
else
@@ -1126,22 +1132,23 @@
int size = AXIS2_STACK_SIZE (p->xsw->depth, env);
guththila_depth_t *d = (guththila_depth_t *) AXIS2_MALLOC (env->allocator, sizeof (guththila_depth_t));
- if (size)
- {
- void *e = NULL;
- e = AXIS2_STACK_GET (p->xsw->depth, env);
- guththila_depth_t *l = (guththila_depth_t *)e;
- d->total = AXIS2_STACK_SIZE (p->xsw->namespace, env);
- d->first = l->first + l->count;
- d->count = d->total - l->total;
- AXIS2_STACK_PUSH (p->xsw->depth, env, (void *)d);
- }
- else
+ if(size)
{
- d->first = 0;
- d->total = AXIS2_STACK_SIZE (p->xsw->namespace, env);
- d->count = d->total;
- AXIS2_STACK_PUSH (p->xsw->depth, env, (void *)d);
+ void *e = NULL;
+ guththila_depth_t *l = NULL;
+ e = AXIS2_STACK_GET (p->xsw->depth, env);
+ l = (guththila_depth_t *)e;
+ d->total = AXIS2_STACK_SIZE (p->xsw->namespace, env);
+ d->first = l->first + l->count;
+ d->count = d->total - l->total;
+ AXIS2_STACK_PUSH (p->xsw->depth, env, (void *)d);
+ }
+ else
+ {
+ d->first = 0;
+ d->total = AXIS2_STACK_SIZE (p->xsw->namespace, env);
+ d->count = d->total;
+ AXIS2_STACK_PUSH (p->xsw->depth, env, (void *)d);
}
}
@@ -1167,20 +1174,22 @@
AXIS2_EXTERN void AXIS2_CALL
guththila_xml_pull_parser_write_end_document (axis2_env_t *env, guththila_xml_pull_parser_t *p)
{
- if (p->xsw->start_element_open || p->xsw->empty_element_open)
- guththila_xml_pull_parser_close_start_element (env, p);
- int ii = AXIS2_STACK_SIZE (p->xsw->element, env);
- for (; ii > 0; ii --)
- guththila_xml_pull_parser_write_end_element (env, p);
- guththila_xml_pull_parser_flush (env, p);
+ int ii = 0;
+ if (p->xsw->start_element_open || p->xsw->empty_element_open)
+ guththila_xml_pull_parser_close_start_element (env, p);
+ ii = AXIS2_STACK_SIZE (p->xsw->element, env);
+ for (; ii > 0; ii --)
+ guththila_xml_pull_parser_write_end_element (env, p);
+ guththila_xml_pull_parser_flush (env, p);
}
AXIS2_EXTERN void AXIS2_CALL
-guththila_xml_pull_parser_close (axis2_env_t *env, guththila_xml_pull_parser_t *p)
+guththila_xml_pull_parser_close (axis2_env_t *env,
+ guththila_xml_pull_parser_t *p)
{
- guththila_xml_pull_parser_flush (env, p);
- fclose (((guththila_writer_impl_t *)p->xsw->writer)->outputstream);
+ guththila_xml_pull_parser_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