You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by da...@apache.org on 2005/11/08 10:18:54 UTC
svn commit: r331750 - in /webservices/axis2/trunk/c:
include/axis2_wsdl_component.h modules/wsdl/src/wsdl_component.c
Author: damitha
Date: Tue Nov 8 01:18:40 2005
New Revision: 331750
URL: http://svn.apache.org/viewcvs?rev=331750&view=rev
Log:
wsdl_component is now compiling
Modified:
webservices/axis2/trunk/c/include/axis2_wsdl_component.h
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=331750&r1=331749&r2=331750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_wsdl_component.h (original)
+++ webservices/axis2/trunk/c/include/axis2_wsdl_component.h Tue Nov 8 01:18:40 2005
@@ -52,7 +52,7 @@
* 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_hash_t *(AXIS2_CALL *get_component_properties)
(axis2_wsdl_component_t *wsdl_component,
axis2_env_t **env);
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=331750&r1=331749&r2=331750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/src/wsdl_component.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/src/wsdl_component.c Tue Nov 8 01:18:40 2005
@@ -13,6 +13,8 @@
axis2_hash_t *component_properties;
};
+#define AXIS2_INTF_TO_IMPL(wsdl_component) \
+ ((axis2_wsdl_component_impl_t *)(wsdl_component))
/***************************** Function headers *******************************/
axis2_status_t AXIS2_CALL
@@ -51,7 +53,7 @@
AXIS2_ENV_CHECK(env, NULL);
axis2_wsdl_component_impl_t *wsdl_impl_component =
- (axis2_wsdl_component_impl_t *) AXIS2_MALLOC (env->allocator,
+ (axis2_wsdl_component_impl_t *) AXIS2_MALLOC ((*env)->allocator,
sizeof(axis2_wsdl_component_impl_t));
if(NULL == wsdl_impl_component)
@@ -60,7 +62,7 @@
}
wsdl_impl_component->wsdl_component.ops = (axis2_wsdl_component_ops_t *)
- AXIS2_MALLOC (env->allocator, sizeof(axis2_wsdl_component_ops_t));
+ AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_wsdl_component_ops_t));
if(NULL == wsdl_impl_component->wsdl_component.ops)
{
AXIS2_FREE ((*env)->allocator, wsdl_impl_component);
@@ -99,17 +101,10 @@
axis2_env_t **env,
axis2_hash_t *properties)
{
- if(NULL == wsdl_component || NULL == properties)
- return AXIS2_ERROR_INVALID_NULL_PARAM;
-
AXIS2_FUNC_PARAM_CHECK(wsdl_component, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, properties, AXIS2_FAILURE);
- AXIS2_INTF_TO_IMPL(wsdl_component)->component_properties =
- AXIS2_MALLOC((*env)->allocator, sizeof(axis2_wsdl_component_t));
-
- memcpy(wsdl_impl_component->component_properties, properties
- , sizeof(properties));
+ AXIS2_INTF_TO_IMPL(wsdl_component)->component_properties = properties;
return AXIS2_SUCCESS;
}
@@ -118,11 +113,8 @@
axis2_wsdl_component_t *wsdl_component,
axis2_env_t **env)
{
- if(NULL == wsdl_component) return AXIS2_ERROR_INVALID_NULL_PARAM;
- axis2_wsdl_component_impl_t *wsdl_impl_component
- = (axis2_wsdl_component_impl_t*)(wsdl_component);
- *properties = wsdl_impl_component->component_properties;
- return AXIS2_SUCCESS;
+ AXIS2_FUNC_PARAM_CHECK(wsdl_component, env, NULL);
+ return AXIS2_INTF_TO_IMPL(wsdl_component)->component_properties;
}
axis2_status_t AXIS2_CALL
@@ -132,13 +124,13 @@
const void *key,
void *value)
{
- if(NULL ==wsdl_component || NULL == key || NULL == value)
- return AXIS2_ERROR_INVALID_NULL_PARAM;
- 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);
+ AXIS2_FUNC_PARAM_CHECK(wsdl_component, env, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK((*env)->error, key, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK((*env)->error, value, AXIS2_FAILURE);
+
+ axis2_hash_set (AXIS2_INTF_TO_IMPL(wsdl_component)->component_properties,
+ key, sizeof(key), value);
+
return AXIS2_SUCCESS;
}
@@ -148,14 +140,9 @@
axis2_env_t **env,
const void *key)
{
- if(NULL == wsdl_component || NULL == key)
- return AXIS2_ERROR_INVALID_NULL_PARAM;
-
- 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)));
+ AXIS2_FUNC_PARAM_CHECK(wsdl_component, env, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK((*env)->error, key, AXIS2_FAILURE);
- return AXIS2_SUCCESS;
+ return (void *)(axis2_hash_get (AXIS2_INTF_TO_IMPL(wsdl_component)->
+ component_properties, key, sizeof(key)));
}