Skip to content

Commit

Permalink
Changed return type of free methods to void
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.apache.org/repos/asf/webservices/axis2/trunk/c@522746 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
Don Samisa Abeysinghe committed Mar 27, 2007
1 parent 1c5e94d commit 4c80cd2
Show file tree
Hide file tree
Showing 121 changed files with 267 additions and 357 deletions.
4 changes: 2 additions & 2 deletions axiom/include/axiom_attribute.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ extern "C"
* cast into appropriate type and then pass the cast object
* into the om_attribute structure's free method
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
AXIS2_EXTERN void AXIS2_CALL
axiom_attribute_free_void_arg(
void *om_attribute,
const axis2_env_t *env);
Expand All @@ -73,7 +73,7 @@ extern "C"
* else AXIS2_FAILURE
*/

AXIS2_EXTERN axis2_status_t AXIS2_CALL
AXIS2_EXTERN void AXIS2_CALL
axiom_attribute_free(struct axiom_attribute *om_attribute,
const axis2_env_t *env);

Expand Down
2 changes: 0 additions & 2 deletions axiom/include/axiom_child_element_iterator.h
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,6 @@ extern "C"
axiom_child_element_iterator_create(const axis2_env_t *env,
axiom_node_t *current_child);

/************ Macros *********************************************/

#define AXIOM_CHILD_ELEMENT_ITERATOR_FREE(iterator, env) \
(((axiom_child_element_iterator_t *) iterator)->ops->free_fn(iterator, env))

Expand Down
2 changes: 1 addition & 1 deletion axiom/include/axiom_children_iterator.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ extern "C"
/**
* Free the om_children_iterator struct
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
AXIS2_EXTERN void AXIS2_CALL
axiom_children_iterator_free(axiom_children_iterator_t *iterator,
const axis2_env_t *env);

Expand Down
2 changes: 1 addition & 1 deletion axiom/include/axiom_children_qname_iterator.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ extern "C"
/**
* free om_children_qname_iterator struct
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
AXIS2_EXTERN void AXIS2_CALL
axiom_children_qname_iterator_free(axiom_children_qname_iterator_t *iterator,
const axis2_env_t *env);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,6 @@ extern "C"
axis2_char_t *attr_value,
axis2_bool_t detach);

/************ Macros *********************************************/

#define AXIOM_CHILDREN_WITH_SPECIFIC_ATTRIBUTE_ITERATOR_FREE(iterator, env) \
((iterator)->ops->free_fn(iterator, env))

Expand Down
2 changes: 1 addition & 1 deletion axiom/include/axiom_comment.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ extern "C"
* @return satus of the op.
* AXIS2_SUCCESS on success ,AXIS2_FAILURE on error.
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
AXIS2_EXTERN void AXIS2_CALL
axiom_comment_free(struct axiom_comment *om_comment,
const axis2_env_t *env);
/** get the comments data
Expand Down
3 changes: 0 additions & 3 deletions axiom/include/axiom_data_handler.h
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,6 @@ extern "C"
const axis2_char_t *file_name,
const axis2_char_t *mime_type);


/*************************** Function macros **********************************/

#define AXIOM_DATA_HANDLER_FREE(data_handler, env) \
((data_handler)->ops->free (data_handler, env))

Expand Down
2 changes: 1 addition & 1 deletion axiom/include/axiom_data_source.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ extern "C"
* @return satus of the op. AXIS2_SUCCESS on success
* AXIS2_FAILURE on error.
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
AXIS2_EXTERN void AXIS2_CALL
axiom_data_source_free(struct axiom_data_source *om_data_source,
const axis2_env_t *env);

Expand Down
2 changes: 1 addition & 1 deletion axiom/include/axiom_doctype.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ extern "C"
* @return satus of the op. AXIS2_SUCCESS on success
* AXIS2_FAILURE on error.
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
AXIS2_EXTERN void AXIS2_CALL
axiom_doctype_free(struct axiom_doctype *om_doctype,
const axis2_env_t *env);
/**
Expand Down
2 changes: 1 addition & 1 deletion axiom/include/axiom_document.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ extern "C"
* @param env Environment. MUST NOT be NULL
* @return satus of the op. AXIS2_SUCCESS on success else AXIS2_FAILURE.
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
AXIS2_EXTERN void AXIS2_CALL
axiom_document_free(struct axiom_document *document,
const axis2_env_t *env);

Expand Down
2 changes: 1 addition & 1 deletion axiom/include/axiom_element.h
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ extern "C"
* @param env Environment. MUST NOT be NULL.
* @return satus of the op. AXIS2_SUCCESS on success ,AXIS2_FAILURE on error.
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
AXIS2_EXTERN void AXIS2_CALL
axiom_element_free(axiom_element_t *element,
const axis2_env_t *env);

Expand Down
2 changes: 0 additions & 2 deletions axiom/include/axiom_mime_parser.h
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,6 @@ extern "C"
AXIS2_EXTERN axiom_mime_parser_t * AXIS2_CALL
axiom_mime_parser_create(const axis2_env_t *env);

/*************************** Function macros **********************************/

#define AXIOM_MIME_PARSER_FREE(mime_parser, env) \
((mime_parser)->ops->free (mime_parser, env))

Expand Down
2 changes: 1 addition & 1 deletion axiom/include/axiom_namespace.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ extern "C"
* @param env Environment. MUST NOT be NULL.
* @return satus of the op. AXIS2_SUCCESS on success else AXIS2_FAILURE.
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
AXIS2_EXTERN void AXIS2_CALL
axiom_namespace_free(struct axiom_namespace *om_namespace,
const axis2_env_t *env);

Expand Down
19 changes: 1 addition & 18 deletions axiom/include/axiom_navigator.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ extern "C"
* @param env environment MUST not be NULL
* @returns AXIS2_SUCCESS
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
AXIS2_EXTERN void AXIS2_CALL
axiom_navigator_free(axiom_navigator_t *om_navigator,
const axis2_env_t *env);

Expand Down Expand Up @@ -105,23 +105,6 @@ extern "C"
axiom_navigator_visited(axiom_navigator_t *om_navigator,
const axis2_env_t *env);

/** Macros ********************************************************************/

/*#define AXIOM_NAVIGATOR_FREE(navigator, env) \
axiom_navigator_free(navigator, env)*/

/*#define AXIOM_NAVIGATOR_IS_NAVIGABLE(navigator, env) \
axiom_navigator_is_navigable(navigator, env)*/

/*#define AXIOM_NAVIGATOR_IS_COMPLETED(navigator, env) \
axiom_navigator_is_completed(navigator, env)*/

/*#define AXIOM_NAVIGATOR_VISITED(navigator, env) \
axiom_navigator_visited(navigator, env)*/

/*#define AXIOM_NAVIGATOR_NEXT(navigator, env) \
axiom_navigator_next(navigator, env)*/

/** @} */

#ifdef __cplusplus
Expand Down
18 changes: 1 addition & 17 deletions axiom/include/axiom_node.h
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ extern "C"
* @param env Environment. MUST NOT be NULL, .
* @return satus of the op. AXIS2_SUCCESS on success else AXIS2_FAILURE
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
AXIS2_EXTERN void AXIS2_CALL
axiom_node_free(axiom_node_t *om_node,
const axis2_env_t *env);
/**
Expand Down Expand Up @@ -270,52 +270,36 @@ extern "C"
const axis2_env_t *env);


/** frees given node */
#define AXIOM_NODE_FREE_TREE(om_node,env) \
axiom_node_free(om_node,env)
/** adds given child to the given parent */
#define AXIOM_NODE_ADD_CHILD(om_node, env, child) \
axiom_node_add_child(om_node, env, child)
/** detaches the given node from its parent */
#define AXIOM_NODE_DETACH(om_node,env) \
axiom_node_detach(om_node,env)
/** inserts a sibling after the given node */
#define AXIOM_NODE_INSERT_SIBLING_AFTER(om_node,env,node_to_insert) \
axiom_node_insert_sibling_after(om_node,env,node_to_insert)
/** inserts a sibling before the given node */
#define AXIOM_NODE_INSERT_SIBLING_BEFORE(om_node,env,node_to_insert) \
axiom_node_insert_sibling_before(om_node,env,node_to_insert)
/** serialize an om_node and all its children */
#define AXIOM_NODE_SERIALIZE(om_node,env, om_output) \
axiom_node_serialize(om_node,env,om_output)
/** returns parent of this om_node */
#define AXIOM_NODE_GET_PARENT(om_node,env) \
axiom_node_get_parent(om_node,env)
/** get firet child of this om_node */
#define AXIOM_NODE_GET_FIRST_CHILD(om_node,env) \
axiom_node_get_first_child(om_node,env)
/**get last child */
#define AXIOM_NODE_GET_LAST_CHILD(om_node,env) \
axiom_node_get_last_child(om_node,env)
/** get next sibling */
#define AXIOM_NODE_GET_NEXT_SIBLING(om_node,env) \
axiom_node_get_next_sibling(om_node,env)
/** get previous sibling */
#define AXIOM_NODE_GET_PREVIOUS_SIBLING(om_node,env) \
axiom_node_get_previous_sibling(om_node,env)
/** get firet element of this om_node */
#define AXIOM_NODE_GET_FIRST_ELEMENT(om_node,env) \
axiom_node_get_first_element(om_node,env)
/** get build status */
#define AXIOM_NODE_IS_COMPLETE(om_node,env) \
axiom_node_is_complete(om_node,env)
/** get data element of this node can be om_element om_text etc */
#define AXIOM_NODE_GET_DATA_ELEMENT(om_node,env) \
axiom_node_get_data_element(om_node,env)
/** node type one of om_node_types */
#define AXIOM_NODE_GET_NODE_TYPE(om_node,env) \
axiom_node_get_node_type(om_node,env)
/** get document */
#define AXIOM_NODE_GET_DOCUMENT(om_node, env) \
axiom_node_get_document(om_node, env)

Expand Down
2 changes: 1 addition & 1 deletion axiom/include/axiom_output.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ extern "C"
* @return status code AXIS2_SUCCESS on success,
* AXIS2_FAILURE otherwise
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
AXIS2_EXTERN void AXIS2_CALL
axiom_output_free(axiom_output_t *om_output,
const axis2_env_t *env);

Expand Down
2 changes: 1 addition & 1 deletion axiom/include/axiom_processing_instruction.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ extern "C"
* @param env Environment. MUST NOT be NULL, .
* @return satus of the op. AXIS2_SUCCESS on success else AXIS2_FAILURE
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
AXIS2_EXTERN void AXIS2_CALL
axiom_processing_instruction_free(struct axiom_processing_instruction * om_pi,
const axis2_env_t *env);

Expand Down
2 changes: 1 addition & 1 deletion axiom/include/axiom_soap_body.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ extern "C"
* @param env must not be null
* @return status code AXIS2_SUCCESS
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
AXIS2_EXTERN void AXIS2_CALL
axiom_soap_body_free(axiom_soap_body_t *body,
const axis2_env_t *env);

Expand Down
2 changes: 1 addition & 1 deletion axiom/include/axiom_soap_builder.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ extern "C"
axiom_stax_builder_t *builder,
const axis2_char_t *soap_version);

AXIS2_EXTERN axis2_status_t AXIS2_CALL
AXIS2_EXTERN void AXIS2_CALL
axiom_soap_builder_free(axiom_soap_builder_t *builder,
const axis2_env_t *env);

Expand Down
4 changes: 2 additions & 2 deletions axiom/include/axiom_soap_envelope.h
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,12 @@ extern "C"
* Free function, This function deallocate all the resources associated
* with the soap_envelope
* IT frees it's soap body and soap headers as well as the underlying
* om node tree by calling AXIOM_NODE_FREE_TREE function
* om node tree by calling axiom_node_free_tree function
* @param envelope soap_envelope
* @param env environment
* @return status code AXIS2_SUCCESS on success , AXIS2_FAILURE otherwise
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
AXIS2_EXTERN void AXIS2_CALL
axiom_soap_envelope_free(axiom_soap_envelope_t *envelope,
const axis2_env_t *env);

Expand Down
2 changes: 1 addition & 1 deletion axiom/include/axiom_soap_fault.h
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ extern "C"
* else AXIS2_FAILURE
*/

AXIS2_EXTERN axis2_status_t AXIS2_CALL
AXIS2_EXTERN void AXIS2_CALL
axiom_soap_fault_free(axiom_soap_fault_t *fault,
const axis2_env_t *env);
/**
Expand Down
2 changes: 1 addition & 1 deletion axiom/include/axiom_soap_fault_code.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ extern "C"
* @return satus of the op. AXIS2_SUCCESS on success
* else AXIS2_FAILURE
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
AXIS2_EXTERN void AXIS2_CALL
axiom_soap_fault_code_free(axiom_soap_fault_code_t *fault_code,
const axis2_env_t *env);
/**
Expand Down
2 changes: 1 addition & 1 deletion axiom/include/axiom_soap_fault_detail.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ extern "C"
* else AXIS2_FAILURE
*/

AXIS2_EXTERN axis2_status_t AXIS2_CALL
AXIS2_EXTERN void AXIS2_CALL
axiom_soap_fault_detail_free(axiom_soap_fault_detail_t *fault_detail,
const axis2_env_t *env);

Expand Down
2 changes: 1 addition & 1 deletion axiom/include/axiom_soap_fault_node.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ extern "C"
* else AXIS2_FAILURE
*/

AXIS2_EXTERN axis2_status_t AXIS2_CALL
AXIS2_EXTERN void AXIS2_CALL
axiom_soap_fault_node_free(axiom_soap_fault_node_t *fault_node,
const axis2_env_t *env);

Expand Down
2 changes: 1 addition & 1 deletion axiom/include/axiom_soap_fault_reason.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ extern "C"
* else AXIS2_FAILURE
*/

AXIS2_EXTERN axis2_status_t AXIS2_CALL
AXIS2_EXTERN void AXIS2_CALL
axiom_soap_fault_reason_free(axiom_soap_fault_reason_t *fault_reason,
const axis2_env_t *env);

Expand Down
2 changes: 1 addition & 1 deletion axiom/include/axiom_soap_fault_role.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ extern "C"
* else AXIS2_FAILURE
*/

AXIS2_EXTERN axis2_status_t AXIS2_CALL
AXIS2_EXTERN void AXIS2_CALL
axiom_soap_fault_role_free(axiom_soap_fault_role_t *fault_role,
const axis2_env_t *env);

Expand Down
2 changes: 1 addition & 1 deletion axiom/include/axiom_soap_fault_sub_code.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ extern "C"
* @return satus of the op. AXIS2_SUCCESS on success
* else AXIS2_FAILURE
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
AXIS2_EXTERN void AXIS2_CALL
axiom_soap_fault_sub_code_free(axiom_soap_fault_sub_code_t *fault_sub_code,
const axis2_env_t *env);

Expand Down
2 changes: 1 addition & 1 deletion axiom/include/axiom_soap_fault_text.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ extern "C"
* else AXIS2_FAILURE
*/

AXIS2_EXTERN axis2_status_t AXIS2_CALL
AXIS2_EXTERN void AXIS2_CALL
axiom_soap_fault_text_free(axiom_soap_fault_text_t *fault_text,
const axis2_env_t *env);

Expand Down
2 changes: 1 addition & 1 deletion axiom/include/axiom_soap_fault_value.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ extern "C"
* else AXIS2_FAILURE
*/

AXIS2_EXTERN axis2_status_t AXIS2_CALL
AXIS2_EXTERN void AXIS2_CALL
axiom_soap_fault_value_free(axiom_soap_fault_value_t *fault_value,
const axis2_env_t *env);

Expand Down
2 changes: 1 addition & 1 deletion axiom/include/axiom_soap_header.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ extern "C"
* @return satus of the op. AXIS2_SUCCESS on success
* else AXIS2_FAILURE
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
AXIS2_EXTERN void AXIS2_CALL
axiom_soap_header_free(axiom_soap_header_t *header,
const axis2_env_t *env);

Expand Down
2 changes: 1 addition & 1 deletion axiom/include/axiom_soap_header_block.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ extern "C"
* @return satus of the op. AXIS2_SUCCESS on success
* else AXIS2_FAILURE
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
AXIS2_EXTERN void AXIS2_CALL
axiom_soap_header_block_free(axiom_soap_header_block_t *header_block,
const axis2_env_t *env);

Expand Down
6 changes: 3 additions & 3 deletions axiom/include/axiom_soap_message.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ extern "C"
* @return satus of the op. AXIS2_SUCCESS on success
* else AXIS2_FAILURE
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
AXIS2_EXTERN void AXIS2_CALL
axiom_soap_message_free(axiom_soap_message_t *message,
const axis2_env_t *env);

Expand All @@ -69,14 +69,14 @@ extern "C"
const axis2_env_t *env,
axiom_output_t *om_output);

#define AXIOM_SOAP_MESSAGE_FREE(message , env) \
/*#define AXIOM_SOAP_MESSAGE_FREE(message , env) \
((message)->ops->free(message, env)
#define AXIOM_SOAP_MESSAGE_GET_SOAP_ENVELOPE(message, env) \
((message)->ops->get_envelope(message, env)
#define AXIOM_SOAP_MESSAGE_SERIALIZE(message, env, om_output) \
((message)->ops->serialize(message, env, om_output)
((message)->ops->serialize(message, env, om_output) */
/** @} */

#ifdef __cplusplus
Expand Down
Loading

0 comments on commit 4c80cd2

Please sign in to comment.