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 sa...@apache.org on 2007/01/01 05:16:56 UTC
svn commit: r491530 [4/4] - in /webservices/axis2/trunk/c: axiom/include/
axiom/src/om/ modules/core/deployment/
Modified: webservices/axis2/trunk/c/axiom/src/om/om_output.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_output.c?view=diff&rev=491530&r1=491529&r2=491530
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_output.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_output.c Sun Dec 31 20:16:53 2006
@@ -68,99 +68,14 @@
}
axiom_output_impl_t;
+static const axiom_output_ops_t axiom_output_ops_var = {
+};
+
/************************ Macro ***********************************************/
#define AXIS2_INTF_TO_IMPL(output) ((axiom_output_impl_t*)output)
/************************ function prototypes *********************************/
-axis2_status_t AXIS2_CALL
-axiom_output_free(axiom_output_t *om_output,
- const axis2_env_t *env);
-
-
-axis2_bool_t AXIS2_CALL
-axiom_output_is_soap11(axiom_output_t *om_output,
- const axis2_env_t *env);
-
-axis2_bool_t AXIS2_CALL
-axiom_output_is_ignore_xml_declaration(axiom_output_t *om_output,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-axiom_output_set_ignore_xml_declaration
-(axiom_output_t *om_output,
- const axis2_env_t *env,
- axis2_bool_t ignore_xml_dec);
-
-axis2_status_t AXIS2_CALL
-axiom_output_set_soap11(axiom_output_t *om_output,
- const axis2_env_t *env,
- axis2_bool_t soap11);
-
-axis2_status_t AXIS2_CALL
-axiom_output_set_xml_version(axiom_output_t *om_output,
- const axis2_env_t *env,
- axis2_char_t *xml_version);
-
-axis2_char_t* AXIS2_CALL
-axiom_output_get_xml_version(axiom_output_t *om_output,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-axiom_output_set_char_set_encoding(axiom_output_t *om_output,
- const axis2_env_t *env,
- axis2_char_t *char_set_encoding);
-
-axis2_char_t* AXIS2_CALL
-axiom_output_get_char_set_encoding(axiom_output_t *om_output,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-axiom_output_set_do_optimize(axiom_output_t *om_output,
- const axis2_env_t *env,
- axis2_bool_t optimize);
-
-axis2_bool_t AXIS2_CALL
-axiom_output_is_optimized(axiom_output_t *om_output,
- const axis2_env_t *env);
-
-axiom_xml_writer_t* AXIS2_CALL
-axiom_output_get_xml_writer(axiom_output_t *om_output,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-axiom_output_write_xml_version_encoding(axiom_output_t *om_output,
- const axis2_env_t *env);
-
-axis2_char_t* AXIS2_CALL
-axiom_output_get_next_content_id(axiom_output_t *om_output,
- const axis2_env_t *env);
-
-axis2_char_t* AXIS2_CALL
-axiom_output_get_root_content_id(axiom_output_t *om_output,
- const axis2_env_t *env);
-
-axis2_char_t* AXIS2_CALL
-axiom_output_get_mime_boundry(axiom_output_t *om_output,
- const axis2_env_t *env);
-
-axis2_byte_t* AXIS2_CALL
-axiom_output_flush(axiom_output_t *om_output,
- const axis2_env_t *env,
- axis2_byte_t **output_stream,
- int *output_stream_size);
-
-const axis2_char_t* AXIS2_CALL
-axiom_output_get_content_type(axiom_output_t *om_output,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-axiom_output_write_optimized(axiom_output_t *om_output,
- const axis2_env_t *env,
- axiom_text_t *om_text);
-
-
-
/*********************** end function prototypes ******************************/
AXIS2_EXTERN axiom_output_t * AXIS2_CALL
@@ -194,7 +109,7 @@
om_output_impl->binary_node_list = NULL;
om_output_impl->mime_output = NULL;
om_output_impl->mime_boundry = NULL;
- om_output_impl->om_output.ops = NULL;
+ om_output_impl->om_output.ops = &axiom_output_ops_var;
om_output_impl->char_set_encoding = AXIS2_STRDUP(
AXIS2_DEFAULT_CHAR_SET_ENCODING, env);
@@ -206,69 +121,10 @@
return NULL;
}
- om_output_impl->om_output.ops = (axiom_output_ops_t *)AXIS2_MALLOC(
- env->allocator,
- sizeof(axiom_output_ops_t));
- if (!(om_output_impl->om_output.ops))
- {
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- AXIS2_FREE(env->allocator, om_output_impl);
- return NULL;
- }
- om_output_impl->om_output.ops->free_fn =
- axiom_output_free;
-
- om_output_impl->om_output.ops->is_soap11 =
- axiom_output_is_soap11;
-
- om_output_impl->om_output.ops->get_xml_version =
- axiom_output_get_xml_version;
-
- om_output_impl->om_output.ops->set_xml_version =
- axiom_output_set_xml_version;
-
- om_output_impl->om_output.ops->get_char_set_encoding =
- axiom_output_get_char_set_encoding;
-
- om_output_impl->om_output.ops->set_char_set_encoding =
- axiom_output_set_char_set_encoding;
-
- om_output_impl->om_output.ops->get_xml_writer =
- axiom_output_get_xml_writer;
-
- om_output_impl->om_output.ops->set_do_optimize =
- axiom_output_set_do_optimize;
-
- om_output_impl->om_output.ops->is_optimized =
- axiom_output_is_optimized;
-
- om_output_impl->om_output.ops->is_ignore_xml_declaration =
- axiom_output_is_ignore_xml_declaration;
-
- om_output_impl->om_output.ops->set_soap11 =
- axiom_output_set_soap11;
-
- om_output_impl->om_output.ops->write_xml_version_encoding =
- axiom_output_write_xml_version_encoding;
-
- om_output_impl->om_output.ops->get_next_content_id = axiom_output_get_next_content_id;
-
- om_output_impl->om_output.ops->get_content_type =
- axiom_output_get_content_type;
-
- om_output_impl->om_output.ops->get_root_content_id =
- axiom_output_get_root_content_id;
-
- om_output_impl->om_output.ops->get_mime_boundry =
- axiom_output_get_mime_boundry;
-
- om_output_impl->om_output.ops->flush =
- axiom_output_flush;
-
return &(om_output_impl->om_output);
}
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_output_free(axiom_output_t *om_output,
const axis2_env_t *env)
{
@@ -321,17 +177,12 @@
om_output_impl->mime_output = NULL;
}
- if (om_output->ops)
- {
- AXIS2_FREE(env->allocator, om_output->ops);
- om_output->ops = NULL;
- }
AXIS2_FREE(env->allocator, om_output_impl);
om_output_impl = NULL;
return AXIS2_SUCCESS;
}
-axis2_bool_t AXIS2_CALL
+AXIS2_EXTERN axis2_bool_t AXIS2_CALL
axiom_output_is_soap11(axiom_output_t *om_output,
const axis2_env_t *env)
{
@@ -339,7 +190,7 @@
return AXIS2_INTF_TO_IMPL(om_output)->is_soap11;
}
-axis2_bool_t AXIS2_CALL
+AXIS2_EXTERN axis2_bool_t AXIS2_CALL
axiom_output_is_ignore_xml_declaration
(axiom_output_t *om_output,
const axis2_env_t *env)
@@ -348,7 +199,7 @@
return AXIS2_INTF_TO_IMPL(om_output)->ignore_xml_declaration;
}
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_output_set_ignore_xml_declaration
(axiom_output_t *om_output,
const axis2_env_t *env,
@@ -359,7 +210,7 @@
return AXIS2_SUCCESS;
}
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_output_set_soap11(axiom_output_t *om_output,
const axis2_env_t *env,
axis2_bool_t soap11)
@@ -369,7 +220,7 @@
return AXIS2_SUCCESS;
}
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_output_set_xml_version(axiom_output_t *om_output,
const axis2_env_t *env,
axis2_char_t *xml_version)
@@ -394,7 +245,7 @@
return AXIS2_SUCCESS;
}
-axis2_char_t* AXIS2_CALL
+AXIS2_EXTERN axis2_char_t* AXIS2_CALL
axiom_output_get_xml_version(axiom_output_t *om_output,
const axis2_env_t *env)
{
@@ -402,7 +253,7 @@
return AXIS2_INTF_TO_IMPL(om_output)->xml_version;
}
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_output_set_char_set_encoding
(axiom_output_t *om_output,
const axis2_env_t *env,
@@ -427,7 +278,7 @@
return AXIS2_SUCCESS;
}
-axis2_char_t* AXIS2_CALL
+AXIS2_EXTERN axis2_char_t* AXIS2_CALL
axiom_output_get_char_set_encoding
(axiom_output_t *om_output,
const axis2_env_t *env)
@@ -436,7 +287,7 @@
return AXIS2_INTF_TO_IMPL(om_output)->char_set_encoding;
}
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_output_set_do_optimize
(axiom_output_t *om_output,
const axis2_env_t *env,
@@ -447,7 +298,7 @@
return AXIS2_SUCCESS;
}
-axiom_xml_writer_t* AXIS2_CALL
+AXIS2_EXTERN axiom_xml_writer_t* AXIS2_CALL
axiom_output_get_xml_writer
(axiom_output_t *om_output,
const axis2_env_t *env)
@@ -456,14 +307,14 @@
return AXIS2_INTF_TO_IMPL(om_output)->xml_writer;
}
-axis2_bool_t AXIS2_CALL
+AXIS2_EXTERN axis2_bool_t AXIS2_CALL
axiom_output_is_optimized(axiom_output_t *om_output,
const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(om_output)->do_optimize;
}
-const axis2_char_t* AXIS2_CALL
+AXIS2_EXTERN const axis2_char_t* AXIS2_CALL
axiom_output_get_content_type(axiom_output_t *om_output,
const axis2_env_t *env)
{
@@ -502,7 +353,7 @@
return NULL;
}
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_output_write_optimized(axiom_output_t *om_output,
const axis2_env_t *env,
axiom_text_t *om_text)
@@ -525,7 +376,7 @@
}
-axis2_char_t* AXIS2_CALL
+AXIS2_EXTERN axis2_char_t* AXIS2_CALL
axiom_output_get_next_content_id(axiom_output_t *om_output,
const axis2_env_t *env)
{
@@ -575,7 +426,7 @@
}
-axis2_char_t* AXIS2_CALL
+AXIS2_EXTERN axis2_char_t* AXIS2_CALL
axiom_output_get_root_content_id(axiom_output_t *om_output,
const axis2_env_t *env)
{
@@ -609,7 +460,7 @@
return om_output_impl->root_content_id;
}
-axis2_char_t* AXIS2_CALL
+AXIS2_EXTERN axis2_char_t* AXIS2_CALL
axiom_output_get_mime_boundry(axiom_output_t *om_output,
const axis2_env_t *env)
{
Modified: webservices/axis2/trunk/c/axiom/src/om/om_processing_instruction.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_processing_instruction.c?view=diff&rev=491530&r1=491529&r2=491530
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_processing_instruction.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_processing_instruction.c Sun Dec 31 20:16:53 2006
@@ -19,32 +19,6 @@
#include <axis2_string.h>
#include "axiom_node_internal.h"
-axis2_status_t AXIS2_CALL
-axiom_processing_instruction_free(axiom_processing_instruction_t *om_pi,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-axiom_processing_instruction_set_value(axiom_processing_instruction_t *om_pi,
- const axis2_env_t *env,
- const axis2_char_t *value);
-axis2_status_t AXIS2_CALL
-axiom_processing_instruction_set_target(axiom_processing_instruction_t *om_pi,
- const axis2_env_t *env,
- const axis2_char_t *target);
-
-axis2_char_t* AXIS2_CALL
-axiom_processing_instruction_get_value(axiom_processing_instruction_t *om_pi,
- const axis2_env_t *env);
-axis2_char_t* AXIS2_CALL
-axiom_processing_instruction_get_target(axiom_processing_instruction_t *om_pi,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-axiom_processing_instruction_serialize
-(axiom_processing_instruction_t *om_pi,
- const axis2_env_t *env,
- axiom_output_t *om_output);
-
/*********************** axiom_processing_instruction_impl_t struct ********/
typedef struct axiom_processing_instruction_impl
{
@@ -57,13 +31,16 @@
}
axiom_processing_instruction_impl_t;
+static const axiom_processing_instruction_ops_t axiom_processing_instruction_ops_var = {
+};
+
/******************************************************************************/
#define AXIS2_INTF_TO_IMPL(om_processing_ins) ((axiom_processing_instruction_impl_t*)om_processing_ins)
/******************************************************************************/
-axiom_processing_instruction_t *AXIS2_CALL
+AXIS2_EXTERN axiom_processing_instruction_t *AXIS2_CALL
axiom_processing_instruction_create(const axis2_env_t *env,
axiom_node_t * parent,
const axis2_char_t * target,
@@ -132,38 +109,12 @@
}
/* ops */
- processing_instruction->om_pi.ops = NULL;
- processing_instruction->om_pi.ops =
- (axiom_processing_instruction_ops_t *) AXIS2_MALLOC(
- env->allocator, sizeof(axiom_processing_instruction_ops_t));
-
- if (!processing_instruction->om_pi.ops)
- {
- AXIS2_FREE(env->allocator, processing_instruction->value);
- AXIS2_FREE(env->allocator, processing_instruction->target);
- AXIS2_FREE(env->allocator, processing_instruction);
- AXIS2_FREE(env->allocator, *node);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- return NULL;
- }
-
- processing_instruction->om_pi.ops->free =
- axiom_processing_instruction_free;
- processing_instruction->om_pi.ops->set_target =
- axiom_processing_instruction_set_target;
- processing_instruction->om_pi.ops->get_target =
- axiom_processing_instruction_get_target;
- processing_instruction->om_pi.ops->get_value =
- axiom_processing_instruction_get_value;
- processing_instruction->om_pi.ops->set_value =
- axiom_processing_instruction_set_value;
- processing_instruction->om_pi.ops->serialize =
- axiom_processing_instruction_serialize;
+ processing_instruction->om_pi.ops = &axiom_processing_instruction_ops_var;
return &(processing_instruction->om_pi);
}
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_processing_instruction_free(axiom_processing_instruction_t *om_pi,
const axis2_env_t *env)
{
@@ -184,12 +135,11 @@
pi_impl->target = NULL;
}
- AXIS2_FREE(env->allocator, om_pi->ops);
AXIS2_FREE(env->allocator, pi_impl);
return AXIS2_SUCCESS;
}
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_processing_instruction_set_value(axiom_processing_instruction_t *om_pi,
const axis2_env_t *env,
const axis2_char_t *value)
@@ -201,7 +151,7 @@
}
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_processing_instruction_set_target(axiom_processing_instruction_t *om_pi,
const axis2_env_t *env,
const axis2_char_t *target)
@@ -213,14 +163,14 @@
}
-axis2_char_t* AXIS2_CALL
+AXIS2_EXTERN axis2_char_t* AXIS2_CALL
axiom_processing_instruction_get_value(axiom_processing_instruction_t *om_pi,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(om_pi)->value;
}
-axis2_char_t* AXIS2_CALL
+AXIS2_EXTERN axis2_char_t* AXIS2_CALL
axiom_processing_instruction_get_target(axiom_processing_instruction_t *om_pi,
const axis2_env_t *env)
{
@@ -229,7 +179,7 @@
}
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_processing_instruction_serialize
(axiom_processing_instruction_t *om_pi,
const axis2_env_t *env,
@@ -252,3 +202,4 @@
2, om_pi_impl->target, om_pi_impl->value);
return AXIS2_FAILURE;
}
+
Modified: webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c?view=diff&rev=491530&r1=491529&r2=491530
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c Sun Dec 31 20:16:53 2006
@@ -26,32 +26,6 @@
#include "axiom_node_internal.h"
#include "axiom_stax_builder_internal.h"
/**************************** function prototypes *****************************/
-
-axiom_node_t * AXIS2_CALL
-axiom_stax_builder_next(axiom_stax_builder_t *builder,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-axiom_stax_builder_discard_current_element(axiom_stax_builder_t *builder,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-axiom_stax_builder_free(axiom_stax_builder_t *builder,
- const axis2_env_t *env);
-
-
-axiom_document_t* AXIS2_CALL
-axiom_stax_builder_get_document(axiom_stax_builder_t *builder,
- const axis2_env_t *env);
-
-axis2_bool_t AXIS2_CALL
-axiom_stax_builder_is_complete(axiom_stax_builder_t *builder,
- const axis2_env_t *env);
-
-int AXIS2_CALL
-axiom_stax_builder_next_with_token(axiom_stax_builder_t *builder,
- const axis2_env_t *env);
-
/********************************* axiom_stax_builder_impl_t struct ********/
typedef struct axiom_stax_builder_impl_t
{
@@ -78,6 +52,9 @@
}
axiom_stax_builder_impl_t;
+static const axiom_stax_builder_ops_t axiom_stax_builder_ops_var = {
+};
+
/************************************** Macro *********************************/
#define AXIS2_INTF_TO_IMPL(builder) ((axiom_stax_builder_impl_t*)builder)
@@ -120,36 +97,7 @@
}
/* ops */
- builder->om_stax_builder.ops = NULL;
- builder->om_stax_builder.ops = (axiom_stax_builder_ops_t *) AXIS2_MALLOC(
- env->allocator,
- sizeof(axiom_stax_builder_ops_t));
-
- if (!builder->om_stax_builder.ops)
- {
- AXIOM_XML_READER_FREE(builder->parser, env);
- AXIS2_FREE(env->allocator, builder);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- return NULL;
- }
-
- builder->om_stax_builder.ops->next =
- axiom_stax_builder_next;
- builder->om_stax_builder.ops->discard_current_element =
- axiom_stax_builder_discard_current_element;
-
- builder->om_stax_builder.ops->free =
- axiom_stax_builder_free;
-
- builder->om_stax_builder.ops->get_document =
- axiom_stax_builder_get_document;
-
- builder->om_stax_builder.ops->next_with_token =
- axiom_stax_builder_next_with_token;
-
- builder->om_stax_builder.ops->is_complete =
- axiom_stax_builder_is_complete;
-
+ builder->om_stax_builder.ops = &axiom_stax_builder_ops_var;
return &(builder->om_stax_builder);
}
@@ -285,7 +233,7 @@
}
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_stax_builder_discard_current_element(axiom_stax_builder_t *om_stax_builder,
const axis2_env_t *env)
{
@@ -670,7 +618,7 @@
return pi_node;
}
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_stax_builder_end_element(axiom_stax_builder_t *om_stax_builder,
const axis2_env_t *env)
{
@@ -709,7 +657,7 @@
}
-axiom_node_t * AXIS2_CALL
+AXIS2_EXTERN axiom_node_t * AXIS2_CALL
axiom_stax_builder_next(axiom_stax_builder_t *om_stax_builder,
const axis2_env_t *env)
{
@@ -805,7 +753,7 @@
}
-axis2_status_t
+AXIS2_EXTERN axis2_status_t
AXIS2_CALL axiom_stax_builder_free(axiom_stax_builder_t *builder,
const axis2_env_t *env)
{
@@ -834,17 +782,12 @@
builder_impl->root_node = NULL;
}
}
- if (builder->ops)
- {
- AXIS2_FREE(env->allocator, builder->ops);
- builder->ops = NULL;
- }
AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(builder));
return AXIS2_SUCCESS;
}
-axiom_document_t* AXIS2_CALL
+AXIS2_EXTERN axiom_document_t* AXIS2_CALL
axiom_stax_builder_get_document(axiom_stax_builder_t *builder,
const axis2_env_t *env)
{
@@ -878,7 +821,7 @@
/**
This is an internal function
*/
-axis2_bool_t AXIS2_CALL
+AXIS2_EXTERN axis2_bool_t AXIS2_CALL
axiom_stax_builder_is_complete(axiom_stax_builder_t *builder,
const axis2_env_t *env)
{
@@ -1028,3 +971,5 @@
}
return token;
}
+
+
Modified: webservices/axis2/trunk/c/axiom/src/om/om_text.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_text.c?view=diff&rev=491530&r1=491529&r2=491530
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_text.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_text.c Sun Dec 31 20:16:53 2006
@@ -25,92 +25,10 @@
#include <axiom_namespace.h>
#include <axis2_base64.h>
-/* ops */
-axis2_status_t AXIS2_CALL
-axiom_text_free(axiom_text_t * om_text,
- const axis2_env_t *env);
-
-
-axis2_status_t AXIS2_CALL
-axiom_text_serialize(axiom_text_t * om_text,
- const axis2_env_t *env,
- axiom_output_t * om_output);
-
-axis2_char_t* AXIS2_CALL
-axiom_text_get_value(axiom_text_t *om_text,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-axiom_text_set_value(axiom_text_t *om_text,
- const axis2_env_t *env,
- const axis2_char_t *value);
-/*Following are for MTOM*/
-axis2_char_t* AXIS2_CALL
-axiom_text_get_mime_type(axiom_text_t *om_text,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-axiom_text_set_mime_type(axiom_text_t *om_text,
- const axis2_env_t *env,
- const axis2_char_t *mime_type);
-
-
-axis2_status_t AXIS2_CALL
-axiom_text_set_optimize(axiom_text_t *om_text,
- const axis2_env_t *env,
- const axis2_bool_t optimize);
-
-axis2_bool_t AXIS2_CALL
-axiom_text_get_optimize(axiom_text_t *om_text,
- const axis2_env_t *env);
-
-axis2_bool_t AXIS2_CALL
-axiom_text_get_is_binary(axiom_text_t *om_text,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-axiom_text_set_is_binary(axiom_text_t *om_text,
- const axis2_env_t *env,
- const axis2_bool_t is_binary);
-
-const axis2_char_t* AXIS2_CALL
-axiom_text_get_localname(axiom_text_t *om_text,
- const axis2_env_t *env);
-
-axis2_char_t* AXIS2_CALL
-axiom_text_get_content_id(axiom_text_t *om_text,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-axiom_text_set_content_id(axiom_text_t *om_text,
- const axis2_env_t *env,
- const axis2_char_t *content_id);
-
-axis2_status_t AXIS2_CALL
-axiom_text_serialize_start_part(axiom_text_t *om_text,
- const axis2_env_t *env,
- axiom_output_t *om_output_t);
-
-axis2_status_t AXIS2_CALL
-axiom_text_serialize_attribute(axiom_text_t *om_text,
- const axis2_env_t *env,
- axiom_output_t *om_output,
- axiom_attribute_t *om_attribute);
-
-axis2_status_t AXIS2_CALL
-axiom_text_serialize_namespace(axiom_text_t *om_text,
- const axis2_env_t *env,
- const axiom_namespace_t *om_namespace,
- axiom_output_t *om_output);
-
axis2_char_t* AXIS2_CALL
axiom_text_get_text(axiom_text_t *om_text,
const axis2_env_t *env);
-axiom_data_handler_t *AXIS2_CALL
-axiom_text_get_data_handler(axiom_text_t *om_text,
- const axis2_env_t *env);
-
/********************* axiom_text_impl_struct ***************/
typedef struct axiom_text_impl_t
@@ -130,6 +48,8 @@
}
axiom_text_impl_t;
+static const axiom_text_ops_t axiom_text_ops_var = {
+};
/*********************** Macro ***********************************/
@@ -191,27 +111,7 @@
}
/* ops */
- om_text->om_text.ops = NULL;
- om_text->om_text.ops = (axiom_text_ops_t *) AXIS2_MALLOC(env->allocator,
- sizeof(axiom_text_ops_t));
-
- if (!om_text->om_text.ops)
- {
- AXIS2_FREE(env->allocator, om_text->value);
- AXIS2_FREE(env->allocator, om_text);
- AXIS2_FREE(env->allocator, *node);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- return NULL;
- }
-
- om_text->om_text.ops->free = axiom_text_free;
- om_text->om_text.ops->serialize = axiom_text_serialize;
- om_text->om_text.ops->set_value = axiom_text_set_value;
- om_text->om_text.ops->get_value = axiom_text_get_value;
- om_text->om_text.ops->get_data_handler = axiom_text_get_data_handler;
- om_text->om_text.ops->get_content_id = axiom_text_get_content_id;
- om_text->om_text.ops->set_optimize = axiom_text_set_optimize;
- om_text->om_text.ops->set_is_binary = axiom_text_set_is_binary;
+ om_text->om_text.ops = &axiom_text_ops_var;
return &(om_text->om_text);
}
@@ -236,7 +136,7 @@
return &(om_text_impl->om_text);
}
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_text_free(axiom_text_t * om_text,
const axis2_env_t *env)
{
@@ -274,17 +174,11 @@
text_impl->data_handler = NULL;
}
- if (om_text->ops)
- {
- AXIS2_FREE(env->allocator, om_text->ops);
- om_text->ops = NULL;
- }
-
AXIS2_FREE(env->allocator, text_impl);
return AXIS2_SUCCESS;
}
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_text_serialize(axiom_text_t *om_text,
const axis2_env_t *env,
axiom_output_t *om_output)
@@ -350,7 +244,7 @@
return status;
}
-axis2_char_t* AXIS2_CALL
+AXIS2_EXTERN axis2_char_t* AXIS2_CALL
axiom_text_get_value(axiom_text_t *om_text,
const axis2_env_t *env)
{
@@ -358,7 +252,7 @@
return AXIS2_INTF_TO_IMPL(om_text)->value;
}
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_text_set_value(axiom_text_t *om_text,
const axis2_env_t *env,
const axis2_char_t *value)
@@ -388,7 +282,7 @@
/*Following has been implemented for the MTOM support*/
-axis2_char_t* AXIS2_CALL
+AXIS2_EXTERN axis2_char_t* AXIS2_CALL
axiom_text_get_mime_type(axiom_text_t *om_text,
const axis2_env_t *env)
{
@@ -396,7 +290,7 @@
return AXIS2_INTF_TO_IMPL(om_text)->mime_type;
}
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_text_set_mime_type(axiom_text_t *om_text,
const axis2_env_t *env,
const axis2_char_t *mime_type)
@@ -410,7 +304,7 @@
}
-axis2_bool_t AXIS2_CALL
+AXIS2_EXTERN axis2_bool_t AXIS2_CALL
axiom_text_get_optimize(axiom_text_t *om_text,
const axis2_env_t *env)
{
@@ -418,7 +312,7 @@
return AXIS2_INTF_TO_IMPL(om_text)->optimize;
}
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_text_set_optimize(axiom_text_t *om_text,
const axis2_env_t *env,
const axis2_bool_t optimize)
@@ -430,7 +324,7 @@
}
-axis2_bool_t AXIS2_CALL
+AXIS2_EXTERN axis2_bool_t AXIS2_CALL
axiom_text_get_is_binary(axiom_text_t *om_text,
const axis2_env_t *env)
{
@@ -438,7 +332,7 @@
return AXIS2_INTF_TO_IMPL(om_text)->is_binary;
}
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_text_set_is_binary(axiom_text_t *om_text,
const axis2_env_t *env,
const axis2_bool_t is_binary)
@@ -449,7 +343,7 @@
return AXIS2_SUCCESS;
}
-const axis2_char_t* AXIS2_CALL
+AXIS2_EXTERN const axis2_char_t* AXIS2_CALL
axiom_text_get_localname(axiom_text_t *om_text,
const axis2_env_t *env)
{
@@ -457,7 +351,7 @@
return AXIS2_INTF_TO_IMPL(om_text)->localname;
}
-axis2_char_t* AXIS2_CALL
+AXIS2_EXTERN axis2_char_t* AXIS2_CALL
axiom_text_get_content_id(axiom_text_t *om_text,
const axis2_env_t *env)
{
@@ -465,7 +359,7 @@
return AXIS2_INTF_TO_IMPL(om_text)->content_id;
}
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_text_set_content_id(axiom_text_t *om_text,
const axis2_env_t *env,
const axis2_char_t *content_id)
@@ -478,7 +372,7 @@
return AXIS2_SUCCESS;
}
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_text_serialize_start_part(axiom_text_t *om_text,
const axis2_env_t *env,
axiom_output_t *om_output)
@@ -530,7 +424,7 @@
return AXIS2_SUCCESS;
}
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_text_serialize_attribute(axiom_text_t *om_text,
const axis2_env_t *env,
axiom_output_t *om_output,
@@ -577,7 +471,7 @@
return AXIS2_SUCCESS;
}
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_text_serialize_namespace(axiom_text_t *om_text,
const axis2_env_t *env,
const axiom_namespace_t *om_namespace,
@@ -605,7 +499,7 @@
return AXIS2_SUCCESS;
}
-axis2_char_t* AXIS2_CALL
+AXIS2_EXTERN axis2_char_t* AXIS2_CALL
axiom_text_get_text(axiom_text_t *om_text,
const axis2_env_t *env)
{
@@ -644,7 +538,7 @@
return om_text_impl->value;
}
-axiom_data_handler_t *AXIS2_CALL
+AXIS2_EXTERN axiom_data_handler_t *AXIS2_CALL
axiom_text_get_data_handler(axiom_text_t *om_text,
const axis2_env_t *env)
{
Modified: webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c?view=diff&rev=491530&r1=491529&r2=491530
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c Sun Dec 31 20:16:53 2006
@@ -519,7 +519,7 @@
info = AXIS2_DEP_ENGINE_GET_PHASES_INFO(conf_builder->desc_builder->engine,
env);
- while (AXIS2_TRUE == AXIOM_CHILDREN_ITERATOR_HAS_NEXT(phase_orders, env))
+ while (AXIS2_TRUE == AXIOM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(phase_orders, env))
{
axiom_node_t *phase_orders_node = NULL;
axiom_element_t *phase_orders_element = NULL;
@@ -528,7 +528,7 @@
axis2_char_t *flow_type = NULL;
axis2_array_list_t *phase_list = NULL;
- phase_orders_node = (axiom_node_t *) AXIOM_CHILDREN_ITERATOR_NEXT(
+ phase_orders_node = (axiom_node_t *) AXIOM_CHILDREN_QNAME_ITERATOR_NEXT(
phase_orders, env);
if (phase_orders_node)
{
@@ -1119,7 +1119,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, module_versions, AXIS2_FAILURE);
- while (AXIOM_CHILDREN_ITERATOR_HAS_NEXT(module_versions, env))
+ while (AXIOM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(module_versions, env))
{
axiom_element_t *om_element = NULL;
axis2_char_t *name = NULL;
@@ -1127,7 +1127,7 @@
axis2_qname_t *attribute_qname = NULL;
om_element = (axiom_element_t *)
- AXIOM_CHILDREN_ITERATOR_NEXT(module_versions, env);
+ AXIOM_CHILDREN_QNAME_ITERATOR_NEXT(module_versions, env);
if (NULL == om_element)
{
continue;
Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c?view=diff&rev=491530&r1=491529&r2=491530
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Sun Dec 31 20:16:53 2006
@@ -673,14 +673,14 @@
axis2_param_container_t *parent,
axis2_svc_t *svc)
{
- while (AXIS2_TRUE == AXIOM_CHILDREN_ITERATOR_HAS_NEXT(module_confs, env))
+ while (AXIS2_TRUE == AXIOM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(module_confs, env))
{
axiom_element_t *module_conf_element = NULL;
axiom_node_t *module_conf_node = NULL;
axiom_attribute_t *module_name_att = NULL;
axis2_qname_t *qattname = NULL;
- module_conf_node = AXIOM_CHILDREN_ITERATOR_NEXT(module_confs, env);
+ module_conf_node = AXIOM_CHILDREN_QNAME_ITERATOR_NEXT(module_confs, env);
module_conf_element = AXIOM_NODE_GET_DATA_ELEMENT(module_conf_node,
env);
qattname = axis2_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
@@ -712,14 +712,14 @@
AXIS2_PARAM_CHECK(env->error, module_refs, AXIS2_FAILURE);
builder_impl = AXIS2_INTF_TO_IMPL(svc_builder);
- while (AXIS2_TRUE == AXIOM_CHILDREN_ITERATOR_HAS_NEXT(module_refs, env))
+ while (AXIS2_TRUE == AXIOM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(module_refs, env))
{
axiom_element_t *module_ref_element = NULL;
axiom_node_t *module_ref_node = NULL;
axiom_attribute_t *module_ref_att = NULL;
axis2_qname_t *qref = NULL;
- module_ref_node = AXIOM_CHILDREN_ITERATOR_NEXT(module_refs, env);
+ module_ref_node = AXIOM_CHILDREN_QNAME_ITERATOR_NEXT(module_refs, env);
module_ref_element = AXIOM_NODE_GET_DATA_ELEMENT(module_ref_node,
env);
qref = axis2_qname_create(env, AXIS2_REF, NULL, NULL);
Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c?view=diff&rev=491530&r1=491529&r2=491530
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c Sun Dec 31 20:16:53 2006
@@ -291,14 +291,14 @@
AXIS2_PARAM_CHECK(env->error, svc_grp, AXIS2_FAILURE);
grp_builder_impl = AXIS2_INTF_TO_IMPL(grp_builder);
- while (AXIS2_TRUE == AXIOM_CHILDREN_ITERATOR_HAS_NEXT(module_refs, env))
+ while (AXIS2_TRUE == AXIOM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(module_refs, env))
{
axiom_node_t *module_ref_node = NULL;
axiom_element_t *module_ref_element = NULL;
axiom_attribute_t *module_ref_att = NULL;
axis2_qname_t *qref = NULL;
- module_ref_node = (axiom_node_t *) AXIOM_CHILDREN_ITERATOR_NEXT(
+ module_ref_node = (axiom_node_t *) AXIOM_CHILDREN_QNAME_ITERATOR_NEXT(
module_refs, env);
module_ref_element = AXIOM_NODE_GET_DATA_ELEMENT(module_ref_node, env);
qref = axis2_qname_create(env, AXIS2_REF, NULL, NULL);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org