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 da...@apache.org on 2005/11/08 07:45:51 UTC
svn commit: r331712 - in /webservices/axis2/trunk/c: include/
modules/core/description/src/ modules/core/engine/src/ modules/wsdl/src/
Author: damitha
Date: Mon Nov 7 22:45:29 2005
New Revision: 331712
URL: http://svn.apache.org/viewcvs?rev=331712&view=rev
Log:
memory leaks fixed
Modified:
webservices/axis2/trunk/c/include/axis2_wsdl_component.h
webservices/axis2/trunk/c/modules/core/description/src/operation.c
webservices/axis2/trunk/c/modules/core/description/src/param_container.c
webservices/axis2/trunk/c/modules/core/description/src/svc.c
webservices/axis2/trunk/c/modules/core/description/src/svc_grp.c
webservices/axis2/trunk/c/modules/core/engine/src/msg_recv.c
webservices/axis2/trunk/c/modules/wsdl/src/Makefile.am
webservices/axis2/trunk/c/modules/wsdl/src/Makefile.in
webservices/axis2/trunk/c/modules/wsdl/src/wsdl_component.c
Modified: webservices/axis2/trunk/c/include/axis2_wsdl_component.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_wsdl_component.h?rev=331712&r1=331711&r2=331712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_wsdl_component.h (original)
+++ webservices/axis2/trunk/c/include/axis2_wsdl_component.h Mon Nov 7 22:45:29 2005
@@ -1,10 +1,10 @@
#ifndef AXIS2_WSDL_COMPONENT_H
#define AXIS2_WSDL_COMPONENT_H
+
/**
* @file axis2_wsdl_component.h
- * @brief axis2 WSDL component
+ * @brief axis2 wsdl component interface.
*/
-
#include <axis2.h>
#include <axis2_error.h>
#include <axis2_defines.h>
@@ -18,121 +18,110 @@
{
#endif
-/** @cond */
-struct axis2_wsdl_component_ops_s;
-struct axis2_wsdl_component_s;
-/** @endcond */
typedef struct axis2_wsdl_component_ops_s axis2_wsdl_component_ops_t;
typedef struct axis2_wsdl_component_s axis2_wsdl_component_t;
-
-/** @defgroup axis2_wsdl WSDL (Axis2 wsdl)
- * @ingroup axis2
+/** @defgroup axis2_wsdl_component Wsdl Component
+ * @ingroup axis2_wsdl
* @{
*/
-/** @} */
-
-/**
- * @defgroup axis2_wsdl_component WSDL Component
- * @ingroup axis2_wsdl
- * @{
- */
-
-/**************************** Start of function macros ************************/
-
-#define AXIS2_WSDL_COMPONENT_FREE(env, wsdl_component) \
- ((wsdl_component->ops)->free (env, wsdl_component))
-
-#define AXIS2_WSDL_COMPONENT_SET_COMPONENT_PROPERTIES(env, wsdl_component \
- , properties) \
- ((wsdl_component->ops)->set_component_properties(env \
- , wsdl_component, properties))
-
-#define AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTIES(env, wsdl_component \
- , properties) \
- ((wsdl_component->ops)->get_component_properties(env \
- , wsdl_component, properties))
-
-#define AXIS2_WSDL_COMPONENT_SET_COMPONENT_PROPERTY(env, wsdl_component \
- , key, value) \
- ((wsdl_component->ops)->set_component_property(env \
- , wsdl_component, key, value))
-
-#define AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(env, wsdl_component \
- , key, value) \
- ((wsdl_component->ops)->get_component_property(env \
- , wsdl_component, key, value))
-
-/**************************** End of function macros **************************/
-/**************************** Function pointers *******************************/
-
-/** Deallocate memory
- * @return status code
- */
-typedef axis2_status_t (*axis2_wsdl_component_free_t)
- (axis2_env_t *env
- , axis2_wsdl_component_t *wsdl_component);
-
-/**
- * Returns the properties that are specific to this WSDL Component
- * @return axis2_hash_t** component properties
- */
-typedef axis2_status_t (*axis2_wsdl_component_get_component_properties_t)
- (axis2_env_t *env, axis2_wsdl_component_t *wsdl_component
- , axis2_hash_t **properties);
-
-/**
- * Sets the properties of the Component if any
- * @param axis2_hash_t* properties
- */
-typedef axis2_status_t (*axis2_wsdl_component_set_component_properties_t)
- (axis2_env_t *env, axis2_wsdl_component_t *wsdl_component
- , axis2_hash_t *properties);
-
-/**
- * Will set the property keyed with the relavent key
- * @param void* Key in the map
- * @param void* value to be put
+/**
+ * @brief Wsdl Component operations struct
+ * Encapsulator struct for operations of axis2_wsdl_component
*/
-typedef axis2_status_t (*axis2_wsdl_component_set_component_property_t)
- (axis2_env_t *env, axis2_wsdl_component_t *wsdl_component
- , const void *key, void *value);
-
-
-/**
- * Gets the component property
- *
- * @param void* key for the map search.
- * @return void* value for the key
- */
-typedef axis2_status_t (*axis2_wsdl_component_get_component_property_t)
- (axis2_env_t *env, axis2_wsdl_component_t *wsdl_component
- , const void *key, void **value) ;
-
-
-/*************************** End of function pointers *************************/
-
struct axis2_wsdl_component_ops_s
{
- axis2_wsdl_component_free_t free;
- axis2_wsdl_component_set_component_properties_t set_component_properties;
- axis2_wsdl_component_get_component_properties_t get_component_properties;
- axis2_wsdl_component_set_component_property_t set_component_property;
- axis2_wsdl_component_get_component_property_t get_component_property;
-
+ /** Deallocate memory
+ * @return status code
+ */
+ axis2_status_t (AXIS2_CALL *free) (axis2_wsdl_component_t *wsdl_component,
+ axis2_env_t **env);
+
+ /**
+ * Sets the properties of the Component if any
+ * @param axis2_hash_t properties
+ * @return status code
+ */
+ axis2_status_t (AXIS2_CALL *set_component_properties)
+ (axis2_wsdl_component_t *wsdl_component,
+ axis2_env_t **env,
+ axis2_hash_t *properties);
+
+ /**
+ * Returns the properties that are specific to this WSDL Component
+ * @return axis2_hash_t component properties
+ */
+ axis2_hash_t *properties (AXIS2_CALL *get_component_properties)
+ (axis2_wsdl_component_t *wsdl_component,
+ axis2_env_t **env);
+
+ /**
+ * Will set the property keyed with the relavent key
+ * @param void Key in the map
+ * @param void value to be put
+ * @return status code
+ */
+ axis2_status_t (AXIS2_CALL *set_component_property) (
+ axis2_wsdl_component_t *wsdl_component,
+ axis2_env_t **env,
+ const void *key,
+ void *value);
+
+ /**
+ * Gets the component property
+ * @param void key for the map search.
+ * @return void value for the key
+ */
+ void *(AXIS2_CALL *get_component_property)
+ (axis2_wsdl_component_t *wsdl_component,
+ axis2_env_t **env,
+ const void *key);
+
};
+/**
+ * @brief Wsdl Component struct
+ * Axis2 Wsdl Component
+ * Component is used to hold component properties
+ */
struct axis2_wsdl_component_s
{
axis2_wsdl_component_ops_t *ops;
};
-/** create a wsdl component
- * @return axis2_wsdl_component_t ** allocated component
+/** create Wsdl Component struct
+ * @return pointer to newly created wsdl component
*/
-axis2_status_t axis2_wsdl_component_create (axis2_env_t *env
- , axis2_wsdl_component_t **wsdl_component);
+AXIS2_DECLARE(axis2_wsdl_component_t *)
+axis2_wsdl_component_create (axis2_env_t **env);
+
+/**************************** Start of function macros ************************/
+
+#define AXIS2_WSDL_COMPONENT_FREE(wsdl_component, env) \
+ ((wsdl_component->ops)->free (wsdl_component, env))
+
+#define AXIS2_WSDL_COMPONENT_SET_COMPONENT_PROPERTIES(wsdl_component, env, \
+ properties) \
+ ((wsdl_component->ops)->set_component_properties(wsdl_component , env, \
+ properties))
+
+#define AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTIES(wsdl_component, env, \
+ properties) \
+ ((wsdl_component->ops)->get_component_properties(wsdl_component, env, \
+ properties))
+
+#define AXIS2_WSDL_COMPONENT_SET_COMPONENT_PROPERTY(wsdl_component, env, \
+ key, value) \
+ ((wsdl_component->ops)->set_component_property(env , wsdl_component, \
+ key, value))
+
+#define AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(wsdl_component, env, \
+ key, value) \
+ ((wsdl_component->ops)->get_component_property(wsdl_component, env, \
+ key, value))
+
+/**************************** End of function macros **************************/
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/modules/core/description/src/operation.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/operation.c?rev=331712&r1=331711&r2=331712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/operation.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/operation.c Mon Nov 7 22:45:29 2005
@@ -102,6 +102,14 @@
{
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
}
+
+ operation_impl->operation.ops = AXIS2_MALLOC((*env)->allocator,
+ sizeof(axis2_operation_ops_t));
+ if(NULL == operation_impl->operation.ops)
+ {
+ AXIS2_FREE((*env)->allocator, operation_impl);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ }
operation_impl->operation.ops->free = axis2_operation_free;
operation_impl->operation.ops->add_param = axis2_operation_add_param;
Modified: webservices/axis2/trunk/c/modules/core/description/src/param_container.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/param_container.c?rev=331712&r1=331711&r2=331712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/param_container.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/param_container.c Mon Nov 7 22:45:29 2005
@@ -69,17 +69,23 @@
if(NULL == param_container_impl)
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
- axis2_param_container_ops_t *ops =
+ param_container_impl->param_container.ops =
AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_param_container_ops_t));
- if(NULL == ops)
+ if(NULL == param_container_impl->param_container.ops)
+ {
+ AXIS2_FREE((*env)->allocator, param_container_impl);
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
- ops->free = axis2_param_container_free;
- ops->add_param = axis2_param_container_add_param;
- ops->get_param = axis2_param_container_get_param;
- ops->get_params = axis2_param_container_get_params;
- ops->is_param_locked = axis2_param_container_is_param_locked;
-
- param_container_impl->param_container.ops = ops;
+ }
+
+ param_container_impl->param_container.ops->free = axis2_param_container_free;
+ param_container_impl->param_container.ops->add_param =
+ axis2_param_container_add_param;
+ param_container_impl->param_container.ops->get_param =
+ axis2_param_container_get_param;
+ param_container_impl->param_container.ops->get_params =
+ axis2_param_container_get_params;
+ param_container_impl->param_container.ops->is_param_locked =
+ axis2_param_container_is_param_locked;
param_container_impl->params = axis2_hash_make (env);
if(NULL == param_container_impl->params)
Modified: webservices/axis2/trunk/c/modules/core/description/src/svc.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/svc.c?rev=331712&r1=331711&r2=331712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/svc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/svc.c Mon Nov 7 22:45:29 2005
@@ -74,7 +74,14 @@
{
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
}
-
+
+ svc_impl->svc.ops = AXIS2_MALLOC((*env)->allocator, sizeof(axis2_svc_ops_t));
+ if(NULL == svc_impl->svc.ops)
+ {
+ AXIS2_FREE((*env)->allocator, svc_impl);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ }
+
svc_impl->svc.ops->free = axis2_svc_free;
svc_impl->svc.ops->add_operation = axis2_svc_add_operation;
svc_impl->svc.ops->get_operation_with_qname =
Modified: webservices/axis2/trunk/c/modules/core/description/src/svc_grp.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/svc_grp.c?rev=331712&r1=331711&r2=331712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/svc_grp.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/svc_grp.c Mon Nov 7 22:45:29 2005
@@ -89,11 +89,21 @@
axis2_svc_grp_create (axis2_env_t **env)
{
AXIS2_ENV_CHECK(env, NULL);
+
axis2_svc_grp_impl_t *svc_grp_impl = (axis2_svc_grp_impl_t *)
AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_svc_grp_impl_t));
+
if(NULL == svc_grp_impl)
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ svc_grp_impl->svc_grp.ops = AXIS2_MALLOC((*env)->allocator,
+ sizeof(axis2_svc_grp_ops_t));
+ if(NULL == svc_grp_impl->svc_grp.ops)
+ {
+ AXIS2_FREE((*env)->allocator, svc_grp_impl);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ }
+
svc_grp_impl->svc_grp.ops->free = axis2_svc_grp_free;
svc_grp_impl->svc_grp.ops->set_name = axis2_svc_grp_set_name;
svc_grp_impl->svc_grp.ops->get_name = axis2_svc_grp_get_name;
Modified: webservices/axis2/trunk/c/modules/core/engine/src/msg_recv.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/src/msg_recv.c?rev=331712&r1=331711&r2=331712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/src/msg_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/src/msg_recv.c Mon Nov 7 22:45:29 2005
@@ -46,17 +46,16 @@
{
AXIS2_ENV_CHECK(env, NULL);
- axis2_msg_recv_ops_t *ops = NULL;
axis2_msg_recv_impl_t *msg_recv_impl =
(axis2_msg_recv_impl_t *) AXIS2_MALLOC ((*env)->allocator
, sizeof (axis2_msg_recv_impl_t));
+
if(NULL == msg_recv_impl)
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
- ops = (axis2_msg_recv_ops_t *) AXIS2_MALLOC((*env)->allocator,
- sizeof(axis2_msg_recv_ops_t));
msg_recv_impl->msg_recv.ops = (axis2_msg_recv_ops_t *) AXIS2_MALLOC(
(*env)->allocator, sizeof(axis2_msg_recv_ops_t));
+
if(NULL == msg_recv_impl->msg_recv.ops)
{
AXIS2_FREE((*env)->allocator, msg_recv_impl);
Modified: webservices/axis2/trunk/c/modules/wsdl/src/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/src/Makefile.am?rev=331712&r1=331711&r2=331712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/wsdl/src/Makefile.am Mon Nov 7 22:45:29 2005
@@ -5,4 +5,6 @@
wsdl_component.c
libaxis2_wsdl_la_LIBADD = $(LDFLAGS)
-INCLUDES = -I$(top_builddir)/include -I${CUTEST_HOME}/include
+INCLUDES = -I$(top_builddir)/include \
+ -I${CUTEST_HOME}/include \
+ -I$(top_builddir)/modules/util/src
Modified: webservices/axis2/trunk/c/modules/wsdl/src/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/src/Makefile.in?rev=331712&r1=331711&r2=331712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/src/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/wsdl/src/Makefile.in Mon Nov 7 22:45:29 2005
@@ -197,7 +197,10 @@
wsdl_component.c
libaxis2_wsdl_la_LIBADD = $(LDFLAGS)
-INCLUDES = -I$(top_builddir)/include -I${CUTEST_HOME}/include
+INCLUDES = -I$(top_builddir)/include \
+ -I${CUTEST_HOME}/include \
+ -I$(top_builddir)/modules/util/src
+
all: all-am
.SUFFIXES:
Modified: webservices/axis2/trunk/c/modules/wsdl/src/wsdl_component.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/src/wsdl_component.c?rev=331712&r1=331711&r2=331712&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/src/wsdl_component.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/src/wsdl_component.c Mon Nov 7 22:45:29 2005
@@ -1,14 +1,13 @@
#include <axis2_wsdl_component.h>
#include <string.h>
-typedef struct axis2_wsdl_impl_component_s axis2_wsdl_impl_component_t;
+typedef struct axis2_wsdl_component_impl_s axis2_wsdl_component_impl_t;
-/**
- * @struct axis2_wsdl_impl_component
- * @brief WSDL component struct
- * Component is used to hold component properties
- */
-struct axis2_wsdl_impl_component_s
+/**
+ * @brief Wsdl Component struct impl
+ * Axis2 Wsdl Component impl
+ */
+struct axis2_wsdl_component_impl_s
{
axis2_wsdl_component_t wsdl_component;
axis2_hash_t *component_properties;
@@ -16,52 +15,48 @@
/***************************** Function headers *******************************/
-axis2_status_t axis2_wsdl_component_free (axis2_env_t *env
- , axis2_wsdl_component_t *wsdl_component);
-
-/**
- * Sets the properties of the Component if any
- * @param axis2_hash_t* properties
- */
-axis2_status_t axis2_wsdl_component_set_component_properties(axis2_env_t *env
- , axis2_wsdl_component_t *wsdl_component, axis2_hash_t *properties);
-
-/**
- * Returns the properties that are specific to this WSDL Component
- * @return axis2_hash_t** component properties
- */
-axis2_status_t axis2_wsdl_component_get_component_properties(axis2_env_t *env
- ,axis2_wsdl_component_t *wsdl_component, axis2_hash_t **properties);
-
-/**
- * Will set the property keyed with the relavent key
- * @param void* Key in the map
- * @param void* value to be put
- */
-axis2_status_t axis2_wsdl_component_set_component_property(axis2_env_t *env
- , axis2_wsdl_component_t *wsdl_component, const void *key, void *value);
-
-
-/**
- * Gets the component property
- *
- * @param void* key for the map search.
- * @return void* value for the key
- */
-axis2_status_t axis2_wsdl_component_get_component_property(axis2_env_t *env
- , axis2_wsdl_component_t *wsdl_component, const void *key, void **value) ;
+axis2_status_t AXIS2_CALL
+axis2_wsdl_component_free (axis2_wsdl_component_t *wsdl_component,
+ axis2_env_t **env);
+
+axis2_status_t AXIS2_CALL
+axis2_wsdl_component_set_component_properties(
+ axis2_wsdl_component_t *wsdl_component,
+ axis2_env_t **env,
+ axis2_hash_t *properties);
+
+axis2_hash_t * AXIS2_CALL
+axis2_wsdl_component_get_component_properties(
+ axis2_wsdl_component_t *wsdl_component,
+ axis2_env_t **env);
+
+axis2_status_t AXIS2_CALL
+axis2_wsdl_component_set_component_property(
+ axis2_wsdl_component_t *wsdl_component,
+ axis2_env_t **env,
+ const void *key,
+ void *value);
+
+void * AXIS2_CALL
+axis2_wsdl_component_get_component_property(
+ axis2_wsdl_component_t *wsdl_component,
+ axis2_env_t **env,
+ const void *key);
/***************************** End of function headers ************************/
-axis2_status_t axis2_wsdl_component_create (axis2_env_t *env
- , axis2_wsdl_component_t **wsdl_component)
+axis2_wsdl_component_t * AXIS2_CALL
+axis2_wsdl_component_create (axis2_env_t **env)
{
- axis2_wsdl_impl_component_t *wsdl_impl_component
- = (axis2_wsdl_impl_component_t *)
- axis2_malloc (env->allocator, sizeof(axis2_wsdl_impl_component_t));
- if(!wsdl_impl_component)
+ AXIS2_ENV_CHECK(env, NULL);
+
+ axis2_wsdl_component_impl_t *wsdl_impl_component =
+ (axis2_wsdl_component_impl_t *) AXIS2_MALLOC (env->allocator,
+ sizeof(axis2_wsdl_component_impl_t));
+
+ if(NULL == wsdl_impl_component)
{
- return AXIS2_ERROR_NO_MEMORY;
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
}
axis2_wsdl_component_t *wsdl_component_local
@@ -94,7 +89,8 @@
/******************************************************************************/
-axis2_status_t axis2_wsdl_component_free (axis2_env_t *env
+axis2_status_t AXIS2_CALL
+axis2_wsdl_component_free (axis2_env_t *env
, axis2_wsdl_component_t *wsdl_component)
{
if(NULL != wsdl_component)
@@ -102,32 +98,26 @@
return AXIS2_SUCCESS;
}
-/**
- * Returns the properties that are specific to this WSDL Component
- * @return axis2_hash_t** component properties
- */
-axis2_status_t axis2_wsdl_component_get_component_properties(axis2_env_t *env
+axis2_status_t AXIS2_CALL
+axis2_wsdl_component_get_component_properties(axis2_env_t *env
,axis2_wsdl_component_t *wsdl_component, axis2_hash_t **properties)
{
if(NULL == wsdl_component) return AXIS2_ERROR_INVALID_NULL_PARAM;
- axis2_wsdl_impl_component_t *wsdl_impl_component
- = (axis2_wsdl_impl_component_t*)(wsdl_component);
+ axis2_wsdl_component_impl_t *wsdl_impl_component
+ = (axis2_wsdl_component_impl_t*)(wsdl_component);
*properties = wsdl_impl_component->component_properties;
return AXIS2_SUCCESS;
}
-/**
- * Sets the properties of the Component if any
- * @param axis2_hash_t* properties
- */
-axis2_status_t axis2_wsdl_component_set_component_properties(axis2_env_t *env
+axis2_status_t AXIS2_CALL
+axis2_wsdl_component_set_component_properties(axis2_env_t *env
, axis2_wsdl_component_t *wsdl_component, axis2_hash_t *properties)
{
if(NULL == wsdl_component || NULL == properties)
return AXIS2_ERROR_INVALID_NULL_PARAM;
- axis2_wsdl_impl_component_t *wsdl_impl_component
- = (axis2_wsdl_impl_component_t *) wsdl_component;
+ axis2_wsdl_component_impl_t *wsdl_impl_component
+ = (axis2_wsdl_component_impl_t *) wsdl_component;
wsdl_impl_component->component_properties = axis2_malloc(env->allocator
, sizeof(axis2_wsdl_component_t));
memcpy(wsdl_impl_component->component_properties, properties
@@ -135,38 +125,29 @@
return AXIS2_SUCCESS;
}
-/**
- * Will set the property keyed with the relavent key
- * @param void* Key in the map
- * @param void* value to be put
- */
-axis2_status_t axis2_wsdl_component_set_component_property(axis2_env_t *env
+axis2_status_t AXIS2_CALL
+axis2_wsdl_component_set_component_property(axis2_env_t *env
, axis2_wsdl_component_t *wsdl_component, const void *key, void *value)
{
if(NULL ==wsdl_component || NULL == key || NULL == value)
return AXIS2_ERROR_INVALID_NULL_PARAM;
- axis2_wsdl_impl_component_t *wsdl_impl_component
- = (axis2_wsdl_impl_component_t *) wsdl_component;
+ axis2_wsdl_component_impl_t *wsdl_impl_component
+ = (axis2_wsdl_component_impl_t *) wsdl_component;
axis2_hash_set (wsdl_impl_component->component_properties
, key
, sizeof(key), value);
return AXIS2_SUCCESS;
}
-/**
- * Gets the component property
- *
- * @param void* key for the map search.
- * @return void* value for the key
- */
-axis2_status_t axis2_wsdl_component_get_component_property(axis2_env_t *env
- , axis2_wsdl_component_t *wsdl_component,const void *key, void **value)
+void * AXIS2_CALL
+axis2_wsdl_component_get_component_property(axis2_env_t *env
+ , axis2_wsdl_component_t *wsdl_component,const void *key)
{
if(NULL == wsdl_component || NULL == key)
return AXIS2_ERROR_INVALID_NULL_PARAM;
- axis2_wsdl_impl_component_t *wsdl_impl_component
- = (axis2_wsdl_impl_component_t *) wsdl_component;
+ axis2_wsdl_component_impl_t *wsdl_impl_component
+ = (axis2_wsdl_component_impl_t *) wsdl_component;
*value = (void *)(axis2_hash_get (wsdl_impl_component->component_properties
, key, sizeof(key)));