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 sa...@apache.org on 2005/11/22 06:08:38 UTC
svn commit: r348088 - in /webservices/axis2/trunk/c: include/
modules/test/om/src/ modules/util/src/ modules/xml/om/src/
modules/xml/parser/ modules/xml/parser/guththila/impl/src/
modules/xml/parser/guththila/src/ modules/xml/parser/guththila/test/ mod...
Author: samisa
Date: Mon Nov 21 21:08:08 2005
New Revision: 348088
URL: http://svn.apache.org/viewcvs?rev=348088&view=rev
Log:
some errors were fixed
Modified:
webservices/axis2/trunk/c/include/axis2_error.h
webservices/axis2/trunk/c/include/axis2_om_stax_builder.h
webservices/axis2/trunk/c/modules/test/om/src/test_om.c
webservices/axis2/trunk/c/modules/util/src/env.c
webservices/axis2/trunk/c/modules/util/src/log.c
webservices/axis2/trunk/c/modules/util/src/stream.c
webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_stax_builder.c
webservices/axis2/trunk/c/modules/xml/parser/axis2_pull_parser.h
webservices/axis2/trunk/c/modules/xml/parser/axis2_xml_writer.h
webservices/axis2/trunk/c/modules/xml/parser/guththila/impl/src/guththila_reader.c
webservices/axis2/trunk/c/modules/xml/parser/guththila/impl/src/guththila_reader.h
webservices/axis2/trunk/c/modules/xml/parser/guththila/impl/src/guththila_xml_stream_writer.c
webservices/axis2/trunk/c/modules/xml/parser/guththila/impl/src/guththila_xml_stream_writer.h
webservices/axis2/trunk/c/modules/xml/parser/guththila/src/axis2_guththila_wrapper.c
webservices/axis2/trunk/c/modules/xml/parser/guththila/src/guththila_xml_writer_wrapper.c
webservices/axis2/trunk/c/modules/xml/parser/guththila/test/guththila_test.c
webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/axis2_libxml2_wrapper.c
webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/axis2_libxml2_writer_wrapper.c
webservices/axis2/trunk/c/modules/xml/parser/libxml2/test/libxml_test.c
Modified: webservices/axis2/trunk/c/include/axis2_error.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_error.h?rev=348088&r1=348087&r2=348088&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_error.h (original)
+++ webservices/axis2/trunk/c/include/axis2_error.h Mon Nov 21 21:08:08 2005
@@ -200,7 +200,8 @@
/** error occured creating xml stream writer */
AXIS2_ERROR_CREATING_XML_STREAM_WRITER,
/** error occured creating xml stream writer */
- AXIS2_ERROR_CREATING_XML_STREAM_READER
+ AXIS2_ERROR_CREATING_XML_STREAM_READER,
+
};
/** @} */
Modified: webservices/axis2/trunk/c/include/axis2_om_stax_builder.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_stax_builder.h?rev=348088&r1=348087&r2=348088&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_stax_builder.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_stax_builder.h Mon Nov 21 21:08:08 2005
@@ -23,6 +23,7 @@
*/
#include <axis2_om_node.h>
+#include <axis2_pull_parser.h>
#include <axis2_om_document.h>
#include <axis2_env.h>
@@ -106,17 +107,9 @@
* @return a pointer to the newly created builder struct.
*/
AXIS2_DECLARE(axis2_om_stax_builder_t *)
- axis2_om_stax_builder_create_for_file (axis2_env_t **env,char* filename);
+ axis2_om_stax_builder_create(axis2_env_t **env,
+ axis2_pull_parser_t *parser);
- /**
- * creates an stax builder
- * @param environment Environment. MUST NOT be NULL, .
- * @return a pointer to the newly created builder struct.
- */
- AXIS2_DECLARE(axis2_om_stax_builder_t *)
- axis2_om_stax_builder_create_for_memory (axis2_env_t **env,
- int (*read_input_callback)(char *buffer,int size),
- void (*close_input_callback)(void));
/** builds next node */
#define AXIS2_OM_STAX_BUILDER_NEXT(builder,env) \
Modified: webservices/axis2/trunk/c/modules/test/om/src/test_om.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/om/src/test_om.c?rev=348088&r1=348087&r2=348088&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/om/src/test_om.c (original)
+++ webservices/axis2/trunk/c/modules/test/om/src/test_om.c Mon Nov 21 21:08:08 2005
@@ -1,15 +1,27 @@
- #include <axis2_om_stax_builder.h>
+#include <axis2_om_stax_builder.h>
#include <axis2_om_document.h>
#include <axis2_om_node.h>
#include <axis2_om_element.h>
#include <axis2_om_text.h>
+#include <axis2_stream_default.h>
+#include <axis2_log_default.h>
+#include <axis2_error_default.h>
#include <stdio.h>
#include <axis2_xml_writer.h>
+/**
+ Define the environment related variables globaly so that they are available
+ for both functions
+*/
+
axis2_allocator_t *allocator = NULL;
axis2_env_t *environment = NULL;
+axis2_stream_t *stream = NULL;
+axis2_error_t *error = NULL;
+axis2_log_t *log = NULL;
+/** a method that demonstrate creating a om model using an xml file */
int
test_om_build (char *filename)
@@ -22,16 +34,40 @@
FILE *fp = NULL;
axis2_om_output_t *om_output = NULL;
axis2_om_namespace_t* ns = NULL;
-
-
-
-
- builder = axis2_om_stax_builder_create_for_file (&environment, filename);
+ axis2_pull_parser_t *pull_parser = NULL;
+
+ /** create pull parser */
+ pull_parser = axis2_pull_parser_create_for_file(&environment, filename , NULL);
+
+ if(!pull_parser)
+ {
+ printf("ERROR CREATING PULLPARSER");
+ return ;
+ }
+ /** create axis2_om_stax_builder by parsing pull_parser struct */
+
+ builder = axis2_om_stax_builder_create (&environment,pull_parser);
+
+ if(!builder)
+ {
+ printf("ERROR CREATING PULL PARSER");
+ return ;
+ }
+ /**
+ create an om document
+ document is the container of om model created using builder
+ */
document = axis2_om_document_create (&environment, NULL, builder);
+ /**
+ get root element , building starts hear
+ */
+
node1 = AXIS2_OM_DOCUMENT_GET_ROOT_ELEMENT (document,&environment);
if(node1)
{
+ /** print root node information */
+
printf ("NODE TYPE %d\n",AXIS2_OM_NODE_GET_NODE_TYPE(node1,&environment));
ele1 =AXIS2_OM_NODE_GET_DATA_ELEMENT(node1,&environment);
@@ -48,6 +84,8 @@
}
}
+ /** build the document continuously untill all the xml file is built in to a om model */
+
node2 = AXIS2_OM_DOCUMENT_BUILD_NEXT( document , &environment);
do
@@ -82,6 +120,7 @@
printf ("Serialize pulled document\n");
+
om_output = axis2_om_output_create (&environment, NULL);
AXIS2_OM_NODE_SERIALIZE (AXIS2_OM_DOCUMENT_GET_ROOT_ELEMENT(document, &environment), &environment , om_output);
AXIS2_OM_DOCUMENT_FREE(document, &environment);
@@ -182,10 +221,16 @@
if (argc > 1)
file_name = argv[1];
allocator = axis2_allocator_init (NULL);
- environment = axis2_env_create (allocator);
+ log = axis2_log_create(allocator, NULL);
+ error = axis2_error_create(allocator);
+
+ stream = axis2_stream_create(allocator, NULL);
+
+ environment = axis2_env_create_with_error_stream_log(allocator, error, stream, log);
test_om_build (file_name);
test_om_serialize ();
- axis2_env_free(environment);
+ axis2_env_free(environment);
+ getchar();
}
Modified: webservices/axis2/trunk/c/modules/util/src/env.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/env.c?rev=348088&r1=348087&r2=348088&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/env.c (original)
+++ webservices/axis2/trunk/c/modules/util/src/env.c Mon Nov 21 21:08:08 2005
@@ -25,7 +25,7 @@
if(NULL != env && NULL != env->allocator)
free (env->allocator);
- if(NULL != env && NULL != env->stream)
+ if(env != NULL && env->stream != NULL && (env->stream->ops) != NULL)
AXIS2_STREAM_FREE(env->stream);
if(NULL != env && NULL != env->log)
Modified: webservices/axis2/trunk/c/modules/util/src/log.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/log.c?rev=348088&r1=348087&r2=348088&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/log.c (original)
+++ webservices/axis2/trunk/c/modules/util/src/log.c Mon Nov 21 21:08:08 2005
@@ -58,7 +58,7 @@
AXIS2_FREE (allocator, log);
return NULL;
}
-
+ log->ops->free = axis2_log_impl_free;
log->ops->write = axis2_log_impl_write;
}
Modified: webservices/axis2/trunk/c/modules/util/src/stream.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/stream.c?rev=348088&r1=348087&r2=348088&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/stream.c (original)
+++ webservices/axis2/trunk/c/modules/util/src/stream.c Mon Nov 21 21:08:08 2005
@@ -71,8 +71,7 @@
return NULL;
}
- if(!stream->ops->free)
- (stream->ops)->free = axis2_stream_impl_free;
+ stream->ops->free = axis2_stream_impl_free;
stream->ops->read = axis2_stream_impl_read;
stream->ops->write = axis2_stream_impl_write;
stream->ops->file_open = axis2_stream_impl_file_open;
@@ -106,6 +105,8 @@
AXIS2_FREE (allocator, stream);
return NULL;
}
+
+ stream->ops->free = axis2_stream_impl_free;
stream->ops->read = axis2_stream_impl_read;
stream->ops->write = axis2_stream_impl_write;
stream->ops->file_open = axis2_stream_impl_file_open;
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_stax_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_stax_builder.c?rev=348088&r1=348087&r2=348088&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_stax_builder.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_stax_builder.c Mon Nov 21 21:08:08 2005
@@ -91,10 +91,12 @@
AXIS2_DECLARE(axis2_om_stax_builder_t *)
-axis2_om_stax_builder_create_for_file (axis2_env_t **env,char* filename)
+axis2_om_stax_builder_create (axis2_env_t **env,
+ axis2_pull_parser_t *parser)
{
axis2_om_stax_builder_impl_t *builder = NULL;
AXIS2_ENV_CHECK(env, NULL);
+ AXIS2_PARAM_CHECK((*env)->error, parser, NULL);
builder = (axis2_om_stax_builder_impl_t *)AXIS2_MALLOC (
(*env)->allocator, sizeof(axis2_om_stax_builder_impl_t));
@@ -110,71 +112,8 @@
builder->lastnode = NULL;
builder->document = NULL;
- builder->parser = axis2_pull_parser_create_for_file(env,filename);
- if(!builder->parser)
- {
- AXIS2_FREE((*env)->allocator, builder);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
- }
-
-
- /* operations */
- builder->om_stax_builder.ops = NULL;
- builder->om_stax_builder.ops = (axis2_om_stax_builder_ops_t *) AXIS2_MALLOC(
- (*env)->allocator, sizeof(axis2_om_stax_builder_ops_t));
-
- if (!builder->om_stax_builder.ops)
- {
- AXIS2_PULL_PARSER_FREE (builder->parser, env);
- AXIS2_FREE ((*env)->allocator, builder);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
- }
-
- builder->om_stax_builder.ops->next = axis2_om_stax_builder_next;
- builder->om_stax_builder.ops->discard_current_element =
- axis2_om_stax_builder_discard_current_element;
-
- builder->om_stax_builder.ops->free = axis2_om_stax_builder_free;
- builder->om_stax_builder.ops->set_document = axis2_om_stax_builder_set_document;
- builder->om_stax_builder.ops->set_lastnode = axis2_om_stax_builder_set_lastnode;
- builder->om_stax_builder.ops->get_lastnode = axis2_om_stax_builder_get_lastnode;
-
- return &(builder->om_stax_builder);
-}
-
-/*********************** for memory ******************************************/
-
-AXIS2_DECLARE(axis2_om_stax_builder_t *)
-axis2_om_stax_builder_create_for_memory (axis2_env_t **env,
- int (*read_input_callback)(char *buffer,int size),
- void (*close_input_callback)(void))
-
-
-{
- axis2_om_stax_builder_impl_t *builder = NULL;
- AXIS2_ENV_CHECK(env, NULL);
-
- builder = (axis2_om_stax_builder_impl_t *)AXIS2_MALLOC (
- (*env)->allocator, sizeof(axis2_om_stax_builder_impl_t));
-
- if (!builder)
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
-
-
+ builder->parser = parser;
- builder->cache = AXIS2_TRUE;
- builder->parser_accessed = AXIS2_FALSE;
- builder->done = AXIS2_FALSE;
- builder->lastnode = NULL;
- builder->document = NULL;
-
- builder->parser = axis2_pull_parser_create_for_memory(env,
- read_input_callback, close_input_callback );
- if(!builder->parser)
- {
- AXIS2_FREE((*env)->allocator, builder);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
- }
/* operations */
@@ -200,7 +139,6 @@
return &(builder->om_stax_builder);
}
-
axis2_status_t
Modified: webservices/axis2/trunk/c/modules/xml/parser/axis2_pull_parser.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/axis2_pull_parser.h?rev=348088&r1=348087&r2=348088&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/axis2_pull_parser.h (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/axis2_pull_parser.h Mon Nov 21 21:08:08 2005
@@ -263,12 +263,14 @@
*/
AXIS2_DECLARE(axis2_pull_parser_t *)
-axis2_pull_parser_create_for_file(axis2_env_t **env,char *filename);
+axis2_pull_parser_create_for_file(axis2_env_t **env,
+ char *filename,
+ const axis2_char_t *encoding);
AXIS2_DECLARE(axis2_pull_parser_t *)
axis2_pull_parser_create_for_memory(axis2_env_t **env,
int (*read_input_callback)(char *buffer,int size),
- void (*close_input_callback)(void));
+ const axis2_char_t *encoding);
/********************************* Macros *************************************/
Modified: webservices/axis2/trunk/c/modules/xml/parser/axis2_xml_writer.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/axis2_xml_writer.h?rev=348088&r1=348087&r2=348088&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/axis2_xml_writer.h (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/axis2_xml_writer.h Mon Nov 21 21:08:08 2005
@@ -240,13 +240,12 @@
*/
AXIS2_DECLARE(axis2_xml_writer_t *)
axis2_xml_writer_create(axis2_env_t **env,
- void *stream,
+ axis2_char_t *filename,
axis2_char_t *encoding,
int is_prefix_default,
int compression);
-AXIS2_DECLARE(axis2_xml_writer_t *)
-
+AXIS2_DECLARE(axis2_xml_writer_t *)
axis2_xml_writer_create_for_memory(axis2_env_t **env,
void *buffer,
axis2_char_t *encoding,
Modified: webservices/axis2/trunk/c/modules/xml/parser/guththila/impl/src/guththila_reader.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/guththila/impl/src/guththila_reader.c?rev=348088&r1=348087&r2=348088&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/guththila/impl/src/guththila_reader.c (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/guththila/impl/src/guththila_reader.c Mon Nov 21 21:08:08 2005
@@ -35,7 +35,6 @@
int (*input_read_callback)(char *buffer,int size);
- void (*input_close_callback)(void);
}guththila_memory_reader_impl_t;
@@ -69,8 +68,7 @@
GUTHTHILA_DECLARE(guththila_reader_t *)
guththila_reader_create_for_memory(
guththila_environment_t *environment,
- int (*input_read_callback)(char *buffer,int size),
- void (*input_close_callback)(void))
+ int (*input_read_callback)(char *buffer,int size))
{
guththila_memory_reader_impl_t *memory_reader =
(guththila_memory_reader_impl_t *) GUTHTHILA_MALLOC (environment->allocator,
@@ -81,7 +79,6 @@
}
memory_reader->input_read_callback = input_read_callback;
- memory_reader->input_close_callback = input_close_callback;
memory_reader->reader.guththila_reader_type = GUTHTHILA_IN_MEMORY_READER;
return &(memory_reader->reader);
@@ -98,7 +95,6 @@
if(r->guththila_reader_type == GUTHTHILA_IN_MEMORY_READER);
{
- ((guththila_memory_reader_impl_t*)r)->input_close_callback();
GUTHTHILA_FREE(environment->allocator,(guththila_memory_reader_impl_t*)r);
}
if(r->guththila_reader_type == GUTHTHILA_FILE_READER)
Modified: webservices/axis2/trunk/c/modules/xml/parser/guththila/impl/src/guththila_reader.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/guththila/impl/src/guththila_reader.h?rev=348088&r1=348087&r2=348088&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/guththila/impl/src/guththila_reader.h (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/guththila/impl/src/guththila_reader.h Mon Nov 21 21:08:08 2005
@@ -47,8 +47,7 @@
GUTHTHILA_DECLARE(guththila_reader_t *)
guththila_reader_create_for_memory(guththila_environment_t *environment,
int (*input_read_callback)
- (char *buffer,int size),
- void (*input_close_callback)(void));
+ (char *buffer,int size));
GUTHTHILA_DECLARE (int)
guththila_reader_read (guththila_environment_t * environment,
Modified: webservices/axis2/trunk/c/modules/xml/parser/guththila/impl/src/guththila_xml_stream_writer.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/guththila/impl/src/guththila_xml_stream_writer.c?rev=348088&r1=348087&r2=348088&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/guththila/impl/src/guththila_xml_stream_writer.c (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/guththila/impl/src/guththila_xml_stream_writer.c Mon Nov 21 21:08:08 2005
@@ -35,7 +35,7 @@
GUTHTHILA_DECLARE (guththila_xml_stream_writer_t *)
guththila_create_xml_stream_writer (guththila_environment_t * environment,
- void * writer,
+ guththila_char_t * filename,
guththila_char_t * encoding,
int prefix_defaulting)
{
@@ -46,9 +46,9 @@
stream_writer =
(guththila_xml_stream_writer_t *) GUTHTHILA_MALLOC (environment->allocator,
sizeof(guththila_xml_stream_writer_t));
- if(writer != NULL)
+ if(filename != NULL)
{
- fp = fopen(writer, "w");
+ fp = fopen(filename, "w");
if(!fp)
return GUTHTHILA_STREAM_WRITER_ERROR_FILE_NOT_FOUND;
stream_writer->writer = fp;
Modified: webservices/axis2/trunk/c/modules/xml/parser/guththila/impl/src/guththila_xml_stream_writer.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/guththila/impl/src/guththila_xml_stream_writer.h?rev=348088&r1=348087&r2=348088&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/guththila/impl/src/guththila_xml_stream_writer.h (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/guththila/impl/src/guththila_xml_stream_writer.h Mon Nov 21 21:08:08 2005
@@ -37,7 +37,7 @@
GUTHTHILA_DECLARE (guththila_xml_stream_writer_t *)
guththila_create_xml_stream_writer (guththila_environment_t * environment,
- void * writer,
+ guththila_char_t * filename,
guththila_char_t * encoding,
int is_prefix_defaulting);
Modified: webservices/axis2/trunk/c/modules/xml/parser/guththila/src/axis2_guththila_wrapper.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/guththila/src/axis2_guththila_wrapper.c?rev=348088&r1=348087&r2=348088&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/guththila/src/axis2_guththila_wrapper.c (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/guththila/src/axis2_guththila_wrapper.c Mon Nov 21 21:08:08 2005
@@ -147,7 +147,9 @@
/********************************************************************************/
AXIS2_DECLARE(axis2_pull_parser_t *)
-axis2_pull_parser_create_for_file(axis2_env_t **env,char* filename)
+axis2_pull_parser_create_for_file(axis2_env_t **env,
+ char* filename,
+ const char *encoding)
{
axis2_guththila_wrapper_impl_t *guththila_impl = NULL;
guththila_allocator_t *allocator = NULL;
@@ -241,7 +243,7 @@
AXIS2_DECLARE(axis2_pull_parser_t *)
axis2_pull_parser_create_for_memory(axis2_env_t **env,
int (*read_input_callback)(char *buffer,int size),
- void (*close_input_callback)(void))
+ const char *encoding)
{
axis2_guththila_wrapper_impl_t *guththila_impl = NULL;
guththila_allocator_t *allocator = NULL;
@@ -262,7 +264,7 @@
/*-------difference of two create function is here--------*/
reader = guththila_reader_create_for_memory(guththila_env,
- read_input_callback, close_input_callback);
+ read_input_callback);
if(!reader)
{
@@ -347,10 +349,11 @@
{
AXIS2_FUNC_PARAM_CHECK(parser,env,AXIS2_FAILURE);
if(AXIS2_INTF_TO_IMPL(parser)->guththila_parser)
- guththila_xml_pull_parser_free(
+ /* guththila_xml_pull_parser_free(
AXIS2_INTF_TO_IMPL(parser)->guththila_env,
AXIS2_INTF_TO_IMPL(parser)->guththila_parser);
- AXIS2_FREE((*env)->allocator, AXIS2_INTF_TO_IMPL(parser)->guththila_env);
+ */
+ // guththila_environment_free((*env)->allocator, AXIS2_INTF_TO_IMPL(parser)->guththila_env);
if(parser->ops)
AXIS2_FREE((*env)->allocator, parser->ops);
@@ -516,11 +519,12 @@
return NULL;
}
- axis2_char_t* AXIS2_CALL
+axis2_char_t* AXIS2_CALL
axis2_guththila_wrapper_get_dtd(axis2_pull_parser_t *parser,
axis2_env_t **env)
{
printf("not implemented in guththila");
+ return NULL;
}
axis2_status_t AXIS2_CALL
Modified: webservices/axis2/trunk/c/modules/xml/parser/guththila/src/guththila_xml_writer_wrapper.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/guththila/src/guththila_xml_writer_wrapper.c?rev=348088&r1=348087&r2=348088&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/guththila/src/guththila_xml_writer_wrapper.c (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/guththila/src/guththila_xml_writer_wrapper.c Mon Nov 21 21:08:08 2005
@@ -214,7 +214,7 @@
AXIS2_DECLARE(axis2_xml_writer_t *)
axis2_xml_writer_create(axis2_env_t **env,
- void *stream,
+ axis2_char_t *filename,
axis2_char_t *encoding,
int is_prefix_default,
int compression)
@@ -236,7 +236,7 @@
writer_impl->guththila_writer = guththila_create_xml_stream_writer(
writer_impl->guththila_env,
- stream, encoding ,
+ filename , encoding ,
is_prefix_default);
if(!(writer_impl->guththila_writer))
@@ -327,7 +327,8 @@
AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
if(AXIS2_INTF_TO_IMPL(writer)->guththila_writer)
guththila_xml_stream_writer_free(
- AXIS2_INTF_TO_IMPL(writer)->guththila_env, writer);
+ AXIS2_INTF_TO_IMPL(writer)->guththila_env,
+ AXIS2_INTF_TO_IMPL(writer)->guththila_writer);
if(AXIS2_INTF_TO_IMPL(writer)->guththila_env)
guththila_environment_free(AXIS2_INTF_TO_IMPL(writer)->guththila_env);
Modified: webservices/axis2/trunk/c/modules/xml/parser/guththila/test/guththila_test.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/guththila/test/guththila_test.c?rev=348088&r1=348087&r2=348088&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/guththila/test/guththila_test.c (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/guththila/test/guththila_test.c Mon Nov 21 21:08:08 2005
@@ -12,6 +12,8 @@
return fread(buffer,sizeof(char), size, f);
}
+
+
void close_input(void)
{
fclose(f);
@@ -184,4 +186,5 @@
guththila_environment_free(env);
+getchar();
}
Modified: webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/axis2_libxml2_wrapper.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/axis2_libxml2_wrapper.c?rev=348088&r1=348087&r2=348088&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/axis2_libxml2_wrapper.c (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/axis2_libxml2_wrapper.c Mon Nov 21 21:08:08 2005
@@ -180,7 +180,9 @@
/*******************************************************************************/
AXIS2_DECLARE(axis2_pull_parser_t *)
-axis2_pull_parser_create_for_file(axis2_env_t **env,char *filename)
+axis2_pull_parser_create_for_file(axis2_env_t **env,
+ char *filename,
+ const axis2_char_t *encoding)
{
axis2_libxml2_wrapper_impl_t *wrapper_impl = NULL;
Modified: webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/axis2_libxml2_writer_wrapper.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/axis2_libxml2_writer_wrapper.c?rev=348088&r1=348087&r2=348088&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/axis2_libxml2_writer_wrapper.c (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/axis2_libxml2_writer_wrapper.c Mon Nov 21 21:08:08 2005
@@ -225,7 +225,7 @@
AXIS2_DECLARE(axis2_xml_writer_t *)
axis2_xml_writer_create(axis2_env_t **env,
- void *filename,
+ axis2_char_t *filename,
axis2_char_t *encoding,
int is_prefix_default,
int compression)
Modified: webservices/axis2/trunk/c/modules/xml/parser/libxml2/test/libxml_test.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/libxml2/test/libxml_test.c?rev=348088&r1=348087&r2=348088&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/libxml2/test/libxml_test.c (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/libxml2/test/libxml_test.c Mon Nov 21 21:08:08 2005
@@ -21,7 +21,7 @@
allocator = axis2_allocator_init(NULL);
env = axis2_env_create(allocator);
- parser = axis2_pull_parser_create_for_file(&env,filename);
+ parser = axis2_pull_parser_create_for_file(&env,filename,NULL);
printf("running test\n\n\n");