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/10/27 10:45:15 UTC
svn commit: r328827 - in /webservices/axis2/trunk/c: include/
modules/xml/om/src/
Author: samisa
Date: Thu Oct 27 01:44:17 2005
New Revision: 328827
URL: http://svn.apache.org/viewcvs?rev=328827&view=rev
Log:
applied calling convention
Modified:
webservices/axis2/trunk/c/include/axis2_om_attribute.h
webservices/axis2/trunk/c/include/axis2_om_comment.h
webservices/axis2/trunk/c/include/axis2_om_doctype.h
webservices/axis2/trunk/c/include/axis2_om_document.h
webservices/axis2/trunk/c/include/axis2_om_element.h
webservices/axis2/trunk/c/include/axis2_om_namespace.h
webservices/axis2/trunk/c/include/axis2_om_node.h
webservices/axis2/trunk/c/include/axis2_om_output.h
webservices/axis2/trunk/c/include/axis2_om_processing_instruction.h
webservices/axis2/trunk/c/include/axis2_om_stax_builder.h
webservices/axis2/trunk/c/include/axis2_om_text.h
webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_attribute.c
webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_comment.c
webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_doctype.c
webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_document.c
webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_element.c
webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_namespace.c
webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_node.c
webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_output.c
webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_processing_instruction.c
webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_stax_builder.c
webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_text.c
Modified: webservices/axis2/trunk/c/include/axis2_om_attribute.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_attribute.h?rev=328827&r1=328826&r2=328827&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_attribute.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_attribute.h Thu Oct 27 01:44:17 2005
@@ -44,7 +44,7 @@
* \brief OM attribute operations struct
* Encapsulator struct for axis2_om_attribute
*/
- typedef struct axis2_om_attribute_ops
+ AXIS2_DECLARE_DATA typedef struct axis2_om_attribute_ops
{
/**
* Free an axis2_om_attribute struct
@@ -53,7 +53,7 @@
* @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE
*/
- AXIS2_DECLARE_DATA axis2_status_t (AXIS2_CALL *axis2_om_attribute_ops_free) (axis2_environment_t *
+ axis2_status_t (AXIS2_CALL *axis2_om_attribute_ops_free) (axis2_environment_t *
environment,
struct
axis2_om_attribute *
@@ -66,7 +66,7 @@
* @return returns qname for given attribute. NULL on error
*/
- AXIS2_DECLARE_DATA axis2_qname_t
+ axis2_qname_t
*(AXIS2_CALL *axis2_om_attribute_ops_get_qname) (axis2_environment_t *
environment,
struct axis2_om_attribute *
@@ -80,7 +80,7 @@
* @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE
*/
- AXIS2_DECLARE_DATA int (AXIS2_CALL *axis2_om_attribute_ops_serialize) (axis2_environment_t *
+ int (AXIS2_CALL *axis2_om_attribute_ops_serialize) (axis2_environment_t *
environment,
struct axis2_om_attribute *
om_attribute,
Modified: webservices/axis2/trunk/c/include/axis2_om_comment.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_comment.h?rev=328827&r1=328826&r2=328827&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_comment.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_comment.h Thu Oct 27 01:44:17 2005
@@ -43,7 +43,7 @@
* @brief OM comment operations struct
* Encapsulator struct for operations of axis2_om_comment_t
*/
- typedef struct axis2_om_comment_ops
+ AXIS2_DECLARE_DATA typedef struct axis2_om_comment_ops
{
/**
* Free a axis2_comment struct
@@ -51,7 +51,7 @@
* @param comment pointer to axis2_commnet struct to be freed
* @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE.
*/
- AXIS2_DECLARE_DATA axis2_status_t (AXIS2_CALL *axis2_om_comment_ops_free) (axis2_environment_t *
+ axis2_status_t (AXIS2_CALL *axis2_om_comment_ops_free) (axis2_environment_t *
environment,
struct axis2_om_comment *
comment);
Modified: webservices/axis2/trunk/c/include/axis2_om_doctype.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_doctype.h?rev=328827&r1=328826&r2=328827&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_doctype.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_doctype.h Thu Oct 27 01:44:17 2005
@@ -42,7 +42,7 @@
* \brief OM doctype operations struct
* Encapsulator struct for operations of axis2_om_doctype
*/
- typedef struct axis2_om_doctype_ops
+ AXIS2_DECLARE_DATA typedef struct axis2_om_doctype_ops
{
/**
* free doctype struct
@@ -50,7 +50,7 @@
* @param om_doctype pointer to doctype struct to be freed
* @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE
*/
- AXIS2_DECLARE_DATA axis2_status_t (AXIS2_CALL *axis2_om_doctype_ops_free) (axis2_environment_t *
+ axis2_status_t (AXIS2_CALL *axis2_om_doctype_ops_free) (axis2_environment_t *
environment,
struct axis2_om_doctype *
om_doctype);
Modified: webservices/axis2/trunk/c/include/axis2_om_document.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_document.h?rev=328827&r1=328826&r2=328827&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_document.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_document.h Thu Oct 27 01:44:17 2005
@@ -49,7 +49,7 @@
* @brief OM document operations struct
* Encapsulator struct for operations of axis2_om_document_t
*/
- typedef struct axis2_om_document_ops
+ AXIS2_DECLARE_DATA typedef struct axis2_om_document_ops
{
/**
@@ -58,7 +58,7 @@
* @param document pointer to document struct to be freed
* @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE.
*/
- AXIS2_DECLARE_DATA axis2_status_t (AXIS2_CALL *axis2_om_document_ops_free) (axis2_environment_t *
+ axis2_status_t (AXIS2_CALL *axis2_om_document_ops_free) (axis2_environment_t *
environment,
struct axis2_om_document
* document);
@@ -69,7 +69,7 @@
* @param document document whose next node is to be built. Mandatory, cannot be NULL
* @return pointer to the next node. NULL on error.
*/
- AXIS2_DECLARE_DATA axis2_om_node_t
+ axis2_om_node_t
*(AXIS2_CALL *axis2_om_document_ops_build_next) (axis2_environment_t *
environment,
struct axis2_om_document *
@@ -82,7 +82,7 @@
* @param child child node to be added. Mandatory, cannot be NULL.
* @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE.
*/
- AXIS2_DECLARE_DATA axis2_status_t (AXIS2_CALL *axis2_om_document_ops_add_child)
+ axis2_status_t (AXIS2_CALL *axis2_om_document_ops_add_child)
(axis2_environment_t * environment,
struct axis2_om_document * document, axis2_om_node_t * child);
@@ -93,7 +93,7 @@
* @return returns a pointer to the root node. If no root present, this method tries to
* build the root. Returns NULL on error.
*/
- AXIS2_DECLARE_DATA axis2_om_node_t
+ axis2_om_node_t
* (AXIS2_CALL *axis2_om_document_ops_get_root_element) (axis2_environment_t *
environment,
struct
@@ -108,7 +108,7 @@
* till the next sibling is found. Returns NULL if no sibling is present.
* On error, returns NULL and set the error.
*/
- AXIS2_DECLARE_DATA axis2_om_node_t
+ axis2_om_node_t
* (AXIS2_CALL *axis2_om_document_ops_get_next_sibling) (axis2_environment_t *
environment,
struct
@@ -124,7 +124,7 @@
* till the first child is found. Returns NULL if no child is present.
* On error, returns NULL and sets the error.
*/
- AXIS2_DECLARE_DATA axis2_om_node_t
+ axis2_om_node_t
* (AXIS2_CALL *axis2_om_document_ops_get_first_child) (axis2_environment_t *
environment,
struct
@@ -140,7 +140,7 @@
* till the next child is found. Returns NULL if no child is present.
* On error, returns NULL and sets the error.
*/
- AXIS2_DECLARE_DATA axis2_om_node_t
+ axis2_om_node_t
* (AXIS2_CALL *axis2_om_document_ops_get_next_child) (axis2_environment_t *
environment,
struct
Modified: webservices/axis2/trunk/c/include/axis2_om_element.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_element.h?rev=328827&r1=328826&r2=328827&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_element.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_element.h Thu Oct 27 01:44:17 2005
@@ -42,7 +42,7 @@
* @brief OM element operations struct
* Encapsulator struct for operations of axis2_om_element
*/
- typedef struct axis2_om_element_ops
+AXIS2_DECLARE_DATA typedef struct axis2_om_element_ops
{
/*
* Find a namespace in the scope of the document.
@@ -54,7 +54,7 @@
* @return pointer to the namespace, if found, else NULL. On error, returns
* NULL and sets the errorno in environment.
*/
- AXIS2_DECLARE_DATA axis2_om_namespace_t *
+ axis2_om_namespace_t *
(AXIS2_CALL *axis2_om_element_ops_find_namespace) (axis2_environment_t *
environment,
axis2_om_node_t * node,
@@ -69,7 +69,7 @@
* @param ns pointer to the namespace struct to be declared
* @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE.
*/
- AXIS2_DECLARE_DATA axis2_status_t (AXIS2_CALL *axis2_om_element_ops_declare_namespace)
+ axis2_status_t (AXIS2_CALL *axis2_om_element_ops_declare_namespace)
(axis2_environment_t * environment, axis2_om_node_t *node,
axis2_om_namespace_t * ns);
@@ -96,7 +96,7 @@
* @return pointer to the namespace, if found, else NULL. On error, returns
* NULL and sets the errorno in environment.
*/
- AXIS2_DECLARE_DATA axis2_om_namespace_t *
+ axis2_om_namespace_t *
(AXIS2_CALL *axis2_om_element_ops_find_namespace_with_qname)
(axis2_environment_t *environment, axis2_om_node_t *node,
axis2_qname_t *qname);
@@ -108,7 +108,7 @@
* @param attribute attribute to be added.
* @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE.
*/
- AXIS2_DECLARE_DATA axis2_status_t (AXIS2_CALL *axis2_om_element_ops_add_attribute)
+ axis2_status_t (AXIS2_CALL *axis2_om_element_ops_add_attribute)
(axis2_environment_t * environment,
struct axis2_om_element * element,
axis2_om_attribute_t * attribute);
@@ -121,7 +121,7 @@
* @return a pointer to the attribute with given qname if found, else NULL.
* On error, returns NULL and sets the error.
*/
- AXIS2_DECLARE_DATA axis2_om_attribute_t *
+ axis2_om_attribute_t *
(AXIS2_CALL *axis2_om_element_ops_get_attribute) (axis2_environment_t *
environment,
struct axis2_om_element *
@@ -134,7 +134,7 @@
* @param element OM element to be freed.
* @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE.
*/
- AXIS2_DECLARE_DATA axis2_status_t (AXIS2_CALL *axis2_om_element_ops_free) (axis2_environment_t *
+ axis2_status_t (AXIS2_CALL *axis2_om_element_ops_free) (axis2_environment_t *
environment,
struct axis2_om_element
* element);
@@ -146,7 +146,7 @@
* @param om_output OM output handler to be used in serializing
* @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE
*/
- AXIS2_DECLARE_DATA axis2_status_t (AXIS2_CALL *axis2_om_element_ops_serialize_start_part)
+ axis2_status_t (AXIS2_CALL *axis2_om_element_ops_serialize_start_part)
(axis2_environment_t * environment,
struct axis2_om_element * element,
axis2_om_output_t * om_output);
@@ -159,7 +159,7 @@
* @param om_output OM output handler to be used in serializing
* @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE
*/
- AXIS2_DECLARE_DATA axis2_status_t (AXIS2_CALL *axis2_om_element_ops_serialize_end_part)
+ axis2_status_t (AXIS2_CALL *axis2_om_element_ops_serialize_end_part)
(axis2_environment_t * environment,
struct axis2_om_element * element,
axis2_om_output_t * om_output);
Modified: webservices/axis2/trunk/c/include/axis2_om_namespace.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_namespace.h?rev=328827&r1=328826&r2=328827&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_namespace.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_namespace.h Thu Oct 27 01:44:17 2005
@@ -44,7 +44,7 @@
* \brief OM Namespace operations struct
* Encapsulator struct for operations of axis2_om_namespace
*/
- typedef struct axis2_om_namespace_ops
+ AXIS2_DECLARE_DATA typedef struct axis2_om_namespace_ops
{
/**
* Frees given OM namespcae
@@ -52,7 +52,7 @@
* @param om_namespace namespace to be freed.
* @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE.
*/
- AXIS2_DECLARE_DATA axis2_status_t (AXIS2_CALL *axis2_om_namespace_ops_free) (axis2_environment_t *
+ axis2_status_t (AXIS2_CALL *axis2_om_namespace_ops_free) (axis2_environment_t *
environment,
struct
axis2_om_namespace *
@@ -65,7 +65,7 @@
* @param om_namespace2 second namespace to be compared
* @return true if the two namespaces are equal, false otherwise
*/
- AXIS2_DECLARE_DATA axis2_bool_t (AXIS2_CALL *axis2_om_namespace_ops_equals) (axis2_environment_t *
+ axis2_bool_t (AXIS2_CALL *axis2_om_namespace_ops_equals) (axis2_environment_t *
environment,
struct
axis2_om_namespace *
@@ -81,7 +81,7 @@
* @param om_output OM output handler to be used in serializing
* @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE.
*/
- AXIS2_DECLARE_DATA axis2_status_t (AXIS2_CALL *axis2_om_namespace_ops_serialize)
+ axis2_status_t (AXIS2_CALL *axis2_om_namespace_ops_serialize)
(axis2_environment_t * environment,
struct axis2_om_namespace * om_namespace,
axis2_om_output_t * om_output);
Modified: webservices/axis2/trunk/c/include/axis2_om_node.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_node.h?rev=328827&r1=328826&r2=328827&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_node.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_node.h Thu Oct 27 01:44:17 2005
@@ -74,7 +74,7 @@
* @brief OM Node operations struct
* Encapsulator struct for operations of axis2_om_node
*/
- typedef struct axis2_om_node_ops
+ AXIS2_DECLARE_DATA typedef struct axis2_om_node_ops
{
/**
* Frees an om node and all of its children
@@ -82,7 +82,7 @@
* @param om_node node to be freed.
* @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE
*/
- AXIS2_DECLARE_DATA axis2_status_t (AXIS2_CALL *axis2_om_node_ops_free) (axis2_environment_t *
+ axis2_status_t (AXIS2_CALL *axis2_om_node_ops_free) (axis2_environment_t *
environment,
struct axis2_om_node *
om_node);
@@ -93,7 +93,7 @@
* @param child child node. Mandatory, cannot be NULL.
* @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE
*/
- AXIS2_DECLARE_DATA axis2_status_t (AXIS2_CALL *axis2_om_node_ops_add_child) (axis2_environment_t *
+ axis2_status_t (AXIS2_CALL *axis2_om_node_ops_add_child) (axis2_environment_t *
environment,
struct axis2_om_node *
parent,
@@ -106,7 +106,7 @@
* @param om_node node to be detached. Mandatory, cannot be NULL.
* @return a pointer to detached node, NULL on error.
*/
- AXIS2_DECLARE_DATA struct axis2_om_node *(AXIS2_CALL *axis2_om_node_ops_detach) (axis2_environment_t
+ struct axis2_om_node *(AXIS2_CALL *axis2_om_node_ops_detach) (axis2_environment_t
* environment,
struct
axis2_om_node *
@@ -119,7 +119,7 @@
* @param node_to_insert the node to be inserted. Mandatory, cannot be NULL.
* @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE
*/
- AXIS2_DECLARE_DATA axis2_status_t (AXIS2_CALL *axis2_om_node_ops_insert_sibling_after)
+ axis2_status_t (AXIS2_CALL *axis2_om_node_ops_insert_sibling_after)
(axis2_environment_t * environment,
struct axis2_om_node * current_node,
struct axis2_om_node * node_to_insert);
@@ -131,7 +131,7 @@
* @param node_to_insert the node to be inserted. Mandatory, cannot be NULL.
* @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE
*/
- AXIS2_DECLARE_DATA axis2_status_t (AXIS2_CALL *axis2_om_node_ops_insert_sibling_before)
+ axis2_status_t (AXIS2_CALL *axis2_om_node_ops_insert_sibling_before)
(axis2_environment_t * environment,
struct axis2_om_node * current_node,
struct axis2_om_node * node_to_insert);
@@ -143,7 +143,7 @@
* @param parent the node that will be set as parent. Mandatory, cannot be NULL.
* @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE
*/
- AXIS2_DECLARE_DATA axis2_status_t (AXIS2_CALL *axis2_om_node_ops_set_parent) (axis2_environment_t
+ axis2_status_t (AXIS2_CALL *axis2_om_node_ops_set_parent) (axis2_environment_t
* environment,
struct axis2_om_node
* child_node,
@@ -157,7 +157,7 @@
* @return a pointer to first child if there is one, else returns NULL.
* On error sets the error and returns NULL
*/
- AXIS2_DECLARE_DATA struct axis2_om_node
+ struct axis2_om_node
*(AXIS2_CALL *axis2_om_node_ops_get_first_child) (axis2_environment_t *
environment,
struct axis2_om_node *
@@ -171,7 +171,7 @@
* @return a pointer to next child if there is one, else returns NULL.
* On error sets the error and returns NULL
*/
- AXIS2_DECLARE_DATA struct axis2_om_node
+ struct axis2_om_node
*(AXIS2_CALL *axis2_om_node_ops_get_next_child) (axis2_environment_t *
environment,
struct axis2_om_node *
@@ -185,7 +185,7 @@
* @param om_output OM output handler to be used in serializing
* @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE
*/
- AXIS2_DECLARE_DATA axis2_status_t (AXIS2_CALL *axis2_om_node_ops_serialize) (axis2_environment_t *
+ axis2_status_t (AXIS2_CALL *axis2_om_node_ops_serialize) (axis2_environment_t *
environment,
struct axis2_om_node
* om_node,
Modified: webservices/axis2/trunk/c/include/axis2_om_output.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_output.h?rev=328827&r1=328826&r2=328827&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_output.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_output.h Thu Oct 27 01:44:17 2005
@@ -70,7 +70,7 @@
* @return a pointer to newly created output struct.
*/
- axis2_om_output_t *axis2_om_output_create (axis2_environment_t *
+ AXIS2_DECLARE(axis2_om_output_t*) axis2_om_output_create (axis2_environment_t *
environment, void *xml_writer, void* writer_env);
/**
@@ -83,7 +83,7 @@
* @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE
*/
- axis2_status_t axis2_om_output_write (axis2_environment_t * environment,
+ AXIS2_DECLARE(axis2_status_t) axis2_om_output_write (axis2_environment_t * environment,
axis2_om_output_t * om_output,
axis2_om_types_t type,
int no_of_args, ...);
Modified: webservices/axis2/trunk/c/include/axis2_om_processing_instruction.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_processing_instruction.h?rev=328827&r1=328826&r2=328827&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_processing_instruction.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_processing_instruction.h Thu Oct 27 01:44:17 2005
@@ -44,7 +44,7 @@
* @brief OM text operations struct
* Encapsulator struct for operations of axis2_om_processing_instruction
*/
- typedef struct axis2_om_processing_instruction_ops
+ AXIS2_DECLARE_DATA typedef struct axis2_om_processing_instruction_ops
{
/**
* Frees an instance of axis2_om_processing_instruction
@@ -52,7 +52,7 @@
* @param om_pi processing instruction to be freed.
* @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE
*/
- AXIS2_DECLARE_DATA axis2_status_t (AXIS2_CALL *axis2_om_processing_instruction_ops_free)
+ axis2_status_t (AXIS2_CALL *axis2_om_processing_instruction_ops_free)
(axis2_environment_t * environment,
struct axis2_om_processing_instruction * om_pi);
} axis2_om_processing_instruction_ops_t;
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=328827&r1=328826&r2=328827&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_stax_builder.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_stax_builder.h Thu Oct 27 01:44:17 2005
@@ -45,7 +45,7 @@
* @brief OM stax builder operations struct
* Encapsulator struct for operations of axis2_om_stax_builder
*/
- typedef struct axis2_om_stax_builder_ops
+ AXIS2_DECLARE_DATA typedef struct axis2_om_stax_builder_ops
{
/**
* Builds the next node from stream. Moves pull parser forward and reacts to events.
@@ -54,7 +54,7 @@
* @return a pointer to the next node, or NULL if there are no more nodes.
* On erros sets the error and returns NULL.
*/
- AXIS2_DECLARE_DATA axis2_om_node_t *
+ axis2_om_node_t *
(AXIS2_CALL *axis2_om_stax_builder_ops_next) (axis2_environment_t *
environment,
struct axis2_om_stax_builder *
@@ -66,12 +66,12 @@
* @param builder pointer to stax builder struct to be used
* @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE.
*/
- AXIS2_DECLARE_DATA axis2_status_t (AXIS2_CALL *axis2_om_stax_builder_ops_discard_current_element)
+ axis2_status_t (AXIS2_CALL *axis2_om_stax_builder_ops_discard_current_element)
(axis2_environment_t * environment,
struct axis2_om_stax_builder * builder);
- AXIS2_DECLARE_DATA axis2_status_t (AXIS2_CALL *axis2_om_stax_builder_ops_free)(axis2_environment_t *envioronment,struct axis2_om_stax_builder *builder);
+ axis2_status_t (AXIS2_CALL *axis2_om_stax_builder_ops_free)(axis2_environment_t *envioronment,struct axis2_om_stax_builder *builder);
} axis2_om_stax_builder_ops_t;
Modified: webservices/axis2/trunk/c/include/axis2_om_text.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_text.h?rev=328827&r1=328826&r2=328827&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_text.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_text.h Thu Oct 27 01:44:17 2005
@@ -44,7 +44,7 @@
* @brief OM text operations struct
* Encapsulator struct for operations of axis2_om_text
*/
- typedef struct axis2_om_text_ops
+ AXIS2_DECLARE_DATA typedef struct axis2_om_text_ops
{
/**
* Free an axis2_om_text struct
@@ -52,7 +52,7 @@
* @param om_text pointer to om text struct to be freed
* @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE
*/
- AXIS2_DECLARE_DATA axis2_status_t (AXIS2_CALL *axis2_om_text_ops_free) (axis2_environment_t *
+ axis2_status_t (AXIS2_CALL *axis2_om_text_ops_free) (axis2_environment_t *
environment,
struct axis2_om_text *
om_text);
@@ -64,7 +64,7 @@
* @param om_output OM output handler to be used in serializing
* @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE
*/
- AXIS2_DECLARE_DATA axis2_status_t (AXIS2_CALL *axis2_om_text_ops_serialize) (axis2_environment_t *
+ axis2_status_t (AXIS2_CALL *axis2_om_text_ops_serialize) (axis2_environment_t *
environment,
const struct
axis2_om_text *
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_attribute.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_attribute.c?rev=328827&r1=328826&r2=328827&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_attribute.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_attribute.c Thu Oct 27 01:44:17 2005
@@ -36,8 +36,8 @@
om_output);
-axis2_om_attribute_t *
-AXIS2_CALL axis2_om_attribute_create (axis2_environment_t * environment,
+AXIS2_DECLARE(axis2_om_attribute_t*)
+ axis2_om_attribute_create (axis2_environment_t * environment,
const axis2_char_t * localname,
const axis2_char_t * value,
axis2_om_namespace_t * ns)
@@ -97,7 +97,7 @@
return attribute;
}
-axis2_status_t
+axis2_status_t AXIS2_CALL
axis2_om_attribute_impl_free (axis2_environment_t * environment,
axis2_om_attribute_t * attribute)
{
@@ -117,7 +117,7 @@
return AXIS2_FAILURE;
}
-axis2_qname_t *
+axis2_qname_t* AXIS2_CALL
axis2_om_attribute_impl_get_qname (axis2_environment_t * environment,
axis2_om_attribute_t * attribute)
{
@@ -140,7 +140,7 @@
}
-axis2_status_t
+axis2_status_t AXIS2_CALL
axis2_om_attribute_impl_serialize (axis2_environment_t * environment,
axis2_om_attribute_t * attribute,
axis2_om_output_t * om_output)
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_comment.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_comment.c?rev=328827&r1=328826&r2=328827&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_comment.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_comment.c Thu Oct 27 01:44:17 2005
@@ -20,13 +20,13 @@
axis2_status_t AXIS2_CALL axis2_om_comment_impl_free (axis2_environment_t * environment,
axis2_om_comment_t * comment);
-axis2_om_comment_t *
-AXIS2_CALL axis2_om_comment_create (axis2_environment_t * environment,
+AXIS2_DECLARE(axis2_om_comment_t*)
+ axis2_om_comment_create (axis2_environment_t * environment,
const axis2_char_t * value, axis2_om_node_t ** node)
{
- *node = NULL;
axis2_om_comment_t *comment = NULL;
-
+ *node = NULL;
+
if (!node)
{
environment->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
@@ -88,7 +88,7 @@
}
-axis2_status_t
+axis2_status_t AXIS2_CALL
axis2_om_comment_impl_free (axis2_environment_t * environment,
axis2_om_comment_t * comment)
{
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_doctype.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_doctype.c?rev=328827&r1=328826&r2=328827&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_doctype.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_doctype.c Thu Oct 27 01:44:17 2005
@@ -19,8 +19,8 @@
axis2_status_t AXIS2_CALL axis2_om_doctype_impl_free (axis2_environment_t * environment,
axis2_om_doctype_t * doctype);
-axis2_om_doctype_t *
-AXIS2_CALL axis2_om_doctype_create (axis2_environment_t * environment,
+AXIS2_DECLARE(axis2_om_doctype_t *)
+ axis2_om_doctype_create (axis2_environment_t * environment,
axis2_om_node_t * parent, const axis2_char_t * value,
axis2_om_node_t ** node)
{
@@ -93,7 +93,7 @@
}
-axis2_status_t
+axis2_status_t AXIS2_CALL
axis2_om_doctype_impl_free (axis2_environment_t * environment,
axis2_om_doctype_t * doctype)
{
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_document.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_document.c?rev=328827&r1=328826&r2=328827&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_document.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_document.c Thu Oct 27 01:44:17 2005
@@ -46,8 +46,8 @@
axis2_om_document_t *
document);
-axis2_om_document_t *
-AXIS2_CALL axis2_om_document_create (axis2_environment_t * environment,
+AXIS2_DECLARE(axis2_om_document_t *)
+axis2_om_document_create (axis2_environment_t * environment,
axis2_om_node_t * root,
axis2_om_stax_builder_t * builder)
{
@@ -129,7 +129,7 @@
}
-axis2_status_t
+axis2_status_t AXIS2_CALL
axis2_om_document_impl_free (axis2_environment_t * environment,
axis2_om_document_t * document)
{
@@ -150,7 +150,7 @@
}
-axis2_status_t
+axis2_status_t AXIS2_CALL
axis2_om_document_impl_add_child (axis2_environment_t * environment,
axis2_om_document_t * document,
axis2_om_node_t * child)
@@ -178,7 +178,7 @@
}
-axis2_om_node_t *
+axis2_om_node_t* AXIS2_CALL
axis2_om_document_impl_build_next (axis2_environment_t * environment,
axis2_om_document_t * document)
{
@@ -199,7 +199,7 @@
}
-axis2_om_node_t *
+axis2_om_node_t * AXIS2_CALL
axis2_om_document_impl_get_root_element (axis2_environment_t * environment,
axis2_om_document_t * document)
{
@@ -225,7 +225,7 @@
}
}
-axis2_om_node_t *
+axis2_om_node_t * AXIS2_CALL
axis2_om_document_impl_get_next_sibling (axis2_environment_t * environment,
axis2_om_document_t * document)
{
@@ -245,7 +245,7 @@
return NULL;
}
-axis2_om_node_t *
+axis2_om_node_t* AXIS2_CALL
axis2_om_document_impl_get_first_child (axis2_environment_t * environment,
axis2_om_document_t * document)
{
@@ -272,7 +272,7 @@
return NULL;
}
-axis2_om_node_t *
+axis2_om_node_t* AXIS2_CALL
axis2_om_document_impl_get_next_child (axis2_environment_t * environment,
axis2_om_document_t * document)
{
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_element.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_element.c?rev=328827&r1=328826&r2=328827&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_element.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_element.c Thu Oct 27 01:44:17 2005
@@ -72,7 +72,7 @@
axis2_om_output_t * om_output);
-axis2_om_element_t *AXIS2_CALL
+AXIS2_DECLARE(axis2_om_element_t *)
axis2_om_element_create (axis2_environment_t * environment,
axis2_om_node_t * parent,
const axis2_char_t * localname,
@@ -178,7 +178,7 @@
}
-axis2_om_element_t *AXIS2_CALL
+AXIS2_DECLARE(axis2_om_element_t *)
axis2_om_element_create_with_qname (axis2_environment_t * environment,
axis2_om_node_t * parent,
axis2_qname_t * qname,
@@ -217,7 +217,7 @@
return element;
}
-axis2_om_namespace_t *
+axis2_om_namespace_t * AXIS2_CALL
axis2_om_element_impl_find_namespace (axis2_environment_t * environment,
axis2_om_node_t * node,
const axis2_char_t * uri,
@@ -275,7 +275,7 @@
return NULL;
}
-axis2_status_t
+axis2_status_t AXIS2_CALL
axis2_om_element_impl_declare_namespace (axis2_environment_t * environment,
axis2_om_node_t * node,
axis2_om_namespace_t * ns)
@@ -362,7 +362,7 @@
}
*/
-axis2_om_namespace_t *
+axis2_om_namespace_t * AXIS2_CALL
axis2_om_element_impl_find_namespace_with_qname (axis2_environment_t *
environment,
axis2_om_node_t * element,
@@ -386,7 +386,7 @@
}
}
-axis2_status_t
+axis2_status_t AXIS2_CALL
axis2_om_element_impl_add_attribute (axis2_environment_t * environment,
struct axis2_om_element * element,
axis2_om_attribute_t * attribute)
@@ -414,7 +414,7 @@
return ((qname) ? AXIS2_SUCCESS : AXIS2_FAILURE);
}
-axis2_om_attribute_t *
+axis2_om_attribute_t * AXIS2_CALL
axis2_om_element_impl_get_attribute (axis2_environment_t * environment,
struct axis2_om_element * element,
axis2_qname_t * qname)
@@ -430,7 +430,7 @@
sizeof (axis2_qname_t)));
}
-axis2_status_t
+axis2_status_t AXIS2_CALL
axis2_om_element_impl_free (axis2_environment_t * environment,
struct axis2_om_element *element)
{
@@ -487,7 +487,7 @@
return status;
}
-axis2_status_t
+axis2_status_t AXIS2_CALL
axis2_om_element_impl_serialize_start_part (axis2_environment_t * environment,
axis2_om_element_t * element,
axis2_om_output_t * om_output)
@@ -561,7 +561,7 @@
return status;
}
-axis2_status_t
+axis2_status_t AXIS2_CALL
axis2_om_element_impl_serialize_end_part (axis2_environment_t * environment,
axis2_om_element_t * element,
axis2_om_output_t * om_output)
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_namespace.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_namespace.c?rev=328827&r1=328826&r2=328827&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_namespace.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_namespace.c Thu Oct 27 01:44:17 2005
@@ -33,8 +33,8 @@
axis2_om_output_t *
om_output);
-axis2_om_namespace_t *
-AXIS2_CALL axis2_om_namespace_create (axis2_environment_t * environment,
+AXIS2_DECLARE(axis2_om_namespace_t *)
+ axis2_om_namespace_create (axis2_environment_t * environment,
const axis2_char_t * uri,
const axis2_char_t * prefix)
{
@@ -104,7 +104,7 @@
-axis2_status_t
+axis2_status_t AXIS2_CALL
axis2_om_namespace_impl_free (axis2_environment_t * environment,
struct axis2_om_namespace * om_namespace)
{
@@ -133,7 +133,7 @@
return AXIS2_SUCCESS;
}
-axis2_bool_t
+axis2_bool_t AXIS2_CALL
axis2_om_namespace_impl_equals (axis2_environment_t * environment,
axis2_om_namespace_t * ns1,
axis2_om_namespace_t * ns2)
@@ -158,7 +158,7 @@
return (!uris_differ && !prefixes_differ);
}
-axis2_status_t
+axis2_status_t AXIS2_CALL
axis2_om_namespace_impl_serialize (axis2_environment_t * environment,
axis2_om_namespace_t * om_namespace,
axis2_om_output_t * om_output)
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_node.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_node.c?rev=328827&r1=328826&r2=328827&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_node.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_node.c Thu Oct 27 01:44:17 2005
@@ -56,8 +56,8 @@
axis2_om_output_t * om_output);
-axis2_om_node_t *
-AXIS2_CALL axis2_om_node_create (axis2_environment_t * environment)
+AXIS2_DECLARE(axis2_om_node_t *)
+axis2_om_node_create (axis2_environment_t * environment)
{
axis2_om_node_t *node =
(axis2_om_node_t *) axis2_malloc (environment->allocator,
@@ -107,7 +107,7 @@
* This free fucntion will free an om_element and all the children contained in it
* before calling this function first free
*/
-axis2_status_t
+axis2_status_t AXIS2_CALL
axis2_om_node_impl_free (axis2_environment_t * environment,
axis2_om_node_t * node)
{
@@ -154,7 +154,7 @@
return AXIS2_SUCCESS;
}
-axis2_status_t
+axis2_status_t AXIS2_CALL
axis2_om_node_impl_add_child (axis2_environment_t * environment,
axis2_om_node_t * parent,
axis2_om_node_t * child)
@@ -181,7 +181,7 @@
-axis2_om_node_t *
+axis2_om_node_t * AXIS2_CALL
axis2_om_node_impl_detach (axis2_environment_t * environment,
axis2_om_node_t * node_to_detach)
{
@@ -215,7 +215,7 @@
return node_to_detach;
}
-axis2_status_t
+axis2_status_t AXIS2_CALL
axis2_om_node_impl_set_parent (axis2_environment_t * environment,
axis2_om_node_t * node,
axis2_om_node_t * parent)
@@ -248,7 +248,7 @@
* @param nodeto_insert the node that will be inserted
*/
-axis2_status_t
+axis2_status_t AXIS2_CALL
axis2_om_node_impl_insert_sibling_after (axis2_environment_t * environment,
axis2_om_node_t * node,
axis2_om_node_t * node_to_insert)
@@ -271,7 +271,7 @@
}
-axis2_status_t
+axis2_status_t AXIS2_CALL
axis2_om_node_impl_insert_sibling_before (axis2_environment_t * environment,
axis2_om_node_t * node,
axis2_om_node_t * node_to_insert)
@@ -299,7 +299,7 @@
return AXIS2_SUCCESS;
}
-axis2_om_node_t *
+axis2_om_node_t* AXIS2_CALL
axis2_om_node_impl_get_first_child (axis2_environment_t * environment,
axis2_om_node_t * parent_node)
{
@@ -318,7 +318,7 @@
return NULL;
}
-axis2_om_node_t *
+axis2_om_node_t* AXIS2_CALL
axis2_om_node_impl_get_next_child (axis2_environment_t * environment,
axis2_om_node_t * parent_node)
{
@@ -344,7 +344,7 @@
return NULL;
}
-axis2_status_t
+axis2_status_t AXIS2_CALL
axis2_om_node_impl_serialize (axis2_environment_t * environment,
axis2_om_node_t * om_node,
axis2_om_output_t * om_output)
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_output.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_output.c?rev=328827&r1=328826&r2=328827&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_output.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_output.c Thu Oct 27 01:44:17 2005
@@ -19,12 +19,13 @@
#include <guththila_xml_stream_writer.h>
#define DEFAULT_CHAR_SET_ENCODING "utf-8"
+#define MAX_ARGS 4
guththila_environment_t *om_output_guththila_environment = NULL;
guththila_allocator_t *om_output_guththila_allocator = NULL;
-axis2_om_output_t *
-AXIS2_CALL axis2_om_output_create (axis2_environment_t * environment, void *xml_writer, void* writer_env)
+AXIS2_DECLARE(axis2_om_output_t *)
+axis2_om_output_create (axis2_environment_t * environment, void *xml_writer, void* writer_env)
{
axis2_om_output_t *om_output =
(axis2_om_output_t *) axis2_malloc (environment->allocator,
@@ -70,7 +71,7 @@
int no_of_args, ...)
{
int status = AXIS2_SUCCESS;
- axis2_char_t *args_list[no_of_args];
+ axis2_char_t *args_list[MAX_ARGS];
int i = 0;
va_list ap;
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_processing_instruction.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_processing_instruction.c?rev=328827&r1=328826&r2=328827&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_processing_instruction.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_processing_instruction.c Thu Oct 27 01:44:17 2005
@@ -120,7 +120,7 @@
return processing_instruction;
}
-axis2_status_t
+axis2_status_t AXIS2_CALL
axis2_om_processing_instruction_impl_free (axis2_environment_t * environment,
axis2_om_processing_instruction_t *
processing_instruction)
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=328827&r1=328826&r2=328827&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 Thu Oct 27 01:44:17 2005
@@ -65,9 +65,10 @@
else
{
/* create the default Guththila pull parser */
+ guththila_reader_t *reader = NULL;
om_stax_builder_guththila_allocator = guththila_allocator_init(NULL);
om_stax_builder_guththila_environment = guththila_environment_create(om_stax_builder_guththila_allocator, NULL, NULL, NULL, NULL);
- guththila_reader_t *reader = guththila_reader_create (om_stax_builder_guththila_environment, stdin);
+ reader = guththila_reader_create (om_stax_builder_guththila_environment, stdin);
if (!reader)
{
@@ -234,7 +235,7 @@
}
-axis2_status_t
+axis2_status_t AXIS2_CALL
axis2_om_stax_builder_impl_discard_current_element (axis2_environment_t *
environment,
axis2_om_stax_builder_t *
@@ -405,7 +406,7 @@
}
-axis2_om_node_t *
+axis2_om_node_t *
axis2_om_stax_builder_create_om_doctype (axis2_environment_t * environment,
axis2_om_stax_builder_t * builder)
{
@@ -413,8 +414,8 @@
return NULL;
}
-
-axis2_om_node_t *
+
+axis2_om_node_t *
axis2_om_stax_builder_create_om_processing_instruction (axis2_environment_t *
environment,
axis2_om_stax_builder_t
@@ -424,7 +425,7 @@
return NULL;
}
-axis2_status_t
+axis2_status_t AXIS2_CALL
axis2_om_stax_builder_end_element (axis2_environment_t * environment,
axis2_om_stax_builder_t * builder)
{
@@ -450,7 +451,7 @@
}
-axis2_om_node_t *
+axis2_om_node_t * AXIS2_CALL
axis2_om_stax_builder_impl_next (axis2_environment_t * environment,
axis2_om_stax_builder_t * builder)
{
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_text.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_text.c?rev=328827&r1=328826&r2=328827&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_text.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_text.c Thu Oct 27 01:44:17 2005
@@ -25,7 +25,7 @@
const axis2_om_text_t * om_text,
axis2_om_output_t * om_output);
-axis2_om_text_t *
+AXIS2_DECLARE(axis2_om_text_t*)
axis2_om_text_create (axis2_environment_t * environment,
axis2_om_node_t * parent, const axis2_char_t * value,
axis2_om_node_t ** node)
@@ -99,7 +99,7 @@
}
-axis2_status_t
+axis2_status_t AXIS2_CALL
axis2_om_text_impl_free (axis2_environment_t * environment,
axis2_om_text_t * om_text)
{
@@ -121,7 +121,7 @@
return AXIS2_SUCCESS;
}
-axis2_status_t
+axis2_status_t AXIS2_CALL
axis2_om_text_impl_serialize (axis2_environment_t * environment,
const axis2_om_text_t * om_text,
axis2_om_output_t * om_output)