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 du...@apache.org on 2007/03/14 08:39:15 UTC
svn commit: r518046 - in /webservices/axis2/trunk/c: axiom/include/
axiom/src/om/ axiom/src/soap/ axiom/test/om/ axiom/test/soap/
modules/core/transport/http/sender/
modules/core/transport/http/sender/libcurl/ samples/client/dynamic_client/
samples/cli...
Author: dushshantha
Date: Wed Mar 14 00:39:14 2007
New Revision: 518046
URL: http://svn.apache.org/viewvc?view=rev&rev=518046
Log:
removed macros and corrected indentation.
Modified:
webservices/axis2/trunk/c/axiom/include/axiom_output.h
webservices/axis2/trunk/c/axiom/src/om/om_element.c
webservices/axis2/trunk/c/axiom/src/om/om_node.c
webservices/axis2/trunk/c/axiom/src/om/om_output.c
webservices/axis2/trunk/c/axiom/src/om/om_text.c
webservices/axis2/trunk/c/axiom/src/soap/soap_envelope.c
webservices/axis2/trunk/c/axiom/test/om/test_om.c
webservices/axis2/trunk/c/axiom/test/soap/test_soap.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c
webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c
webservices/axis2/trunk/c/samples/client/dynamic_client/test.c
webservices/axis2/trunk/c/samples/client/math/math_client.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema.c
Modified: webservices/axis2/trunk/c/axiom/include/axiom_output.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_output.h?view=diff&rev=518046&r1=518045&r2=518046
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_output.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_output.h Wed Mar 14 00:39:14 2007
@@ -18,11 +18,6 @@
#ifndef AXIOM_OUTPUT_H
#define AXIOM_OUTPUT_H
-/**
- * @file axiom_output.h
- * @brief interface of om xml writer
- */
-
#include <axis2_utils_defines.h>
#include <axis2_utils.h>
#include <axis2_env.h>
@@ -41,22 +36,21 @@
*/
/**
- * \brief output struct
- * The XML writer interface struct of om
- */
+ * \brief output struct
+ * The XML writer interface struct of om
+ */
typedef struct axiom_output axiom_output_t;
struct axiom_text;
/**
- * creates AXIOM output struct
- * @param env Environment. MUST NOT be NULL, .
- * @param xml_writer XML writer.
- * @return a pointer to newly created output struct.
- */
-
- AXIS2_EXTERN axiom_output_t* AXIS2_CALL
+ * Creates AXIOM output struct
+ * @param env Environment. MUST NOT be NULL, .
+ * @param xml_writer XML writer.
+ * @return a pointer to newly created output struct.
+ */
+ AXIS2_EXTERN axiom_output_t *AXIS2_CALL
axiom_output_create(const axis2_env_t *env,
- axiom_xml_writer_t *xml_writer);
+ axiom_xml_writer_t *xml_writer);
/**
* Performs xml writing.
@@ -67,204 +61,156 @@
* @param no_of_args number of arguments passed in the variable parameter list
* @return satus of the op. AXIS2_SUCCESS on success else AXIS2_FAILURE
*/
-
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_output_write(axiom_output_t * om_output,
- const axis2_env_t *env,
- axiom_types_t type,
- int no_of_args, ...);
+ const axis2_env_t *env,
+ axiom_types_t type,
+ int no_of_args, ...);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_output_write_optimized(axiom_output_t *om_output,
- const axis2_env_t *env,
- struct axiom_text *om_text);
+ const axis2_env_t *env,
+ struct axiom_text *om_text);
/**
- * free om_output
- * @param om_output om_output struct
- * @param env environment
- * @return status code AXIS2_SUCCESS on success,
- * AXIS2_FAILURE otherwise
- */
+ * Free om_output
+ * @param om_output om_output struct
+ * @param env environment
+ * @return status code AXIS2_SUCCESS on success,
+ * AXIS2_FAILURE otherwise
+ */
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_output_free(axiom_output_t *om_output,
- const axis2_env_t *env);
+ const axis2_env_t *env);
/**
- * If the xml to be serialized is soap 11, this property is set to true
- * @param om_output pointer to om_output struct
- * @param env environment must not be NULL
- * @returns the output soap version
- */
+ * If the xml to be serialized is soap 11, this property is set to true
+ * @param om_output pointer to om_output struct
+ * @param env environment must not be NULL
+ * @returns the output soap version
+ */
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
axiom_output_is_soap11(axiom_output_t *om_output,
- const axis2_env_t *env);
+ const axis2_env_t *env);
+
/**
* @returns true if the ignore_xml_declaration property is true
*/
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
axiom_output_is_ignore_xml_declaration(axiom_output_t *om_output,
- const axis2_env_t *env);
+ const axis2_env_t *env);
/**
- * sets the ignore_xml_declaration property is true
+ * Sets the ignore_xml_declaration property is true
*/
AXIS2_EXTERN 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);
+ const axis2_env_t *env,
+ axis2_bool_t ignore_xml_dec);
+
/**
- * sets the soap11 property to true
+ * Sets the soap11 property to true
*/
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);
+ const axis2_env_t *env,
+ axis2_bool_t soap11);
/**
- * set xml_version property
- */
+ * Sets xml_version property
+ */
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);
+ const axis2_env_t *env,
+ axis2_char_t *xml_version);
+
/**
- * @returns xml version property
- */
- AXIS2_EXTERN axis2_char_t* AXIS2_CALL
+ * @returns xml version property
+ */
+ AXIS2_EXTERN axis2_char_t *AXIS2_CALL
axiom_output_get_xml_version(axiom_output_t *om_output,
- const axis2_env_t *env);
+ const axis2_env_t *env);
+
/**
- * set the char set encoding property
- */
+ * Sets the char set encoding property
+ */
AXIS2_EXTERN 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);
+ const axis2_env_t *env,
+ axis2_char_t *char_set_encoding);
+
/**
- * @returns the char set encoding property
- */
- AXIS2_EXTERN axis2_char_t* AXIS2_CALL
+ * @returns the char set encoding property
+ */
+ AXIS2_EXTERN axis2_char_t *AXIS2_CALL
axiom_output_get_char_set_encoding(axiom_output_t *om_output,
- const axis2_env_t *env);
+ const axis2_env_t *env);
+
/**
- * set the do optimize property true
- */
+ * Sets the do optimize property true
+ */
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_output_set_do_optimize(axiom_output_t *om_output,
- const axis2_env_t *env,
- axis2_bool_t optimize);
+ const axis2_env_t *env,
+ axis2_bool_t optimize);
/**
- * returns the xml writer
- */
- AXIS2_EXTERN axiom_xml_writer_t* AXIS2_CALL
+ * Returns the xml writer
+ */
+ AXIS2_EXTERN axiom_xml_writer_t *AXIS2_CALL
axiom_output_get_xml_writer(axiom_output_t *om_output,
- const axis2_env_t *env); /**
- * returns the content type
- * for soap11 'text/xml' etc..
- * @param om_output
- * @param env environemnt
- * @returns content id
- */
- AXIS2_EXTERN const axis2_char_t* AXIS2_CALL
+ const axis2_env_t *env);
+
+ /**
+ * Returns the content type
+ * for soap11 'text/xml' etc..
+ * @param om_output
+ * @param env environemnt
+ * @returns content id
+ */
+ AXIS2_EXTERN const axis2_char_t *AXIS2_CALL
axiom_output_get_content_type(axiom_output_t *om_output,
- const axis2_env_t *env);
+ const axis2_env_t *env);
/**
- * writes the xml versio encoding
- */
+ * Writes the xml versio encoding
+ */
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_output_write_xml_version_encoding(axiom_output_t *om_output,
- const axis2_env_t *env);
+ const axis2_env_t *env);
/**
* @returns whether the output is to be optimized
*/
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
axiom_output_is_optimized(axiom_output_t *om_output,
- const axis2_env_t *env);
+ const axis2_env_t *env);
- /** returns the next content id
+ /**
+ * Returns the next content id
*/
- AXIS2_EXTERN 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);
+ const axis2_env_t *env);
/**
* root content id
*/
- AXIS2_EXTERN 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);
+ const axis2_env_t *env);
- AXIS2_EXTERN 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);
+ const axis2_env_t *env);
- AXIS2_EXTERN axis2_byte_t* AXIS2_CALL
+ AXIS2_EXTERN 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);
-
-
- /************** Macros ********************************************************/
-
-#define AXIOM_OUTPUT_FREE(output, env) \
- axiom_output_free(output, env)
-
-#define AXIOM_OUTPUT_IS_SOAP11(output, env) \
- axiom_output_is_soap11(output, env)
-
-#define AXIOM_OUTPUT_IS_IGNORE_XML_DECLARATION(output, env) \
- axiom_output_is_ignore_xml_version(output, env)
-
-#define AXIOM_OUTPUT_SET_IGNORE_XML_DECLARATION(output, env, xml_dec) \
- axiom_output_set_ignore_xml_version(output, env, xml_dec)
-
-#define AXIOM_OUTPUT_SET_SOAP11(output, env, soap11) \
- axiom_output_set_soap11(output, env, soap11)
-
-#define AXIOM_OUTPUT_SET_XML_VERSION(output, env, xml_version) \
- axiom_output_set_xml_version(output, env, xml_version)
-
-#define AXIOM_OUTPUT_GET_XML_VERSION(output, env) \
- axiom_output_get_xml_version(output, env)
-
-#define AXIOM_OUTPUT_SET_CHAR_SET_ENCODING(output, env, char_set) \
- axiom_output_set_char_set_encoding(output, env, char_set)
-
-#define AXIOM_OUTPUT_GET_CHAR_SET_ENCODING(output, env) \
- axiom_output_get_char_set_encoding(output, env)
-
-#define AXIOM_OUTPUT_SET_DO_OPTIMIZE(output, env, optimize) \
- axiom_output_set_do_optimize(output, env, optimize)
-
-#define AXIOM_OUTPUT_GET_XML_WRITER(output, env) \
- axiom_output_get_xml_writer(output, env)
-
-#define AXIOM_OUTPUT_GET_CONTENT_TYPE(output, env) \
- axiom_output_get_content_type(output, env)
-
-#define AXIOM_OUTPUT_WRITE_XML_VERSION_ENCODING(output, env) \
- axiom_output_write_xml_version_encoding(output, env)
-
-#define AXIOM_OUTPUT_IS_OPTIMIZED(output, env) \
- axiom_output_is_optimized(output, env)
-
-#define AXIOM_OUTPUT_GET_NEXT_CONTENT_ID(om_output, env) \
- axiom_output_get_next_content_id(om_output, env)
-
-#define AXIOM_OUTPUT_GET_ROOT_CONTENT_ID(om_output, env) \
- axiom_output_get_root_content_id(om_output, env)
-
-#define AXIOM_OUTPUT_GET_MIME_BOUNDRY(om_output, env) \
- axiom_output_get_mime_boundry(om_output, env)
+ const axis2_env_t *env,
+ axis2_byte_t **output_stream,
+ int *output_stream_size);
-#define AXIOM_OUTPUT_FLUSH(om_output, env, output_stream, output_stream_size) \
- axiom_output_flush(om_output, env, output_stream, output_stream_size)
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/axiom/src/om/om_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_element.c?view=diff&rev=518046&r1=518045&r2=518046
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_element.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_element.c Wed Mar 14 00:39:14 2007
@@ -1165,7 +1165,7 @@
{
xml = (axis2_char_t*)AXIOM_XML_WRITER_GET_XML(xml_writer, env);
}
- AXIOM_OUTPUT_FREE(om_output, env);
+ axiom_output_free(om_output, env);
return xml;
}
Modified: webservices/axis2/trunk/c/axiom/src/om/om_node.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_node.c?view=diff&rev=518046&r1=518045&r2=518046
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_node.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_node.c Wed Mar 14 00:39:14 2007
@@ -736,6 +736,6 @@
{
xml = axis2_strdup((axis2_char_t*)AXIOM_XML_WRITER_GET_XML(xml_writer, env), env);
}
- AXIOM_OUTPUT_FREE(om_output, env);
+ axiom_output_free(om_output, env);
return xml;
}
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=518046&r1=518045&r2=518046
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_output.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_output.c Wed Mar 14 00:39:14 2007
@@ -64,16 +64,16 @@
};
-AXIS2_EXTERN axiom_output_t * AXIS2_CALL
+AXIS2_EXTERN axiom_output_t *AXIS2_CALL
axiom_output_create(const axis2_env_t *env,
- axiom_xml_writer_t *xml_writer)
+ axiom_xml_writer_t *xml_writer)
{
axiom_output_t *om_output = NULL;
AXIS2_ENV_CHECK(env, NULL);
om_output = (axiom_output_t *) AXIS2_MALLOC(
- env->allocator,
- sizeof(axiom_output_t));
+ env->allocator,
+ sizeof(axiom_output_t));
if (!om_output)
{
@@ -101,76 +101,66 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_output_free(axiom_output_t *om_output,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if (om_output->xml_version)
{
AXIS2_FREE(env->allocator, om_output->xml_version);
- om_output->xml_version = NULL;
}
if (om_output->mime_boundary)
{
AXIS2_FREE(env->allocator, om_output->mime_boundary);
- om_output->mime_boundary = NULL;
}
if (om_output->next_content_id)
{
AXIS2_FREE(env->allocator, om_output->next_content_id);
- om_output->next_content_id = NULL;
}
if (om_output->root_content_id)
{
AXIS2_FREE(env->allocator, om_output->root_content_id);
- om_output->root_content_id = NULL;
}
if (om_output->xml_writer)
{
AXIOM_XML_WRITER_FREE(om_output->xml_writer, env);
- om_output->xml_writer = NULL;
}
if (om_output->binary_node_list)
{
axis2_array_list_free(om_output->binary_node_list, env);
- om_output->binary_node_list = NULL;
}
if (om_output->mime_output)
{
AXIOM_MIME_OUTPUT_FREE(om_output->mime_output, env);
- om_output->mime_output = NULL;
}
AXIS2_FREE(env->allocator, om_output);
- om_output = NULL;
return AXIS2_SUCCESS;
}
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
axiom_output_is_soap11(axiom_output_t *om_output,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return om_output->is_soap11;
}
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-axiom_output_is_ignore_xml_declaration
-(axiom_output_t *om_output,
- const axis2_env_t *env)
+axiom_output_is_ignore_xml_declaration(axiom_output_t *om_output,
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return om_output->ignore_xml_declaration;
}
AXIS2_EXTERN 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)
+axiom_output_set_ignore_xml_declaration(axiom_output_t *om_output,
+ const axis2_env_t *env,
+ axis2_bool_t ignore_xml_dec)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
om_output->ignore_xml_declaration = ignore_xml_dec;
@@ -179,8 +169,8 @@
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)
+ const axis2_env_t *env,
+ axis2_bool_t soap11)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
om_output->is_soap11 = soap11;
@@ -189,8 +179,8 @@
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)
+ const axis2_env_t *env,
+ axis2_char_t *xml_version)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -212,67 +202,57 @@
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
axiom_output_get_xml_version(axiom_output_t *om_output,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return om_output->xml_version;
}
AXIS2_EXTERN 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)
+axiom_output_set_char_set_encoding(axiom_output_t *om_output,
+ const axis2_env_t *env,
+ axis2_char_t *char_set_encoding)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
om_output->char_set_encoding = char_set_encoding;
-
return AXIS2_SUCCESS;
}
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axiom_output_get_char_set_encoding
-(axiom_output_t *om_output,
- const axis2_env_t *env)
+axiom_output_get_char_set_encoding(axiom_output_t *om_output,
+ const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return om_output->char_set_encoding;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_output_set_do_optimize
-(axiom_output_t *om_output,
- const axis2_env_t *env,
- axis2_bool_t optimize)
+axiom_output_set_do_optimize(axiom_output_t *om_output,
+ const axis2_env_t *env,
+ axis2_bool_t optimize)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
om_output->do_optimize = optimize;
return AXIS2_SUCCESS;
}
-AXIS2_EXTERN axiom_xml_writer_t* AXIS2_CALL
-axiom_output_get_xml_writer
-(axiom_output_t *om_output,
- const axis2_env_t *env)
+AXIS2_EXTERN axiom_xml_writer_t *AXIS2_CALL
+axiom_output_get_xml_writer(axiom_output_t *om_output,
+ const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return om_output->xml_writer;
}
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
axiom_output_is_optimized(axiom_output_t *om_output,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
return om_output->do_optimize;
}
-AXIS2_EXTERN 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)
+ const axis2_env_t *env)
{
const axis2_char_t *soap_content_type = NULL;
- AXIS2_ENV_CHECK(env, NULL);
if (AXIS2_TRUE == om_output->do_optimize)
{
if (AXIS2_TRUE == om_output->is_soap11)
@@ -284,11 +264,10 @@
soap_content_type = AXIOM_SOAP12_CONTENT_TYPE;
}
- return AXIOM_MIME_OUTPUT_GET_CONTENT_TYPE_FOR_MIME(
- om_output->mime_output,
- env, om_output->mime_boundry,
- om_output->root_content_id, om_output->char_set_encoding,
- soap_content_type);
+ return AXIOM_MIME_OUTPUT_GET_CONTENT_TYPE_FOR_MIME(om_output->mime_output,
+ env, om_output->mime_boundry,
+ om_output->root_content_id, om_output->char_set_encoding,
+ soap_content_type);
}
else
{
@@ -306,8 +285,8 @@
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)
+ const axis2_env_t *env,
+ axiom_text_t *om_text)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if (om_output->binary_node_list)
@@ -318,23 +297,22 @@
{
om_output->binary_node_list = axis2_array_list_create(env, 5);
if (!(om_output->binary_node_list))
+ {
return AXIS2_FAILURE;
+ }
axis2_array_list_add(om_output->binary_node_list, env, om_text);
}
return AXIS2_SUCCESS;
}
-
-AXIS2_EXTERN 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)
+ const axis2_env_t *env)
{
axis2_char_t *uuid = NULL;
axis2_char_t *temp_str = NULL;
axis2_char_t *temp_str1 = NULL;
axis2_char_t id[256];
- AXIS2_ENV_CHECK(env, NULL);
-
om_output->next_id++;
/** free existing id */
@@ -346,7 +324,9 @@
uuid = axis2_uuid_gen(env);
if (!uuid)
+ {
return NULL;
+ }
sprintf(id, "%d", om_output->next_id);
@@ -371,16 +351,14 @@
return om_output->next_content_id;
}
-
-AXIS2_EXTERN 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)
+ const axis2_env_t *env)
{
axis2_char_t *temp_str = NULL;
axis2_char_t *uuid = NULL;
- AXIS2_ENV_CHECK(env, NULL);
-
- if (NULL == om_output->root_content_id)
+
+ if (!om_output->root_content_id)
{
uuid = axis2_uuid_gen(env);
@@ -404,15 +382,12 @@
return om_output->root_content_id;
}
-AXIS2_EXTERN 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)
+ const axis2_env_t *env)
{
axis2_char_t *uuid = NULL;
-
- AXIS2_ENV_CHECK(env, NULL);
-
- if (NULL == om_output->mime_boundary)
+ if (!om_output->mime_boundary)
{
uuid = axis2_uuid_gen(env);
@@ -430,9 +405,9 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_output_write(axiom_output_t * om_output,
- const axis2_env_t *env,
- axiom_types_t type,
- int no_of_args, ...)
+ const axis2_env_t *env,
+ axiom_types_t type,
+ int no_of_args, ...)
{
int status = AXIS2_SUCCESS;
axis2_char_t *args_list[MAX_ARGS];
@@ -455,21 +430,21 @@
{
status =
AXIOM_XML_WRITER_WRITE_END_ELEMENT(om_output->xml_writer,
- env);
+ env);
}
else if (no_of_args == 1)
{
status =
AXIOM_XML_WRITER_WRITE_START_ELEMENT(om_output->xml_writer,
- env, args_list[0]);
+ env, args_list[0]);
}
else if (no_of_args == 2)
{
- status = AXIOM_XML_WRITER_WRITE_START_ELEMENT_WITH_NAMESPACE(
- om_output->xml_writer,
- env,
- args_list[0],
- args_list[1]);
+ status =
+ AXIOM_XML_WRITER_WRITE_START_ELEMENT_WITH_NAMESPACE(
+ om_output->xml_writer,env,
+ args_list[0],
+ args_list[1]);
}
else if (no_of_args == 3)
{
@@ -485,8 +460,7 @@
else if (type == AXIOM_DATA_SOURCE)
{
status = AXIOM_XML_WRITER_WRITE_RAW(om_output->xml_writer,
- env,
- args_list[0]);
+ env, args_list[0]);
}
else if (type == AXIOM_ATTRIBUTE)
{
@@ -494,17 +468,17 @@
{
status =
AXIOM_XML_WRITER_WRITE_ATTRIBUTE(om_output->xml_writer,
- env,
- args_list[0],
- args_list[1]);
+ env,
+ args_list[0],
+ args_list[1]);
}
else if (no_of_args == 3)
{
status = AXIOM_XML_WRITER_WRITE_ATTRIBUTE_WITH_NAMESPACE(
- om_output->xml_writer, env,
- args_list[0],
- args_list[1],
- args_list[2]);
+ om_output->xml_writer, env,
+ args_list[0],
+ args_list[1],
+ args_list[2]);
}
else if (no_of_args == 4)
{
@@ -520,21 +494,21 @@
else if (type == AXIOM_NAMESPACE)
{
status = AXIOM_XML_WRITER_WRITE_NAMESPACE(om_output->xml_writer,
- env,
- args_list[0],
- args_list[1]);
+ env,
+ args_list[0],
+ args_list[1]);
}
else if (type == AXIOM_TEXT)
{
status = AXIOM_XML_WRITER_WRITE_CHARACTERS(om_output->xml_writer,
- env,
- args_list[0]);
+ env,
+ args_list[0]);
}
else if (type == AXIOM_COMMENT)
{
status = AXIOM_XML_WRITER_WRITE_COMMENT(om_output->xml_writer,
- env,
- args_list[0]);
+ env,
+ args_list[0]);
}
else if (type == AXIOM_PROCESSING_INSTRUCTION)
{
@@ -548,17 +522,17 @@
else if (no_of_args == 2)
{
status = AXIOM_XML_WRITER_WRITE_PROCESSING_INSTRUCTION_DATA(
- om_output->xml_writer,
- env,
- args_list[0],
- args_list[1]);
+ om_output->xml_writer,
+ env,
+ args_list[0],
+ args_list[1]);
}
}
else if (type == AXIOM_DOCTYPE)
{
status = AXIOM_XML_WRITER_WRITE_DTD(om_output->xml_writer,
- env,
- args_list[0]);
+ env,
+ args_list[0]);
}
if (status == AXIS2_SUCCESS)
@@ -571,22 +545,21 @@
axis2_status_t AXIS2_CALL
axiom_output_write_xml_version_encoding(axiom_output_t *om_output,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- return AXIOM_XML_WRITER_WRITE_START_DOCUMENT_WITH_VERSION_ENCODING(
- om_output->xml_writer,
- env,
- om_output->xml_version,
- om_output->char_set_encoding);
+ return AXIOM_XML_WRITER_WRITE_START_DOCUMENT_WITH_VERSION_ENCODING( om_output->xml_writer,
+ env,
+ om_output->xml_version,
+ om_output->char_set_encoding);
}
-axis2_byte_t* AXIS2_CALL
+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_env_t *env,
+ axis2_byte_t **output_stream,
+ int *output_stream_size)
{
const axis2_char_t *soap_content_type = NULL;
@@ -596,7 +569,8 @@
{
axis2_byte_t* byte_stream = NULL;
axis2_char_t *root_content_id = NULL;
- axis2_char_t *buffer = (axis2_char_t*)AXIOM_XML_WRITER_GET_XML(om_output->xml_writer, env);
+ axis2_char_t *buffer =
+ (axis2_char_t*)AXIOM_XML_WRITER_GET_XML(om_output->xml_writer, env);
int stream_size = 0;
if (om_output->is_soap11)
{
@@ -609,10 +583,11 @@
om_output->mime_output = axiom_mime_output_create(env);
om_output->mime_boundry = axiom_output_get_mime_boundry(om_output, env);
root_content_id = axiom_output_get_root_content_id(om_output, env);
- AXIOM_MIME_OUTPUT_COMPLETE(om_output->mime_output, env, &byte_stream, &stream_size,
- buffer, om_output->binary_node_list, om_output->mime_boundry,
- om_output->root_content_id, om_output->char_set_encoding,
- soap_content_type);
+ AXIOM_MIME_OUTPUT_COMPLETE(om_output->mime_output,
+ env, &byte_stream, &stream_size,
+ buffer, om_output->binary_node_list, om_output->mime_boundry,
+ om_output->root_content_id, om_output->char_set_encoding,
+ soap_content_type);
*output_stream = byte_stream;
*output_stream_size = stream_size;
@@ -621,3 +596,4 @@
}
return NULL;
}
+
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=518046&r1=518045&r2=518046
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_text.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_text.c Wed Mar 14 00:39:14 2007
@@ -190,12 +190,12 @@
}
else
{
- om_output_xml_writer = AXIOM_OUTPUT_GET_XML_WRITER(om_output, env);
+ om_output_xml_writer = axiom_output_get_xml_writer(om_output, env);
if (om_text->optimize)
{
if (!(axiom_text_get_content_id(om_text, env)))
{
- axis2_char_t *content_id = AXIOM_OUTPUT_GET_NEXT_CONTENT_ID(om_output, env);
+ axis2_char_t *content_id = axiom_output_get_next_content_id(om_output, env);
if (content_id)
{
om_text->content_id = AXIS2_STRDUP(content_id, env);
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_envelope.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_envelope.c?view=diff&rev=518046&r1=518045&r2=518046
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_envelope.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_envelope.c Wed Mar 14 00:39:14 2007
@@ -462,7 +462,7 @@
These should be set to om output before calling the serialize function
Otherwise default values will be written
*/
- AXIOM_OUTPUT_WRITE_XML_VERSION_ENCODING(om_output, env);
+ axiom_output_get_content_type(om_output, env);
return AXIOM_NODE_SERIALIZE(soap_envelope->om_ele_node, env, om_output);
}
Modified: webservices/axis2/trunk/c/axiom/test/om/test_om.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/test/om/test_om.c?view=diff&rev=518046&r1=518045&r2=518046
==============================================================================
--- webservices/axis2/trunk/c/axiom/test/om/test_om.c (original)
+++ webservices/axis2/trunk/c/axiom/test/om/test_om.c Wed Mar 14 00:39:14 2007
@@ -181,7 +181,7 @@
if (buffer)
printf("%s", buffer);
- AXIOM_OUTPUT_FREE(om_output, environment);
+ axiom_output_free(om_output, environment);
axiom_stax_builder_free(builder, environment);
/* if (buffer) */
@@ -283,7 +283,7 @@
AXIOM_NODE_FREE_TREE(node1, environment);
output_buffer = (axis2_char_t*)AXIOM_XML_WRITER_GET_XML(writer, environment);
- AXIOM_OUTPUT_FREE(om_output, environment);
+ axiom_output_free(om_output, environment);
/* if (output_buffer) */
/* { */
/* printf("%s", output_buffer); */
Modified: webservices/axis2/trunk/c/axiom/test/soap/test_soap.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/test/soap/test_soap.c?view=diff&rev=518046&r1=518045&r2=518046
==============================================================================
--- webservices/axis2/trunk/c/axiom/test/soap/test_soap.c (original)
+++ webservices/axis2/trunk/c/axiom/test/soap/test_soap.c Wed Mar 14 00:39:14 2007
@@ -249,7 +249,7 @@
AXIOM_SOAP_ENVELOPE_FREE(soap_envelope, env);
- AXIOM_OUTPUT_FREE(om_output, env);
+ axiom_output_free(om_output, env);
printf(" \n __________ END TEST SOAP BUILD ____________ \n");
@@ -330,7 +330,7 @@
buffer = NULL;
- AXIOM_OUTPUT_FREE(om_output, env);
+ axiom_output_free(om_output, env);
printf("\n __________ END BUILD SOAP PROGRAMATICALLY ____________\n");
@@ -363,7 +363,7 @@
printf("%s \n", buffer);
AXIS2_FREE(env->allocator, buffer);
AXIOM_SOAP_ENVELOPE_FREE(soap_envelope, env);
- AXIOM_OUTPUT_FREE(om_output, env);
+ axiom_output_free(om_output, env);
return 0;
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c?view=diff&rev=518046&r1=518045&r2=518046
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c Wed Mar 14 00:39:14 2007
@@ -361,7 +361,7 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- xml_writer = AXIOM_OUTPUT_GET_XML_WRITER(sender_impl->om_output, env);
+ xml_writer = axiom_output_get_xml_writer(sender_impl->om_output, env);
char_set_enc_str = axis2_msg_ctx_get_charset_encoding(msg_ctx, env);
if (!char_set_enc_str)
@@ -386,7 +386,7 @@
}
}
- AXIOM_OUTPUT_SET_DO_OPTIMIZE(sender_impl->om_output, env,
+ axiom_output_set_do_optimize(sender_impl->om_output, env,
doing_mtom);
AXIOM_SOAP_ENVELOPE_SERIALIZE(out, env, sender_impl->om_output,
AXIS2_FALSE);
@@ -399,7 +399,7 @@
if (doing_mtom)
{
- AXIOM_OUTPUT_FLUSH(sender_impl->om_output, env, &output_stream,
+ axiom_output_flush(sender_impl->om_output, env, &output_stream,
&output_stream_size);
}
else
@@ -481,7 +481,7 @@
{
if (doing_mtom)
{
- content_type = (axis2_char_t *)AXIOM_OUTPUT_GET_CONTENT_TYPE(sender_impl->om_output,
+ content_type = (axis2_char_t *)axiom_output_get_content_type(sender_impl->om_output,
env);
if (AXIS2_TRUE != axis2_msg_ctx_get_is_soap_11(msg_ctx, env))
{
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c?view=diff&rev=518046&r1=518045&r2=518046
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c Wed Mar 14 00:39:14 2007
@@ -268,7 +268,7 @@
return AXIS2_FAILURE;
}
- AXIOM_OUTPUT_SET_SOAP11(om_output, env, axis2_msg_ctx_get_is_soap_11(msg_ctx, env));
+ axiom_output_set_soap11(om_output, env, axis2_msg_ctx_get_is_soap_11(msg_ctx, env));
if (epr)
{
if (AXIS2_STRCMP(AXIS2_WSA_NONE_URL_SUBMISSION, axis2_endpoint_ref_get_address(epr, env)) == 0 ||
@@ -299,13 +299,13 @@
{
AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_OUT_TRNSPORT_INFO_NULL, AXIS2_FAILURE);
- AXIOM_OUTPUT_FREE(om_output, env);
+ axiom_output_free(om_output, env);
om_output = NULL;
xml_writer = NULL;
return AXIS2_FAILURE;
}
is_soap11 = axis2_msg_ctx_get_is_soap_11(msg_ctx, env);
- /* AXIOM_OUTPUT_SET_SOAP11(om_output, env, is_soap_11);
+ /* axiom_output_set_soap11(om_output, env, is_soap_11);
*/
AXIS2_HTTP_OUT_TRANSPORT_INFO_SET_CHAR_ENCODING(out_info, env,
char_set_enc);
@@ -321,8 +321,8 @@
}
/*
AXIS2_HTTP_OUT_TRANSPORT_INFO_SET_CONTENT_TYPE(out_info, env,
- AXIOM_OUTPUT_GET_CONTENT_TYPE(om_output, env));*/
- /* AXIOM_OUTPUT_SET_DO_OPTIMIZE(om_output, env,
+ axiom_output_get_content_type(om_output, env));*/
+ /* axiom_output_set_do_optimize(om_output, env,
* AXIS2_MSG_CTX_GET_IS_DOING_MTOM(msg_ctx, env);
*/
@@ -339,7 +339,7 @@
AXIS2_FAILURE);
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "%s",
AXIS2_ERROR_GET_MESSAGE(env->error));
- AXIOM_OUTPUT_FREE(om_output, env);
+ axiom_output_free(om_output, env);
om_output = NULL;
xml_writer = NULL;
return AXIS2_FAILURE;
@@ -347,7 +347,7 @@
body_node = AXIOM_SOAP_BODY_GET_BASE_NODE(soap_body, env);
if (NULL == body_node)
{
- AXIOM_OUTPUT_FREE(om_output, env);
+ axiom_output_free(om_output, env);
om_output = NULL;
xml_writer = NULL;
return AXIS2_FAILURE;
@@ -356,7 +356,7 @@
if (NULL == data_out || AXIOM_NODE_GET_NODE_TYPE(data_out, env)
!= AXIOM_ELEMENT)
{
- AXIOM_OUTPUT_FREE(om_output, env);
+ axiom_output_free(om_output, env);
om_output = NULL;
xml_writer = NULL;
return AXIS2_FAILURE;
@@ -367,16 +367,16 @@
}
else
{
- AXIOM_OUTPUT_SET_DO_OPTIMIZE(om_output, env,
+ axiom_output_set_do_optimize(om_output, env,
do_mtom);
AXIOM_SOAP_ENVELOPE_SERIALIZE(soap_data_out, env, om_output,
AXIS2_FALSE);
if (do_mtom)
{
axis2_char_t *content_type = NULL;
- AXIOM_OUTPUT_FLUSH(om_output, env, &output_stream,
+ axiom_output_flush(om_output, env, &output_stream,
&buffer_size);
- content_type = (axis2_char_t *)AXIOM_OUTPUT_GET_CONTENT_TYPE(
+ content_type = (axis2_char_t *)axiom_output_get_content_type(
om_output,
env);
AXIS2_HTTP_OUT_TRANSPORT_INFO_SET_CONTENT_TYPE(out_info,
@@ -398,7 +398,7 @@
}
- AXIOM_OUTPUT_FREE(om_output, env);
+ axiom_output_free(om_output, env);
om_output = NULL;
xml_writer = NULL;
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c?view=diff&rev=518046&r1=518045&r2=518046
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c Wed Mar 14 00:39:14 2007
@@ -131,7 +131,7 @@
if (!send_via_get)
{
- xml_writer = AXIOM_OUTPUT_GET_XML_WRITER(om_output, env);
+ xml_writer = axiom_output_get_xml_writer(om_output, env);
char_set_enc_str = axis2_msg_ctx_get_charset_encoding(msg_ctx, env);
@@ -148,7 +148,7 @@
{
doing_mtom = axis2_msg_ctx_get_doing_mtom(msg_ctx, env);
- AXIOM_OUTPUT_SET_DO_OPTIMIZE(om_output, env,
+ axiom_output_set_do_optimize(om_output, env,
doing_mtom);
AXIOM_SOAP_ENVELOPE_SERIALIZE(out, env, om_output,
AXIS2_FALSE);
@@ -173,9 +173,9 @@
if (doing_mtom)
{
- AXIOM_OUTPUT_FLUSH(om_output, env, &output_stream,
+ axiom_output_flush(om_output, env, &output_stream,
&output_stream_size);
- content_type = (axis2_char_t *)AXIOM_OUTPUT_GET_CONTENT_TYPE(om_output,
+ content_type = (axis2_char_t *)axiom_output_get_content_type(om_output,
env);
if (AXIS2_TRUE != axis2_msg_ctx_get_is_soap_11(msg_ctx, env))
{
Modified: webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c?view=diff&rev=518046&r1=518045&r2=518046
==============================================================================
--- webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c Wed Mar 14 00:39:14 2007
@@ -256,7 +256,7 @@
buffer = AXIOM_XML_WRITER_GET_XML(xml_writer, env);
printf("\nOM node in XML : %s \n", buffer);
AXIS2_FREE(env->allocator, buffer);
- AXIOM_OUTPUT_FREE(om_output, env);
+ axiom_output_free(om_output, env);
return add_om_node;
}
@@ -313,7 +313,7 @@
buffer = AXIOM_XML_WRITER_GET_XML(xml_writer, env);
printf("\nOM node in XML : %s \n", buffer);
AXIS2_FREE(env->allocator, buffer);
- AXIOM_OUTPUT_FREE(om_output, env);
+ axiom_output_free(om_output, env);
return add_om_node;
}
Modified: webservices/axis2/trunk/c/samples/client/dynamic_client/test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/dynamic_client/test.c?view=diff&rev=518046&r1=518045&r2=518046
==============================================================================
--- webservices/axis2/trunk/c/samples/client/dynamic_client/test.c (original)
+++ webservices/axis2/trunk/c/samples/client/dynamic_client/test.c Wed Mar 14 00:39:14 2007
@@ -98,7 +98,7 @@
buffer = AXIOM_XML_WRITER_GET_XML(xml_writer, env);
printf("\nOM node in XML : %s \n", buffer);
AXIS2_FREE(env->allocator, buffer);
- AXIOM_OUTPUT_FREE(om_output, env);
+ axiom_output_free(om_output, env);
return add_om_node;
}
Modified: webservices/axis2/trunk/c/samples/client/math/math_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/math/math_client.c?view=diff&rev=518046&r1=518045&r2=518046
==============================================================================
--- webservices/axis2/trunk/c/samples/client/math/math_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/math/math_client.c Wed Mar 14 00:39:14 2007
@@ -106,7 +106,7 @@
}
if (om_output)
{
- AXIOM_OUTPUT_FREE(om_output, env);
+ axiom_output_free(om_output, env);
om_output = NULL;
}
AXIOM_XML_WRITER_FREE(writer, env);
@@ -170,7 +170,7 @@
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "\nSending OM node in XML : %s \n", buffer);
if (om_output)
{
- AXIOM_OUTPUT_FREE(om_output, env);
+ axiom_output_free(om_output, env);
om_output = NULL;
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema.c?view=diff&rev=518046&r1=518045&r2=518046
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema.c Wed Mar 14 00:39:14 2007
@@ -1256,7 +1256,7 @@
AXIOM_NODE_SERIALIZE(sch_impl->schema_root_node, env, output);
xml_str = AXIOM_XML_WRITER_GET_XML(writer, env);
- AXIOM_OUTPUT_FREE(output, env);
+ axiom_output_free(output, env);
}
return xml_str;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org