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 2006/06/01 07:18:49 UTC
svn commit: r410750 [4/11] - in /webservices/axis2/trunk/c:
woden/include/woden/wsdl20/ woden/include/woden/wsdl20/enumeration/
woden/include/woden/wsdl20/extensions/ woden/include/woden/wsdl20/xml/
woden/include/woden/xml/ woden/src/wsdl20/ woden/src/...
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/property.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/property.c?rev=410750&r1=410749&r2=410750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/property.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/property.c Wed May 31 22:18:45 2006
@@ -53,123 +53,123 @@
axis2_status_t AXIS2_CALL
axis2_woden_property_free(
void *property,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_hash_t *AXIS2_CALL
axis2_woden_property_super_objs(
void *property,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_woden_obj_types_t AXIS2_CALL
axis2_woden_property_type(
void *property,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_woden_documentable_t *AXIS2_CALL
axis2_woden_property_get_base_impl(
void *property,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_woden_property_set_ref(
void *property,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_url_t *ref);
axis2_url_t *AXIS2_CALL
axis2_woden_property_get_ref(
void *property,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_woden_property_set_parent_element(
void *property,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_woden_wsdl_element_t *parent);
void *AXIS2_CALL
axis2_woden_property_get_parent_element(
void *property,
- axis2_env_t **env);
+ const axis2_env_t *env);
void *AXIS2_CALL
axis2_woden_property_get_parent(
void *property,
- axis2_env_t **env);
+ const axis2_env_t *env);
void *AXIS2_CALL
axis2_woden_property_to_element(
void *property,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_woden_property_set_value(
void *property,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *value);
void *AXIS2_CALL
axis2_woden_property_get_value(
void *property,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_woden_property_set_value_constraint(
void *property,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *type_def);
void *AXIS2_CALL
axis2_woden_property_get_value_constraint(
void *property,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_woden_property_set_constraint_qname(
void *property,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *type_def);
axis2_qname_t *AXIS2_CALL
axis2_woden_property_get_constraint_qname(
void *property,
- axis2_env_t **env);
+ const axis2_env_t *env);
void *AXIS2_CALL
axis2_woden_property_get_constraint(
void *property,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_woden_property_set_types(
void *property,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *types);
axis2_status_t AXIS2_CALL
axis2_woden_property_set_has_value_token(
void *property,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_bool_t b);
axis2_bool_t AXIS2_CALL
axis2_woden_property_has_value_token(
void *property,
- axis2_env_t **env);
+ const axis2_env_t *env);
static axis2_woden_property_t *
-create(axis2_env_t **env);
+create(const axis2_env_t *env);
static axis2_status_t
axis2_woden_property_free_ops(
void *property,
- axis2_env_t **env);
+ const axis2_env_t *env);
/************************Woden C Internal Methods******************************/
AXIS2_DECLARE(axis2_woden_property_t *)
axis2_woden_property_to_property_element(
void *property,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_property_impl_t *property_impl = NULL;
@@ -184,7 +184,7 @@
axis2_woden_property_free_ops(property, env);
property_impl->property.base.property_element.ops =
- AXIS2_MALLOC((*env)->allocator,
+ AXIS2_MALLOC(env->allocator,
sizeof(axis2_woden_property_element_ops_t));
axis2_woden_property_element_resolve_methods(&(property_impl->property.base.
property_element), env, property_impl->methods);
@@ -194,7 +194,7 @@
AXIS2_DECLARE(axis2_woden_property_t *)
axis2_woden_property_to_nested_element(
void *property,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_property_impl_t *property_impl = NULL;
@@ -208,7 +208,7 @@
axis2_woden_property_free_ops(property, env);
property_impl->property.base.property_element.base.nested_element.ops =
- AXIS2_MALLOC((*env)->allocator,
+ AXIS2_MALLOC(env->allocator,
sizeof(axis2_woden_nested_element_ops_t));
axis2_woden_nested_element_resolve_methods(&(property_impl->property.base.
property_element.base.nested_element), env, property_impl->methods);
@@ -218,7 +218,7 @@
AXIS2_DECLARE(axis2_woden_property_t *)
axis2_woden_property_to_documentable_element(
void *property,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_property_impl_t *property_impl = NULL;
@@ -232,7 +232,7 @@
axis2_woden_property_free_ops(property, env);
property_impl->property.base.property_element.base.documentable_element.ops =
- AXIS2_MALLOC((*env)->allocator,
+ AXIS2_MALLOC(env->allocator,
sizeof(axis2_woden_documentable_element_ops_t));
axis2_woden_documentable_element_resolve_methods(&(property_impl->property.base.
property_element.base.documentable_element), env,
@@ -243,7 +243,7 @@
AXIS2_DECLARE(axis2_woden_property_t *)
axis2_woden_property_to_documentable(
void *property,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_property_impl_t *property_impl = NULL;
@@ -257,7 +257,7 @@
axis2_woden_property_free_ops(property, env);
property_impl->property.base.documentable.ops =
- AXIS2_MALLOC((*env)->allocator,
+ AXIS2_MALLOC(env->allocator,
sizeof(axis2_woden_documentable_ops_t));
axis2_woden_documentable_resolve_methods(&(property_impl->property.base.
documentable), env, property_impl->documentable, property_impl->methods);
@@ -267,7 +267,7 @@
AXIS2_DECLARE(axis2_woden_property_t *)
axis2_woden_property_to_wsdl_obj(
void *property,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_property_impl_t *property_impl = NULL;
axis2_woden_wsdl_obj_t *wsdl_obj = NULL;
@@ -282,7 +282,7 @@
axis2_woden_property_free_ops(property, env);
property_impl->property.base.documentable.base.wsdl_obj.ops =
- AXIS2_MALLOC((*env)->allocator,
+ AXIS2_MALLOC(env->allocator,
sizeof(axis2_woden_wsdl_obj_ops_t));
wsdl_obj = AXIS2_WODEN_DOCUMENTABLE_GET_BASE_IMPL(
property_impl->documentable, env);
@@ -294,7 +294,7 @@
AXIS2_DECLARE(axis2_woden_property_t *)
axis2_woden_property_to_nested_component(
void *property,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_property_impl_t *property_impl = NULL;
@@ -308,7 +308,7 @@
axis2_woden_property_free_ops(property, env);
property_impl->property.base.nested_component.ops =
- AXIS2_MALLOC((*env)->allocator,
+ AXIS2_MALLOC(env->allocator,
sizeof(axis2_woden_nested_component_ops_t));
axis2_woden_nested_component_resolve_methods(&(property_impl->property.base.
nested_component), env, property_impl->methods);
@@ -318,7 +318,7 @@
AXIS2_DECLARE(axis2_woden_property_t *)
axis2_woden_property_to_wsdl_component(
void *property,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_property_impl_t *property_impl = NULL;
@@ -332,7 +332,7 @@
property_impl = (axis2_woden_property_impl_t *) property;
axis2_woden_property_free_ops(property, env);
property_impl->property.base.nested_component.wsdl_component.ops =
- AXIS2_MALLOC((*env)->allocator,
+ AXIS2_MALLOC(env->allocator,
sizeof(axis2_woden_wsdl_component_ops_t));
axis2_woden_wsdl_component_resolve_methods(&(property_impl->property.base.
nested_component.wsdl_component), env, property_impl->methods);
@@ -342,7 +342,7 @@
AXIS2_DECLARE(axis2_woden_property_t *)
axis2_woden_property_to_attr_extensible(
void *property,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_property_impl_t *property_impl = NULL;
@@ -358,7 +358,7 @@
property_impl->property.base.documentable.base.wsdl_obj.base.
wsdl_element.base.attr_extensible.ops =
- AXIS2_MALLOC((*env)->allocator,
+ AXIS2_MALLOC(env->allocator,
sizeof(axis2_woden_attr_extensible_ops_t));
axis2_woden_attr_extensible_resolve_methods(&(property_impl->property.base.
documentable.base.wsdl_obj.base.wsdl_element.base.attr_extensible),
@@ -370,7 +370,7 @@
AXIS2_DECLARE(axis2_woden_property_t *)
axis2_woden_property_to_element_extensible(
void *property,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_property_impl_t *property_impl = NULL;
@@ -384,7 +384,7 @@
property_impl = (axis2_woden_property_impl_t *) property;
axis2_woden_property_free_ops(property, env);
property_impl->property.base.documentable.base.wsdl_obj.base.wsdl_element.
- base.element_extensible.ops = AXIS2_MALLOC((*env)->allocator,
+ base.element_extensible.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_woden_element_extensible_ops_t));
axis2_woden_element_extensible_resolve_methods(&(property_impl->property.base.
documentable.base.wsdl_obj.base.wsdl_element.base.element_extensible),
@@ -395,12 +395,12 @@
/************************End of Woden C Internal Methods***********************/
static axis2_woden_property_t *
-create(axis2_env_t **env)
+create(const axis2_env_t *env)
{
axis2_woden_property_impl_t *property_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- property_impl = AXIS2_MALLOC((*env)->allocator,
+ property_impl = AXIS2_MALLOC(env->allocator,
sizeof(axis2_woden_property_impl_t));
property_impl->obj_type= AXIS2_WODEN_PROPERTY;
@@ -427,7 +427,7 @@
property_impl->property.base.documentable.base.wsdl_obj.base.wsdl_element.
base.element_extensible.ops = NULL;
- property_impl->property.ops = AXIS2_MALLOC((*env)->allocator,
+ property_impl->property.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_woden_property_ops_t));
property_impl->property.ops->free = axis2_woden_property_free;
@@ -445,7 +445,7 @@
property_impl->methods = axis2_hash_make(env);
if(!property_impl->methods)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
axis2_hash_set(property_impl->methods, "free", AXIS2_HASH_KEY_STRING,
@@ -508,7 +508,7 @@
}
AXIS2_DECLARE(axis2_woden_property_t *)
-axis2_woden_property_create(axis2_env_t **env)
+axis2_woden_property_create(const axis2_env_t *env)
{
axis2_woden_property_impl_t *property_impl = NULL;
@@ -520,7 +520,7 @@
property_impl->super = axis2_hash_make(env);
if(!property_impl->super)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
axis2_hash_set(property_impl->super, "AXIS2_WODEN_PROPERTY",
@@ -534,7 +534,7 @@
static axis2_status_t
axis2_woden_property_free_ops(
void *property,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_property_impl_t *property_impl = NULL;
@@ -543,14 +543,14 @@
if(property_impl->property.base.property_element.ops)
{
- AXIS2_FREE((*env)->allocator, property_impl->property.base.
+ AXIS2_FREE(env->allocator, property_impl->property.base.
property_element.ops);
property_impl->property.base.property_element.ops = NULL;
}
if(property_impl->property.base.property_element.base.nested_element.ops)
{
- AXIS2_FREE((*env)->allocator, property_impl->property.base.
+ AXIS2_FREE(env->allocator, property_impl->property.base.
property_element.base.nested_element.ops);
property_impl->property.base.property_element.base.nested_element.ops =
NULL;
@@ -558,7 +558,7 @@
if(property_impl->property.base.property_element.base.documentable_element.ops)
{
- AXIS2_FREE((*env)->allocator, property_impl->property.base.
+ AXIS2_FREE(env->allocator, property_impl->property.base.
property_element.base.documentable_element.ops);
property_impl->property.base.property_element.base.documentable_element.ops =
NULL;
@@ -566,7 +566,7 @@
if(property_impl->property.base.documentable.ops)
{
- AXIS2_FREE((*env)->allocator, property_impl->property.base.
+ AXIS2_FREE(env->allocator, property_impl->property.base.
documentable.ops);
property_impl->property.base.documentable.ops =
NULL;
@@ -574,7 +574,7 @@
if(property_impl->property.base.documentable.base.wsdl_obj.ops)
{
- AXIS2_FREE((*env)->allocator, property_impl->property.base.
+ AXIS2_FREE(env->allocator, property_impl->property.base.
documentable.base.wsdl_obj.ops);
property_impl->property.base.documentable.base.wsdl_obj.ops =
NULL;
@@ -582,14 +582,14 @@
if(property_impl->property.base.nested_component.ops)
{
- AXIS2_FREE((*env)->allocator, property_impl->property.base.
+ AXIS2_FREE(env->allocator, property_impl->property.base.
nested_component.ops);
property_impl->property.base.nested_component.ops = NULL;
}
if(property_impl->property.base.nested_component.wsdl_component.ops)
{
- AXIS2_FREE((*env)->allocator, property_impl->property.base.
+ AXIS2_FREE(env->allocator, property_impl->property.base.
nested_component.wsdl_component.ops);
property_impl->property.base.nested_component.wsdl_component.ops = NULL;
}
@@ -598,7 +598,7 @@
if(property_impl->property.base.documentable.base.wsdl_obj.base.
wsdl_element.base.attr_extensible.ops)
{
- AXIS2_FREE((*env)->allocator, property_impl->property.base.documentable.
+ AXIS2_FREE(env->allocator, property_impl->property.base.documentable.
base.wsdl_obj.base.wsdl_element.base.attr_extensible.ops);
property_impl->property.base.documentable.base.wsdl_obj.base.wsdl_element.
base.attr_extensible.ops = NULL;
@@ -607,7 +607,7 @@
if(property_impl->property.base.documentable.base.wsdl_obj.base.
wsdl_element.base.element_extensible.ops)
{
- AXIS2_FREE((*env)->allocator, property_impl->property.base.documentable.
+ AXIS2_FREE(env->allocator, property_impl->property.base.documentable.
base.wsdl_obj.base.wsdl_element.base.element_extensible.ops);
property_impl->property.base.documentable.base.wsdl_obj.base.wsdl_element.
base.element_extensible.ops = NULL;
@@ -618,7 +618,7 @@
axis2_status_t AXIS2_CALL
axis2_woden_property_free(void *property,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_property_impl_t *property_impl = NULL;
@@ -655,13 +655,13 @@
if((&(property_impl->property))->ops)
{
- AXIS2_FREE((*env)->allocator, (&(property_impl->property))->ops);
+ AXIS2_FREE(env->allocator, (&(property_impl->property))->ops);
(&(property_impl->property))->ops = NULL;
}
if(property_impl)
{
- AXIS2_FREE((*env)->allocator, property_impl);
+ AXIS2_FREE(env->allocator, property_impl);
property_impl = NULL;
}
return AXIS2_SUCCESS;
@@ -670,7 +670,7 @@
axis2_hash_t *AXIS2_CALL
axis2_woden_property_super_objs(
void *property,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_property_impl_t *property_impl = NULL;
@@ -683,7 +683,7 @@
axis2_woden_obj_types_t AXIS2_CALL
axis2_woden_property_type(
void *property,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_property_impl_t *property_impl = NULL;
@@ -695,7 +695,7 @@
axis2_woden_documentable_t *AXIS2_CALL
axis2_woden_property_get_base_impl(void *property,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_property_impl_t *property_impl = NULL;
@@ -708,14 +708,14 @@
axis2_status_t AXIS2_CALL
axis2_woden_property_resolve_methods(
axis2_woden_property_t *property,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_woden_property_t *property_impl,
axis2_hash_t *methods)
{
axis2_woden_property_impl_t *property_impl_l = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, methods, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
property_impl_l = INTF_TO_IMPL(property_impl);
property->ops->free = axis2_hash_get(methods, "free",
@@ -761,7 +761,7 @@
axis2_status_t AXIS2_CALL
axis2_woden_property_set_ref(
void *property,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_url_t *ref)
{
axis2_woden_property_impl_t *property_impl = NULL;
@@ -783,7 +783,7 @@
axis2_url_t *AXIS2_CALL
axis2_woden_property_get_ref(
void *property,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_property_impl_t *property_impl = NULL;
axis2_hash_t *super = NULL;
@@ -799,7 +799,7 @@
axis2_status_t AXIS2_CALL
axis2_woden_property_set_parent_element(
void *property,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_woden_wsdl_element_t *parent)
{
axis2_woden_property_impl_t *property_impl = NULL;
@@ -821,7 +821,7 @@
void *AXIS2_CALL
axis2_woden_property_get_parent_element(
void *property,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_property_impl_t *property_impl = NULL;
axis2_hash_t *super = NULL;
@@ -837,7 +837,7 @@
void *AXIS2_CALL
axis2_woden_property_get_parent(
void *property,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_property_impl_t *property_impl = NULL;
axis2_hash_t *super = NULL;
@@ -853,7 +853,7 @@
void *AXIS2_CALL
axis2_woden_property_to_element(
void *property,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_property_impl_t *property_impl = NULL;
axis2_hash_t *super = NULL;
@@ -869,7 +869,7 @@
axis2_status_t AXIS2_CALL
axis2_woden_property_set_value(
void *property,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *value)
{
axis2_woden_property_impl_t *property_impl = NULL;
@@ -892,7 +892,7 @@
void *AXIS2_CALL
axis2_woden_property_get_value(
void *property,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_property_impl_t *property_impl = NULL;
axis2_hash_t *super = NULL;
@@ -908,7 +908,7 @@
axis2_status_t AXIS2_CALL
axis2_woden_property_set_value_constraint(
void *property,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *type_def)
{
axis2_woden_property_impl_t *property_impl = NULL;
@@ -932,7 +932,7 @@
void *AXIS2_CALL
axis2_woden_property_get_value_constraint(
void *property,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_property_impl_t *property_impl = NULL;
axis2_hash_t *super = NULL;
@@ -948,7 +948,7 @@
axis2_status_t AXIS2_CALL
axis2_woden_property_set_constraint_qname(
void *property,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *constraint)
{
axis2_woden_property_impl_t *property_impl = NULL;
@@ -971,7 +971,7 @@
axis2_qname_t *AXIS2_CALL
axis2_woden_property_get_constraint_qname(
void *property,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_property_impl_t *property_impl = NULL;
axis2_hash_t *super = NULL;
@@ -987,7 +987,7 @@
void *AXIS2_CALL
axis2_woden_property_get_constraint(
void *property,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_property_impl_t *property_impl = NULL;
axis2_xml_schema_type_t *xst = NULL;
@@ -1010,7 +1010,7 @@
axis2_status_t AXIS2_CALL
axis2_woden_property_set_types(
void *property,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *types)
{
axis2_woden_property_impl_t *property_impl = NULL;
@@ -1033,7 +1033,7 @@
axis2_status_t AXIS2_CALL
axis2_woden_property_set_has_value_token(
void *property,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_bool_t b)
{
axis2_woden_property_impl_t *property_impl = NULL;
@@ -1051,7 +1051,7 @@
axis2_bool_t AXIS2_CALL
axis2_woden_property_has_value_token(
void *property,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_property_impl_t *property_impl = NULL;
axis2_hash_t *super = NULL;
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/svc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/svc.c?rev=410750&r1=410749&r2=410750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/svc.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/svc.c Wed May 31 22:18:45 2006
@@ -44,22 +44,22 @@
axis2_status_t AXIS2_CALL
axis2_woden_svc_free(
void *svc,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_hash_t *AXIS2_CALL
axis2_woden_svc_super_objs(
void *svc,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_woden_obj_types_t AXIS2_CALL
axis2_woden_svc_type(
void *svc,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_woden_configurable_t *AXIS2_CALL
axis2_woden_svc_get_base_impl(
void *svc,
- axis2_env_t **env);
+ const axis2_env_t *env);
/* ************************************************************
* Service interface methods (the WSDL Component model)
* ************************************************************/
@@ -67,17 +67,17 @@
axis2_qname_t *AXIS2_CALL
axis2_woden_svc_get_qname(
void *svc,
- axis2_env_t **env);
+ const axis2_env_t *env);
void *AXIS2_CALL
axis2_woden_svc_get_interface(
void *svc,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_array_list_t *AXIS2_CALL
axis2_woden_svc_get_endpoints(
void *svc,
- axis2_env_t **env);
+ const axis2_env_t *env);
/* ************************************************************
* Service Element interface methods (the XML Element model)
* ************************************************************/
@@ -85,35 +85,35 @@
axis2_status_t AXIS2_CALL
axis2_woden_svc_set_qname(
void *svc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname);
axis2_status_t AXIS2_CALL
axis2_woden_svc_set_interface_qname(
void *svc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *interface_qname);
axis2_qname_t *AXIS2_CALL
axis2_woden_svc_get_interface_qname(
void *svc,
- axis2_env_t **env);
+ const axis2_env_t *env);
void *AXIS2_CALL
axis2_woden_svc_get_interface_element(
void *svc,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_woden_svc_add_endpoint_element(
void *svc,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *endpoint);
axis2_array_list_t *AXIS2_CALL
axis2_woden_svc_get_endpoint_elements(
void *svc,
- axis2_env_t **env);
+ const axis2_env_t *env);
/******************************************************************************
* Non-API implementation methods
@@ -122,23 +122,23 @@
axis2_status_t AXIS2_CALL
axis2_woden_svc_set_interface_element(
void *svc,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *interface);
static axis2_woden_svc_t *
-create(axis2_env_t **env);
+create(const axis2_env_t *env);
static axis2_status_t
axis2_woden_svc_free_ops(
void *svc,
- axis2_env_t **env);
+ const axis2_env_t *env);
/************************Woden C Internal Methods******************************/
AXIS2_DECLARE(axis2_woden_svc_t *)
axis2_woden_svc_to_svc_element(
void *svc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_svc_impl_t *svc_impl = NULL;
@@ -153,7 +153,7 @@
axis2_woden_svc_free_ops(svc, env);
svc_impl->svc.base.svc_element.ops =
- AXIS2_MALLOC((*env)->allocator,
+ AXIS2_MALLOC(env->allocator,
sizeof(axis2_woden_svc_element_ops_t));
axis2_woden_svc_element_resolve_methods(&(svc_impl->svc.base.
svc_element), env, svc_impl->methods);
@@ -163,7 +163,7 @@
AXIS2_DECLARE(axis2_woden_svc_t *)
axis2_woden_svc_to_documentable_element(
void *svc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_svc_impl_t *svc_impl = NULL;
@@ -178,7 +178,7 @@
axis2_woden_svc_free_ops(svc, env);
svc_impl->svc.base.svc_element.base.documentable_element.ops =
- AXIS2_MALLOC((*env)->allocator,
+ AXIS2_MALLOC(env->allocator,
sizeof(axis2_woden_documentable_element_ops_t));
axis2_woden_documentable_element_resolve_methods(&(svc_impl->svc.base.
svc_element.base.documentable_element), env,
@@ -189,7 +189,7 @@
AXIS2_DECLARE(axis2_woden_svc_t *)
axis2_woden_svc_to_configurable(
void *svc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_svc_impl_t *svc_impl = NULL;
@@ -204,7 +204,7 @@
axis2_woden_svc_free_ops(svc, env);
svc_impl->svc.base.configurable.ops =
- AXIS2_MALLOC((*env)->allocator,
+ AXIS2_MALLOC(env->allocator,
sizeof(axis2_woden_configurable_ops_t));
axis2_woden_configurable_resolve_methods(&(svc_impl->svc.base.
configurable), env, svc_impl->configurable,
@@ -215,7 +215,7 @@
AXIS2_DECLARE(axis2_woden_svc_t *)
axis2_woden_svc_to_configurable_component(
void *svc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_svc_impl_t *svc_impl = NULL;
@@ -230,7 +230,7 @@
axis2_woden_svc_free_ops(svc, env);
svc_impl->svc.base.configurable_component.ops =
- AXIS2_MALLOC((*env)->allocator,
+ AXIS2_MALLOC(env->allocator,
sizeof(axis2_woden_configurable_component_ops_t));
axis2_woden_configurable_component_resolve_methods(&(svc_impl->svc.base.
configurable_component), env, svc_impl->methods);
@@ -240,7 +240,7 @@
AXIS2_DECLARE(axis2_woden_svc_t *)
axis2_woden_svc_to_wsdl_component(
void *svc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_svc_impl_t *svc_impl = NULL;
@@ -256,7 +256,7 @@
axis2_woden_svc_free_ops(svc, env);
svc_impl->svc.base.configurable_component.wsdl_component.ops =
- AXIS2_MALLOC((*env)->allocator,
+ AXIS2_MALLOC(env->allocator,
sizeof(axis2_woden_wsdl_component_ops_t));
axis2_woden_wsdl_component_resolve_methods(&(svc_impl->svc.base.
configurable_component.wsdl_component), env, svc_impl->methods);
@@ -265,12 +265,12 @@
/************************End of Woden C Internal Methods***********************/
static axis2_woden_svc_t *
-create(axis2_env_t **env)
+create(const axis2_env_t *env)
{
axis2_woden_svc_impl_t *svc_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- svc_impl = AXIS2_MALLOC((*env)->allocator,
+ svc_impl = AXIS2_MALLOC(env->allocator,
sizeof(axis2_woden_svc_impl_t));
svc_impl->obj_type= AXIS2_WODEN_SVC;
@@ -288,7 +288,7 @@
svc_impl->svc.base.configurable_component.ops = NULL;
svc_impl->svc.base.configurable_component.wsdl_component.ops = NULL;
- svc_impl->svc.ops = AXIS2_MALLOC((*env)->allocator,
+ svc_impl->svc.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_woden_svc_ops_t));
svc_impl->svc.ops->free = axis2_woden_svc_free;
@@ -306,7 +306,7 @@
svc_impl->methods = axis2_hash_make(env);
if(!svc_impl->methods)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
axis2_hash_set(svc_impl->methods, "free", AXIS2_HASH_KEY_STRING,
@@ -351,7 +351,7 @@
}
AXIS2_DECLARE(axis2_woden_svc_t *)
-axis2_woden_svc_create(axis2_env_t **env)
+axis2_woden_svc_create(const axis2_env_t *env)
{
axis2_woden_svc_impl_t *svc_impl = NULL;
@@ -363,7 +363,7 @@
svc_impl->super = axis2_hash_make(env);
if(!svc_impl->super)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
axis2_hash_set(svc_impl->super, "AXIS2_WODEN_SVC", AXIS2_HASH_KEY_STRING,
@@ -377,7 +377,7 @@
static axis2_status_t
axis2_woden_svc_free_ops(
void *svc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_svc_impl_t *svc_impl = NULL;
@@ -386,14 +386,14 @@
if(svc_impl->svc.base.svc_element.ops)
{
- AXIS2_FREE((*env)->allocator, svc_impl->svc.base.
+ AXIS2_FREE(env->allocator, svc_impl->svc.base.
svc_element.ops);
svc_impl->svc.base.svc_element.ops = NULL;
}
if(svc_impl->svc.base.svc_element.base.documentable_element.ops)
{
- AXIS2_FREE((*env)->allocator, svc_impl->svc.base.
+ AXIS2_FREE(env->allocator, svc_impl->svc.base.
svc_element.base.documentable_element.ops);
svc_impl->svc.base.svc_element.base.documentable_element.ops =
NULL;
@@ -401,7 +401,7 @@
if(svc_impl->svc.base.configurable.ops)
{
- AXIS2_FREE((*env)->allocator, svc_impl->svc.base.
+ AXIS2_FREE(env->allocator, svc_impl->svc.base.
configurable.ops);
svc_impl->svc.base.configurable.ops =
NULL;
@@ -409,14 +409,14 @@
if(svc_impl->svc.base.configurable_component.ops)
{
- AXIS2_FREE((*env)->allocator, svc_impl->svc.base.
+ AXIS2_FREE(env->allocator, svc_impl->svc.base.
configurable_component.ops);
svc_impl->svc.base.configurable_component.ops = NULL;
}
if(svc_impl->svc.base.configurable_component.wsdl_component.ops)
{
- AXIS2_FREE((*env)->allocator, svc_impl->svc.base.
+ AXIS2_FREE(env->allocator, svc_impl->svc.base.
configurable_component.wsdl_component.ops);
svc_impl->svc.base.configurable_component.wsdl_component.ops = NULL;
}
@@ -427,7 +427,7 @@
axis2_status_t AXIS2_CALL
axis2_woden_svc_free(void *svc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_svc_impl_t *svc_impl = NULL;
@@ -482,13 +482,13 @@
if((&(svc_impl->svc))->ops)
{
- AXIS2_FREE((*env)->allocator, (&(svc_impl->svc))->ops);
+ AXIS2_FREE(env->allocator, (&(svc_impl->svc))->ops);
(&(svc_impl->svc))->ops = NULL;
}
if(svc_impl)
{
- AXIS2_FREE((*env)->allocator, svc_impl);
+ AXIS2_FREE(env->allocator, svc_impl);
svc_impl = NULL;
}
return AXIS2_SUCCESS;
@@ -497,7 +497,7 @@
axis2_hash_t *AXIS2_CALL
axis2_woden_svc_super_objs(
void *svc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_svc_impl_t *svc_impl = NULL;
@@ -510,7 +510,7 @@
axis2_woden_obj_types_t AXIS2_CALL
axis2_woden_svc_type(
void *svc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_svc_impl_t *svc_impl = NULL;
@@ -523,7 +523,7 @@
axis2_woden_configurable_t *AXIS2_CALL
axis2_woden_svc_get_base_impl(
void *svc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_svc_impl_t *svc_impl = NULL;
@@ -536,14 +536,14 @@
axis2_status_t AXIS2_CALL
axis2_woden_svc_resolve_methods(
axis2_woden_svc_t *svc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_woden_svc_t *svc_impl,
axis2_hash_t *methods)
{
axis2_woden_svc_impl_t *svc_impl_l = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, methods, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
svc_impl_l = INTF_TO_IMPL(svc_impl);
svc->ops->free = axis2_hash_get(methods, "free",
@@ -586,7 +586,7 @@
axis2_qname_t *AXIS2_CALL
axis2_woden_svc_get_qname(
void *svc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_svc_impl_t *svc_impl = NULL;
axis2_hash_t *super = NULL;
@@ -602,7 +602,7 @@
void *AXIS2_CALL
axis2_woden_svc_get_interface(
void *svc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_svc_impl_t *svc_impl = NULL;
axis2_hash_t *super = NULL;
@@ -618,7 +618,7 @@
axis2_array_list_t *AXIS2_CALL
axis2_woden_svc_get_endpoints(
void *svc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_svc_impl_t *svc_impl = NULL;
axis2_hash_t *super = NULL;
@@ -637,7 +637,7 @@
axis2_status_t AXIS2_CALL
axis2_woden_svc_set_qname(
void *svc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname)
{
axis2_woden_svc_impl_t *svc_impl = NULL;
@@ -659,7 +659,7 @@
axis2_status_t AXIS2_CALL
axis2_woden_svc_set_interface_qname(
void *svc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *interface_qname)
{
axis2_woden_svc_impl_t *svc_impl = NULL;
@@ -682,7 +682,7 @@
axis2_qname_t *AXIS2_CALL
axis2_woden_svc_get_interface_qname(
void *svc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_svc_impl_t *svc_impl = NULL;
axis2_hash_t *super = NULL;
@@ -698,7 +698,7 @@
void *AXIS2_CALL
axis2_woden_svc_get_interface_element(
void *svc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_svc_impl_t *svc_impl = NULL;
axis2_hash_t *super = NULL;
@@ -714,7 +714,7 @@
axis2_status_t AXIS2_CALL
axis2_woden_svc_add_endpoint_element(
void *svc,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *endpoint)
{
axis2_woden_svc_impl_t *svc_impl = NULL;
@@ -730,7 +730,7 @@
svc_impl->f_endpoints = axis2_array_list_create(env, 0);
if(!svc_impl->f_endpoints)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
}
@@ -741,7 +741,7 @@
axis2_array_list_t *AXIS2_CALL
axis2_woden_svc_get_endpoint_elements(
void *svc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_svc_impl_t *svc_impl = NULL;
axis2_hash_t *super = NULL;
@@ -760,7 +760,7 @@
axis2_status_t AXIS2_CALL
axis2_woden_svc_set_interface_element(
void *svc,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *interface)
{
axis2_woden_svc_impl_t *svc_impl = NULL;
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/types.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/types.c?rev=410750&r1=410749&r2=410750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/types.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/types.c Wed May 31 22:18:45 2006
@@ -44,121 +44,121 @@
axis2_status_t AXIS2_CALL
axis2_woden_types_free(
void *types,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_hash_t *AXIS2_CALL
axis2_woden_types_super_objs(
void *types,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_woden_obj_types_t AXIS2_CALL
axis2_woden_types_type(
void *types,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_woden_documentable_t *AXIS2_CALL
axis2_woden_types_get_base_impl(
void *types,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_woden_types_set_type_system(
void *types,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *type_system);
axis2_char_t *AXIS2_CALL
axis2_woden_types_get_type_system(
void *types,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_woden_types_add_schema(
void *types,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_t *schema);
axis2_status_t AXIS2_CALL
axis2_woden_types_remove_schema(
void *types,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_t *schema);
axis2_array_list_t *AXIS2_CALL
axis2_woden_types_get_schemas(
void *types,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_array_list_t *AXIS2_CALL
axis2_woden_types_get_schemas_with_namespace(
void *types,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_url_t *namespc);
axis2_array_list_t *AXIS2_CALL
axis2_woden_types_get_inlined_schemas(
void *types,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_array_list_t *AXIS2_CALL
axis2_woden_types_get_imported_schemas(
void *types,
- axis2_env_t **env);
+ const axis2_env_t *env);
void *AXIS2_CALL
axis2_woden_types_get_element_declaration(
void *types,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname);
void *AXIS2_CALL
axis2_woden_types_get_type_definition(
void *types,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname);
axis2_array_list_t *AXIS2_CALL
axis2_woden_types_get_referenceable_schema_defs(
void *types,
- axis2_env_t **env);
+ const axis2_env_t *env);
static axis2_array_list_t *
axis2_woden_types_get_referenceable_schema_defs_with_namespace(
void *types,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *namespc);
axis2_bool_t AXIS2_CALL
axis2_woden_types_is_namespace_in_scope_with_namespace_uri(
void *types,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_url_t *namespc_uri);
axis2_bool_t AXIS2_CALL
axis2_woden_types_is_namespace_in_scope_with_qname(
void *types,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname);
axis2_bool_t AXIS2_CALL
axis2_woden_types_is_namespace_in_scope_with_namespace(
void *types,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *namespc);
static axis2_woden_types_t *
-create(axis2_env_t **env);
+create(const axis2_env_t *env);
static axis2_status_t
axis2_woden_types_free_ops(
void *types,
- axis2_env_t **env);
+ const axis2_env_t *env);
/************************Woden C Internal Methods******************************/
AXIS2_DECLARE(axis2_woden_types_t *)
axis2_woden_types_to_types_element(
void *types,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_types_impl_t *types_impl = NULL;
@@ -173,7 +173,7 @@
axis2_woden_types_free_ops(types, env);
types_impl->types.base.types_element.ops =
- AXIS2_MALLOC((*env)->allocator,
+ AXIS2_MALLOC(env->allocator,
sizeof(axis2_woden_types_element_ops_t));
axis2_woden_types_element_resolve_methods(&(types_impl->types.base.
types_element), env, types_impl->methods);
@@ -183,7 +183,7 @@
AXIS2_DECLARE(axis2_woden_types_t *)
axis2_woden_types_to_documentable_element(
void *types,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_types_impl_t *types_impl = NULL;
@@ -198,7 +198,7 @@
axis2_woden_types_free_ops(types, env);
types_impl->types.base.types_element.documentable_element.ops =
- AXIS2_MALLOC((*env)->allocator,
+ AXIS2_MALLOC(env->allocator,
sizeof(axis2_woden_documentable_element_ops_t));
axis2_woden_documentable_element_resolve_methods(&(types_impl->types.base.
types_element.documentable_element), env,
@@ -209,7 +209,7 @@
AXIS2_DECLARE(axis2_woden_types_t *)
axis2_woden_types_to_documentable(
void *types,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_types_impl_t *types_impl = NULL;
@@ -224,7 +224,7 @@
axis2_woden_types_free_ops(types, env);
types_impl->types.base.documentable.ops =
- AXIS2_MALLOC((*env)->allocator,
+ AXIS2_MALLOC(env->allocator,
sizeof(axis2_woden_documentable_ops_t));
axis2_woden_documentable_resolve_methods(&(types_impl->types.base.
documentable), env, types_impl->documentable,
@@ -235,7 +235,7 @@
AXIS2_DECLARE(axis2_woden_types_t *)
axis2_woden_types_to_wsdl_obj(
void *types,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_types_impl_t *types_impl = NULL;
void *wsdl_obj = NULL;
@@ -251,7 +251,7 @@
axis2_woden_types_free_ops(types, env);
types_impl->types.base.documentable.base.wsdl_obj.ops =
- AXIS2_MALLOC((*env)->allocator,
+ AXIS2_MALLOC(env->allocator,
sizeof(axis2_woden_wsdl_obj_ops_t));
wsdl_obj = AXIS2_WODEN_DOCUMENTABLE_GET_BASE_IMPL(types_impl->documentable,
env);
@@ -263,7 +263,7 @@
AXIS2_DECLARE(axis2_woden_types_t *)
axis2_woden_types_to_wsdl_component(
void *types,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_types_impl_t *types_impl = NULL;
@@ -279,7 +279,7 @@
axis2_woden_types_free_ops(types, env);
types_impl->types.base.documentable.base.wsdl_obj.base.wsdl_component.ops =
- AXIS2_MALLOC((*env)->allocator,
+ AXIS2_MALLOC(env->allocator,
sizeof(axis2_woden_wsdl_component_ops_t));
axis2_woden_wsdl_component_resolve_methods(&(types_impl->types.base.
documentable.base.wsdl_obj.base.wsdl_component), env,
@@ -290,7 +290,7 @@
AXIS2_DECLARE(axis2_woden_types_t *)
axis2_woden_types_to_attr_extensible(
void *types,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_types_impl_t *types_impl = NULL;
@@ -307,7 +307,7 @@
types_impl->types.base.documentable.base.wsdl_obj.base.
wsdl_element.base.attr_extensible.ops =
- AXIS2_MALLOC((*env)->allocator,
+ AXIS2_MALLOC(env->allocator,
sizeof(axis2_woden_attr_extensible_ops_t));
axis2_woden_attr_extensible_resolve_methods(&(types_impl->types.base.
documentable.base.wsdl_obj.base.wsdl_element.base.attr_extensible),
@@ -319,7 +319,7 @@
AXIS2_DECLARE(axis2_woden_types_t *)
axis2_woden_types_to_element_extensible(
void *types,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_types_impl_t *types_impl = NULL;
@@ -335,7 +335,7 @@
axis2_woden_types_free_ops(types, env);
types_impl->types.base.documentable.base.wsdl_obj.base.wsdl_element.
- base.element_extensible.ops = AXIS2_MALLOC((*env)->allocator,
+ base.element_extensible.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_woden_element_extensible_ops_t));
axis2_woden_element_extensible_resolve_methods(&(types_impl->types.base.
documentable.base.wsdl_obj.base.wsdl_element.base.element_extensible),
@@ -346,12 +346,12 @@
/************************End of Woden C Internal Methods***********************/
static axis2_woden_types_t *
-create(axis2_env_t **env)
+create(const axis2_env_t *env)
{
axis2_woden_types_impl_t *types_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- types_impl = AXIS2_MALLOC((*env)->allocator,
+ types_impl = AXIS2_MALLOC(env->allocator,
sizeof(axis2_woden_types_impl_t));
types_impl->obj_type= AXIS2_WODEN_TYPES;
@@ -372,7 +372,7 @@
types_impl->types.base.documentable.base.wsdl_obj.base.wsdl_element.
base.element_extensible.ops = NULL;
- types_impl->types.ops = AXIS2_MALLOC((*env)->allocator,
+ types_impl->types.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_woden_types_ops_t));
types_impl->f_schemas = axis2_array_list_create(env, 0);
@@ -397,7 +397,7 @@
types_impl->methods = axis2_hash_make(env);
if(!types_impl->methods)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
axis2_hash_set(types_impl->methods, "free", AXIS2_HASH_KEY_STRING,
@@ -458,7 +458,7 @@
}
AXIS2_DECLARE(axis2_woden_types_t *)
-axis2_woden_types_create(axis2_env_t **env)
+axis2_woden_types_create(const axis2_env_t *env)
{
axis2_woden_types_impl_t *types_impl = NULL;
@@ -470,7 +470,7 @@
types_impl->super = axis2_hash_make(env);
if(!types_impl->super)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
axis2_hash_set(types_impl->super, "AXIS2_WODEN_TYPES", AXIS2_HASH_KEY_STRING,
@@ -484,7 +484,7 @@
static axis2_status_t
axis2_woden_types_free_ops(
void *types,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_types_impl_t *types_impl = NULL;
@@ -493,14 +493,14 @@
if(types_impl->types.base.types_element.ops)
{
- AXIS2_FREE((*env)->allocator, types_impl->types.base.
+ AXIS2_FREE(env->allocator, types_impl->types.base.
types_element.ops);
types_impl->types.base.types_element.ops = NULL;
}
if(types_impl->types.base.types_element.documentable_element.ops)
{
- AXIS2_FREE((*env)->allocator, types_impl->types.base.
+ AXIS2_FREE(env->allocator, types_impl->types.base.
types_element.documentable_element.ops);
types_impl->types.base.types_element.documentable_element.ops =
NULL;
@@ -508,7 +508,7 @@
if(types_impl->types.base.documentable.ops)
{
- AXIS2_FREE((*env)->allocator, types_impl->types.base.
+ AXIS2_FREE(env->allocator, types_impl->types.base.
documentable.ops);
types_impl->types.base.documentable.ops =
NULL;
@@ -516,7 +516,7 @@
if(types_impl->types.base.documentable.base.wsdl_obj.ops)
{
- AXIS2_FREE((*env)->allocator, types_impl->types.base.
+ AXIS2_FREE(env->allocator, types_impl->types.base.
documentable.base.wsdl_obj.ops);
types_impl->types.base.documentable.base.wsdl_obj.ops =
NULL;
@@ -524,7 +524,7 @@
if(types_impl->types.base.documentable.base.wsdl_obj.base.wsdl_component.ops)
{
- AXIS2_FREE((*env)->allocator, types_impl->types.base.
+ AXIS2_FREE(env->allocator, types_impl->types.base.
documentable.base.wsdl_obj.base.wsdl_component.ops);
types_impl->types.base.documentable.base.wsdl_obj.base.wsdl_component.
ops = NULL;
@@ -533,7 +533,7 @@
if(types_impl->types.base.documentable.base.wsdl_obj.base.
wsdl_element.base.attr_extensible.ops)
{
- AXIS2_FREE((*env)->allocator, types_impl->types.base.documentable.
+ AXIS2_FREE(env->allocator, types_impl->types.base.documentable.
base.wsdl_obj.base.wsdl_element.base.attr_extensible.ops);
types_impl->types.base.documentable.base.wsdl_obj.base.wsdl_element.
base.attr_extensible.ops = NULL;
@@ -542,7 +542,7 @@
if(types_impl->types.base.documentable.base.wsdl_obj.base.
wsdl_element.base.element_extensible.ops)
{
- AXIS2_FREE((*env)->allocator, types_impl->types.base.documentable.
+ AXIS2_FREE(env->allocator, types_impl->types.base.documentable.
base.wsdl_obj.base.wsdl_element.base.element_extensible.ops);
types_impl->types.base.documentable.base.wsdl_obj.base.wsdl_element.
base.element_extensible.ops = NULL;
@@ -554,7 +554,7 @@
axis2_status_t AXIS2_CALL
axis2_woden_types_free(
void *types,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_types_impl_t *types_impl = NULL;
@@ -575,7 +575,7 @@
if(types_impl->f_type_system)
{
- AXIS2_FREE((*env)->allocator, types_impl->f_type_system);
+ AXIS2_FREE(env->allocator, types_impl->f_type_system);
types_impl->f_type_system = NULL;
}
@@ -601,13 +601,13 @@
if((&(types_impl->types))->ops)
{
- AXIS2_FREE((*env)->allocator, (&(types_impl->types))->ops);
+ AXIS2_FREE(env->allocator, (&(types_impl->types))->ops);
(&(types_impl->types))->ops = NULL;
}
if(types_impl)
{
- AXIS2_FREE((*env)->allocator, types_impl);
+ AXIS2_FREE(env->allocator, types_impl);
types_impl = NULL;
}
return AXIS2_SUCCESS;
@@ -616,7 +616,7 @@
axis2_hash_t *AXIS2_CALL
axis2_woden_types_super_objs(
void *types,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_types_impl_t *types_impl = NULL;
@@ -629,7 +629,7 @@
axis2_woden_obj_types_t AXIS2_CALL
axis2_woden_types_type(
void *types,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_types_impl_t *types_impl = NULL;
@@ -642,7 +642,7 @@
axis2_woden_documentable_t *AXIS2_CALL
axis2_woden_types_get_base_impl(
void *types,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_types_impl_t *types_impl = NULL;
@@ -655,14 +655,14 @@
axis2_status_t AXIS2_CALL
axis2_woden_types_resolve_methods(
axis2_woden_types_t *types,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_woden_types_t *types_impl,
axis2_hash_t *methods)
{
axis2_woden_types_impl_t *types_impl_l = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, methods, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
types_impl_l = INTF_TO_IMPL(types_impl);
types->ops->free = axis2_hash_get(methods, "free",
@@ -715,26 +715,26 @@
axis2_status_t AXIS2_CALL
axis2_woden_types_set_type_system(
void *types,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *type_system)
{
axis2_woden_types_impl_t *types_impl = NULL;
axis2_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, type_system, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, type_system, AXIS2_FAILURE);
super = AXIS2_WODEN_TYPES_SUPER_OBJS(types, env);
types_impl = INTF_TO_IMPL(axis2_hash_get(super,
"AXIS2_WODEN_TYPES", AXIS2_HASH_KEY_STRING));
if(types_impl->f_type_system)
{
- AXIS2_FREE((*env)->allocator, types_impl->f_type_system);
+ AXIS2_FREE(env->allocator, types_impl->f_type_system);
}
types_impl->f_type_system = AXIS2_STRDUP(type_system, env);
if(!types_impl->f_type_system)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE)
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE)
return AXIS2_FAILURE;
}
return AXIS2_SUCCESS;
@@ -743,7 +743,7 @@
axis2_char_t *AXIS2_CALL
axis2_woden_types_get_type_system(
void *types,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_types_impl_t *types_impl = NULL;
axis2_hash_t *super = NULL;
@@ -758,14 +758,14 @@
axis2_status_t AXIS2_CALL
axis2_woden_types_add_schema(
void *types,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_t *schema)
{
axis2_woden_types_impl_t *types_impl = NULL;
axis2_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, schema, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, schema, AXIS2_FAILURE);
super = AXIS2_WODEN_TYPES_SUPER_OBJS(types, env);
types_impl = INTF_TO_IMPL(axis2_hash_get(super,
"AXIS2_WODEN_TYPES", AXIS2_HASH_KEY_STRING));
@@ -776,7 +776,7 @@
axis2_status_t AXIS2_CALL
axis2_woden_types_remove_schema(
void *types,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_t *schema)
{
axis2_woden_types_impl_t *types_impl = NULL;
@@ -785,21 +785,21 @@
axis2_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, schema, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, schema, AXIS2_FAILURE);
super = AXIS2_WODEN_TYPES_SUPER_OBJS(types, env);
types_impl = INTF_TO_IMPL(axis2_hash_get(super,
"AXIS2_WODEN_TYPES", AXIS2_HASH_KEY_STRING));
index = AXIS2_ARRAY_LIST_INDEX_OF(types_impl->f_schemas, env, schema);
AXIS2_ARRAY_LIST_REMOVE(types_impl->f_schemas, env, index);
- code = AXIS2_ERROR_GET_STATUS_CODE((*env)->error);
+ code = AXIS2_ERROR_GET_STATUS_CODE(env->error);
return code;
}
axis2_array_list_t *AXIS2_CALL
axis2_woden_types_get_schemas(
void *types,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_types_impl_t *types_impl = NULL;
axis2_hash_t *super = NULL;
@@ -814,7 +814,7 @@
axis2_array_list_t *AXIS2_CALL
axis2_woden_types_get_schemas_with_namespace(
void *types,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_url_t *namespc)
{
axis2_woden_types_impl_t *types_impl = NULL;
@@ -851,7 +851,7 @@
axis2_array_list_t *AXIS2_CALL
axis2_woden_types_get_inlined_schemas(
void *types,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_types_impl_t *types_impl = NULL;
int i = 0, size = 0;
@@ -878,7 +878,7 @@
axis2_array_list_t *AXIS2_CALL
axis2_woden_types_get_imported_schemas(
void *types,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_types_impl_t *types_impl = NULL;
int i = 0, size = 0;
@@ -905,7 +905,7 @@
void *AXIS2_CALL
axis2_woden_types_get_element_declaration(
void *types,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname)
{
axis2_woden_types_impl_t *types_impl = NULL;
@@ -948,7 +948,7 @@
void *AXIS2_CALL
axis2_woden_types_get_type_definition(
void *types,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname)
{
axis2_woden_types_impl_t *types_impl = NULL;
@@ -992,7 +992,7 @@
axis2_array_list_t *AXIS2_CALL
axis2_woden_types_get_referenceable_schema_defs(
void *types,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_types_impl_t *types_impl = NULL;
int i = 0, size = 0;
@@ -1018,7 +1018,7 @@
types_impl->schema_defs = axis2_array_list_create(env, 0);
if(!types_impl->schema_defs)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
size = AXIS2_ARRAY_LIST_SIZE(types_impl->f_schemas, env);
@@ -1040,7 +1040,7 @@
static axis2_array_list_t *AXIS2_CALL
axis2_woden_types_get_referenceable_schema_defs_with_namespace(
void *types,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *namespc)
{
axis2_woden_types_impl_t *types_impl = NULL;
@@ -1048,7 +1048,7 @@
axis2_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, namespc, NULL);
+ AXIS2_PARAM_CHECK(env->error, namespc, NULL);
super = AXIS2_WODEN_TYPES_SUPER_OBJS(types, env);
types_impl = INTF_TO_IMPL(axis2_hash_get(super,
"AXIS2_WODEN_TYPES", AXIS2_HASH_KEY_STRING));
@@ -1075,11 +1075,11 @@
axis2_bool_t AXIS2_CALL
axis2_woden_types_is_namespace_in_scope_with_namespace_uri(
void *types,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_url_t *namespc_uri)
{
axis2_woden_types_impl_t *types_impl = NULL;
- AXIS2_PARAM_CHECK((*env)->error, namespc_uri, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, namespc_uri, AXIS2_FAILURE);
axis2_char_t *str_uri = NULL;
axis2_hash_t *super = NULL;
@@ -1095,7 +1095,7 @@
axis2_bool_t AXIS2_CALL
axis2_woden_types_is_namespace_in_scope_with_qname(
void *types,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname)
{
axis2_woden_types_impl_t *types_impl = NULL;
@@ -1104,7 +1104,7 @@
axis2_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, qname, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, qname, AXIS2_FAILURE);
super = AXIS2_WODEN_TYPES_SUPER_OBJS(types, env);
types_impl = INTF_TO_IMPL(axis2_hash_get(super,
"AXIS2_WODEN_TYPES", AXIS2_HASH_KEY_STRING));
@@ -1117,7 +1117,7 @@
axis2_bool_t AXIS2_CALL
axis2_woden_types_is_namespace_in_scope_with_namespace(
void *types,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *namespc)
{
axis2_woden_types_impl_t *types_impl = NULL;
@@ -1126,7 +1126,7 @@
axis2_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, namespc, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, namespc, AXIS2_FAILURE);
super = AXIS2_WODEN_TYPES_SUPER_OBJS(types, env);
types_impl = INTF_TO_IMPL(axis2_hash_get(super,
"AXIS2_WODEN_TYPES", AXIS2_HASH_KEY_STRING));
@@ -1140,7 +1140,7 @@
types_impl->f_schemas, env, i);
if(!s)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_WSDL_SCHEMA_IS_NULL,
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_WSDL_SCHEMA_IS_NULL,
AXIS2_FAILURE);
return AXIS2_FALSE;
}
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/wsdl_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/wsdl_element.c?rev=410750&r1=410749&r2=410750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/wsdl_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/wsdl_element.c Wed May 31 22:18:45 2006
@@ -44,120 +44,120 @@
axis2_status_t AXIS2_CALL
axis2_woden_wsdl_element_free(
void *wsdl_element,
- axis2_env_t **envv);
+ const axis2_env_t *envv);
axis2_hash_t *AXIS2_CALL
axis2_woden_wsdl_element_super_objs(
void *wsdl_element,
- axis2_env_t **envv);
+ const axis2_env_t *envv);
axis2_woden_obj_types_t AXIS2_CALL
axis2_woden_wsdl_element_type(
void *wsdl_element,
- axis2_env_t **envv);
+ const axis2_env_t *envv);
axis2_status_t AXIS2_CALL
axis2_woden_wsdl_element_set_ext_attr(
void *wsdl_element,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *attr_type,
axis2_woden_xml_attr_t *attr);
void *AXIS2_CALL
axis2_woden_wsdl_element_get_ext_attr(
void *wsdl_element,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *attr_type);
axis2_array_list_t *AXIS2_CALL
axis2_woden_wsdl_element_get_ext_attrs(
void *wsdl_element,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_array_list_t *AXIS2_CALL
axis2_woden_wsdl_element_get_ext_attrs_for_namespace(
void *wsdl_element,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_url_t *namespc);
axis2_bool_t AXIS2_CALL
axis2_woden_wsdl_element_has_ext_attrs_for_namespace(
void *wsdl_element,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_url_t *namespc);
axis2_status_t AXIS2_CALL
axis2_woden_wsdl_element_add_ext_element(
void *wsdl_element,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_woden_ext_element_t *ext_el);
axis2_status_t AXIS2_CALL
axis2_woden_wsdl_element_remove_ext_element(
void *wsdl_element,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_woden_ext_element_t *ext_el);
axis2_array_list_t *AXIS2_CALL
axis2_woden_wsdl_element_get_ext_elements(
void *wsdl_element,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_array_list_t *AXIS2_CALL
axis2_woden_wsdl_element_get_ext_elements_of_type(
void *wsdl_element,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *elem_type);
axis2_bool_t AXIS2_CALL
axis2_woden_wsdl_element_has_ext_elements_for_namespace(
void *wsdl_element,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_url_t *namespc);
axis2_status_t AXIS2_CALL
axis2_woden_wsdl_element_add_ext_element(
void *wsdl_element,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_woden_ext_element_t *ext_el);
axis2_status_t AXIS2_CALL
axis2_woden_wsdl_element_remove_ext_element(
void *wsdl_element,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_woden_ext_element_t *ext_el);
axis2_array_list_t *AXIS2_CALL
axis2_woden_wsdl_element_get_ext_elements(
void *wsdl_element,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_array_list_t *AXIS2_CALL
axis2_woden_wsdl_element_get_ext_elements_of_type(
void *wsdl_element,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *ext_type);
axis2_bool_t AXIS2_CALL
axis2_woden_wsdl_element_has_ext_elements_for_namespace(
void *wsdl_element,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_url_t *namespc);
static axis2_woden_wsdl_element_t *
create(
- axis2_env_t **env);
+ const axis2_env_t *env);
static axis2_status_t
axis2_woden_wsdl_element_free_ops(
void *wsdl_element,
- axis2_env_t **env);
+ const axis2_env_t *env);
/************************Woden C Internal Methods******************************/
AXIS2_DECLARE(axis2_woden_wsdl_element_t *)
axis2_woden_wsdl_element_to_attr_extensible(
void *wsdl_element,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_wsdl_element_impl_t *wsdl_element_impl = NULL;
@@ -173,7 +173,7 @@
axis2_woden_wsdl_element_free_ops(wsdl_element, env);
wsdl_element_impl->wsdl_element.base.attr_extensible.ops =
- AXIS2_MALLOC((*env)->allocator,
+ AXIS2_MALLOC(env->allocator,
sizeof(axis2_woden_attr_extensible_ops_t));
axis2_woden_attr_extensible_resolve_methods(&(wsdl_element_impl->
wsdl_element.base.attr_extensible), env, NULL, wsdl_element_impl->methods);
@@ -184,7 +184,7 @@
AXIS2_DECLARE(axis2_woden_wsdl_element_t *)
axis2_woden_wsdl_element_to_element_extensible(
void *wsdl_element,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_wsdl_element_impl_t *wsdl_element_impl = NULL;
@@ -200,7 +200,7 @@
axis2_woden_wsdl_element_free_ops(wsdl_element, env);
wsdl_element_impl->wsdl_element.base.element_extensible.ops =
- AXIS2_MALLOC((*env)->allocator,
+ AXIS2_MALLOC(env->allocator,
sizeof(axis2_woden_element_extensible_ops_t));
axis2_woden_element_extensible_resolve_methods(&(wsdl_element_impl->
wsdl_element.base.element_extensible), env, NULL, wsdl_element_impl->methods);
@@ -211,12 +211,12 @@
/************************End of Woden C Internal Methods***********************/
static axis2_woden_wsdl_element_t *
create(
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_wsdl_element_impl_t *wsdl_element_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- wsdl_element_impl = AXIS2_MALLOC((*env)->allocator,
+ wsdl_element_impl = AXIS2_MALLOC(env->allocator,
sizeof(axis2_woden_wsdl_element_impl_t));
wsdl_element_impl->super = NULL;
@@ -228,7 +228,7 @@
wsdl_element_impl->wsdl_element.base.attr_extensible.ops = NULL;
wsdl_element_impl->wsdl_element.base.element_extensible.ops = NULL;
wsdl_element_impl->wsdl_element.ops =
- AXIS2_MALLOC((*env)->allocator,
+ AXIS2_MALLOC(env->allocator,
sizeof(axis2_woden_wsdl_element_ops_t));
wsdl_element_impl->wsdl_element.ops->free = axis2_woden_wsdl_element_free;
@@ -239,7 +239,7 @@
wsdl_element_impl->methods = axis2_hash_make(env);
if(!wsdl_element_impl->methods)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
axis2_hash_set(wsdl_element_impl->methods, "free",
@@ -278,7 +278,7 @@
AXIS2_DECLARE(axis2_woden_wsdl_element_t *)
axis2_woden_wsdl_element_create(
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_wsdl_element_impl_t *wsdl_element_impl = NULL;
@@ -299,7 +299,7 @@
wsdl_element_impl->super = axis2_hash_make(env);
if(!wsdl_element_impl->super)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
axis2_hash_set(wsdl_element_impl->super, "AXIS2_WODEN_WSDL_ELEMENT",
@@ -311,7 +311,7 @@
static axis2_status_t
axis2_woden_wsdl_element_free_ops(
void *wsdl_element,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_wsdl_element_impl_t *wsdl_element_impl = NULL;
@@ -320,14 +320,14 @@
if(wsdl_element_impl->wsdl_element.base.attr_extensible.ops)
{
- AXIS2_FREE((*env)->allocator, wsdl_element_impl->wsdl_element.base.
+ AXIS2_FREE(env->allocator, wsdl_element_impl->wsdl_element.base.
attr_extensible.ops);
wsdl_element_impl->wsdl_element.base.attr_extensible.ops = NULL;
}
if(wsdl_element_impl->wsdl_element.base.element_extensible.ops)
{
- AXIS2_FREE((*env)->allocator, wsdl_element_impl->wsdl_element.base.
+ AXIS2_FREE(env->allocator, wsdl_element_impl->wsdl_element.base.
element_extensible.ops);
wsdl_element_impl->wsdl_element.base.element_extensible.ops = NULL;
}
@@ -339,7 +339,7 @@
axis2_status_t AXIS2_CALL
axis2_woden_wsdl_element_free(
void *wsdl_element,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_wsdl_element_impl_t *wsdl_element_impl = NULL;
@@ -374,13 +374,13 @@
if(wsdl_element_impl->wsdl_element.ops)
{
- AXIS2_FREE((*env)->allocator, wsdl_element_impl->wsdl_element.ops);
+ AXIS2_FREE(env->allocator, wsdl_element_impl->wsdl_element.ops);
wsdl_element_impl->wsdl_element.ops = NULL;
}
if(wsdl_element_impl)
{
- AXIS2_FREE((*env)->allocator, wsdl_element_impl);
+ AXIS2_FREE(env->allocator, wsdl_element_impl);
wsdl_element_impl = NULL;
}
return AXIS2_SUCCESS;
@@ -389,7 +389,7 @@
axis2_hash_t *AXIS2_CALL
axis2_woden_wsdl_element_super_objs(
void *wsdl_element,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_wsdl_element_impl_t *wsdl_element_impl = NULL;
@@ -402,7 +402,7 @@
axis2_woden_obj_types_t AXIS2_CALL
axis2_woden_wsdl_element_type(
void *wsdl_element,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_wsdl_element_impl_t *wsdl_element_impl = NULL;
@@ -415,17 +415,17 @@
axis2_status_t AXIS2_CALL
axis2_woden_wsdl_element_resolve_methods(
axis2_woden_wsdl_element_t *wsdl_element,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_woden_wsdl_element_t *wsdl_element_impl,
axis2_hash_t *methods)
{
axis2_woden_wsdl_element_impl_t *wsdl_element_impl_l = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, methods, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
wsdl_element_impl_l = INTF_TO_IMPL(wsdl_element);
- wsdl_element->ops = AXIS2_MALLOC((*env)->allocator,
+ wsdl_element->ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_woden_wsdl_element_ops_t));
wsdl_element->ops->free = axis2_hash_get(methods, "free",
AXIS2_HASH_KEY_STRING);
@@ -440,7 +440,7 @@
axis2_status_t AXIS2_CALL
axis2_woden_wsdl_element_set_ext_attr(
void *wsdl_element,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *attr_type,
axis2_woden_xml_attr_t *attr)
{
@@ -448,8 +448,8 @@
axis2_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, attr_type, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, attr, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, attr_type, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, attr, AXIS2_FAILURE);
super = AXIS2_WODEN_WSDL_ELEMENT_SUPER_OBJS(wsdl_element, env);
wsdl_element_impl = INTF_TO_IMPL(axis2_hash_get(super,
"AXIS2_WODEN_WSDL_ELEMENT", AXIS2_HASH_KEY_STRING));
@@ -461,14 +461,14 @@
void *AXIS2_CALL
axis2_woden_wsdl_element_get_ext_attr(
void *wsdl_element,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *attr_type)
{
axis2_woden_wsdl_element_impl_t *wsdl_element_impl = NULL;
axis2_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, attr_type, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, attr_type, AXIS2_FAILURE);
super = AXIS2_WODEN_WSDL_ELEMENT_SUPER_OBJS(wsdl_element, env);
wsdl_element_impl = INTF_TO_IMPL(axis2_hash_get(super,
"AXIS2_WODEN_WSDL_ELEMENT", AXIS2_HASH_KEY_STRING));
@@ -480,7 +480,7 @@
axis2_array_list_t *AXIS2_CALL
axis2_woden_wsdl_element_get_ext_attrs(
void *wsdl_element,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_wsdl_element_impl_t *wsdl_element_impl = NULL;
axis2_hash_t *super = NULL;
@@ -497,14 +497,14 @@
axis2_array_list_t *AXIS2_CALL
axis2_woden_wsdl_element_get_ext_attrs_for_namespace(
void *wsdl_element,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_url_t *namespc)
{
axis2_woden_wsdl_element_impl_t *wsdl_element_impl = NULL;
axis2_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, namespc, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, namespc, AXIS2_FAILURE);
super = AXIS2_WODEN_WSDL_ELEMENT_SUPER_OBJS(wsdl_element, env);
wsdl_element_impl = INTF_TO_IMPL(axis2_hash_get(super,
"AXIS2_WODEN_WSDL_ELEMENT", AXIS2_HASH_KEY_STRING));
@@ -516,14 +516,14 @@
axis2_bool_t AXIS2_CALL
axis2_woden_wsdl_element_has_ext_attrs_for_namespace(
void *wsdl_element,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_url_t *namespc)
{
axis2_woden_wsdl_element_impl_t *wsdl_element_impl = NULL;
axis2_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, namespc, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, namespc, AXIS2_FAILURE);
super = AXIS2_WODEN_WSDL_ELEMENT_SUPER_OBJS(wsdl_element, env);
wsdl_element_impl = INTF_TO_IMPL(axis2_hash_get(super,
"AXIS2_WODEN_WSDL_ELEMENT", AXIS2_HASH_KEY_STRING));
@@ -535,14 +535,14 @@
axis2_status_t AXIS2_CALL
axis2_woden_wsdl_element_add_ext_element(
void *wsdl_element,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_woden_ext_element_t *ext_el)
{
axis2_woden_wsdl_element_impl_t *wsdl_element_impl = NULL;
axis2_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, ext_el, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, ext_el, AXIS2_FAILURE);
super = AXIS2_WODEN_WSDL_ELEMENT_SUPER_OBJS(wsdl_element, env);
wsdl_element_impl = INTF_TO_IMPL(axis2_hash_get(super,
"AXIS2_WODEN_WSDL_ELEMENT", AXIS2_HASH_KEY_STRING));
@@ -554,14 +554,14 @@
axis2_status_t AXIS2_CALL
axis2_woden_wsdl_element_remove_ext_element(
void *wsdl_element,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_woden_ext_element_t *ext_el)
{
axis2_woden_wsdl_element_impl_t *wsdl_element_impl = NULL;
axis2_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, ext_el, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, ext_el, AXIS2_FAILURE);
super = AXIS2_WODEN_WSDL_ELEMENT_SUPER_OBJS(wsdl_element, env);
wsdl_element_impl = INTF_TO_IMPL(axis2_hash_get(super,
"AXIS2_WODEN_WSDL_ELEMENT", AXIS2_HASH_KEY_STRING));
@@ -573,7 +573,7 @@
axis2_array_list_t *AXIS2_CALL
axis2_woden_wsdl_element_get_ext_elements(
void *wsdl_element,
-axis2_env_t **env)
+const axis2_env_t *env)
{
axis2_woden_wsdl_element_impl_t *wsdl_element_impl = NULL;
axis2_hash_t *super = NULL;
@@ -590,13 +590,13 @@
axis2_array_list_t *AXIS2_CALL
axis2_woden_wsdl_element_get_ext_elements_of_type(
void *wsdl_element,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *ext_type)
{
axis2_woden_wsdl_element_impl_t *wsdl_element_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, ext_type, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, ext_type, AXIS2_FAILURE);
axis2_hash_t *super = NULL;
super = AXIS2_WODEN_WSDL_ELEMENT_SUPER_OBJS(wsdl_element, env);
@@ -610,14 +610,14 @@
axis2_bool_t AXIS2_CALL
axis2_woden_wsdl_element_has_ext_elements_for_namespace(
void *wsdl_element,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_url_t *namespc)
{
axis2_woden_wsdl_element_impl_t *wsdl_element_impl = NULL;
axis2_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, namespc, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, namespc, AXIS2_FAILURE);
super = AXIS2_WODEN_WSDL_ELEMENT_SUPER_OBJS(wsdl_element, env);
wsdl_element_impl = INTF_TO_IMPL(axis2_hash_get(super,
"AXIS2_WODEN_WSDL_ELEMENT", AXIS2_HASH_KEY_STRING));
Modified: webservices/axis2/trunk/c/woden/src/xml/qname_or_token_any_attr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/xml/qname_or_token_any_attr.c?rev=410750&r1=410749&r2=410750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/xml/qname_or_token_any_attr.c (original)
+++ webservices/axis2/trunk/c/woden/src/xml/qname_or_token_any_attr.c Wed May 31 22:18:45 2006
@@ -40,42 +40,42 @@
axis2_status_t AXIS2_CALL
axis2_woden_qname_or_token_any_attr_free(
void *token_attr,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_woden_obj_types_t AXIS2_CALL
axis2_woden_qname_or_token_any_attr_type(
void *token_attr,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_woden_xml_attr_t *AXIS2_CALL
axis2_woden_qname_or_token_any_attr_get_base_impl(
void *token_attr,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_bool_t AXIS2_CALL
axis2_woden_qname_or_token_any_attr_is_qname(
void *token_attr,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_bool_t AXIS2_CALL
axis2_woden_qname_or_token_any_attr_is_token(
void *token_attr,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_qname_t *AXIS2_CALL
axis2_woden_qname_or_token_any_attr_get_qname(
void *token_attr,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_char_t *AXIS2_CALL
axis2_woden_qname_or_token_any_attr_get_token(
void *token_attr,
- axis2_env_t **env);
+ const axis2_env_t *env);
void *AXIS2_CALL
axis2_woden_qname_or_token_any_attr_convert(
void *token_attr,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_element_t *owner_el,
axis2_om_node_t *owner_node,
axis2_char_t *attr_value);
@@ -85,7 +85,7 @@
* parsing of native WSDL attributes is changed to use the XMLAttr interface.
*/
AXIS2_DECLARE(axis2_woden_qname_or_token_any_attr_t *)
-axis2_woden_qname_or_token_any_attr_create(axis2_env_t **env,
+axis2_woden_qname_or_token_any_attr_create(const axis2_env_t *env,
axis2_om_element_t *owner_el,
axis2_om_node_t *owner_node,
axis2_qname_t *attr_type,
@@ -95,7 +95,7 @@
token_attr_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- token_attr_impl = AXIS2_MALLOC((*env)->allocator,
+ token_attr_impl = AXIS2_MALLOC(env->allocator,
sizeof(axis2_woden_qname_or_token_any_attr_impl_t));
token_attr_impl->obj_type = AXIS2_WODEN_QNAME_OR_TOKEN_ANY_ATTR;
@@ -103,7 +103,7 @@
token_attr_impl->methods = NULL;
token_attr_impl->token_attr.ops =
- AXIS2_MALLOC((*env)->allocator,
+ AXIS2_MALLOC(env->allocator,
sizeof(axis2_woden_qname_or_token_any_attr_ops_t));
token_attr_impl->token_attr.ops->free =
@@ -128,7 +128,7 @@
token_attr_impl->methods = axis2_hash_make(env);
if(!token_attr_impl->methods)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
axis2_hash_set(token_attr_impl->methods, "free",
@@ -161,7 +161,7 @@
axis2_woden_obj_types_t AXIS2_CALL
axis2_woden_qname_or_token_any_attr_type(
void *token_attr,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_qname_or_token_any_attr_impl_t *
token_attr_impl = NULL;
@@ -175,7 +175,7 @@
axis2_status_t AXIS2_CALL
axis2_woden_qname_or_token_any_attr_free(
void *token_attr,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_qname_or_token_any_attr_impl_t *
token_attr_impl = NULL;
@@ -198,7 +198,7 @@
if((&(token_attr_impl->token_attr))->ops)
{
- AXIS2_FREE((*env)->allocator, (&(token_attr_impl->
+ AXIS2_FREE(env->allocator, (&(token_attr_impl->
token_attr))->ops);
(&(token_attr_impl->token_attr))->ops =
NULL;
@@ -206,7 +206,7 @@
if(token_attr_impl)
{
- AXIS2_FREE((*env)->allocator, token_attr_impl);
+ AXIS2_FREE(env->allocator, token_attr_impl);
token_attr_impl = NULL;
}
return AXIS2_SUCCESS;
@@ -215,7 +215,7 @@
axis2_woden_xml_attr_t *AXIS2_CALL
axis2_woden_qname_or_token_any_attr_get_base_impl(
void *token_attr,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_qname_or_token_any_attr_impl_t *
token_attr_impl = NULL;
@@ -231,11 +231,11 @@
axis2_woden_qname_or_token_any_attr_resolve_methods(
axis2_woden_qname_or_token_any_attr_t *
token_attr,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_hash_t *methods)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, methods, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
token_attr->ops->free = axis2_hash_get(methods,
"free", AXIS2_HASH_KEY_STRING);
@@ -259,7 +259,7 @@
axis2_bool_t AXIS2_CALL
axis2_woden_qname_or_token_any_attr_is_qname(
void *token_attr,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_qname_or_token_any_attr_impl_t *
token_attr_impl = NULL;
@@ -282,7 +282,7 @@
axis2_bool_t AXIS2_CALL
axis2_woden_qname_or_token_any_attr_is_token(
void *token_attr,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_qname_or_token_any_attr_impl_t *
token_attr_impl = NULL;
@@ -304,7 +304,7 @@
axis2_qname_t *AXIS2_CALL
axis2_woden_qname_or_token_any_attr_get_qname(
void *token_attr,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_qname_or_token_any_attr_impl_t *
token_attr_impl = NULL;
@@ -323,7 +323,7 @@
axis2_char_t *AXIS2_CALL
axis2_woden_qname_or_token_any_attr_get_token(
void *token_attr,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_woden_qname_or_token_any_attr_impl_t *
token_attr_impl = NULL;
@@ -345,7 +345,7 @@
void *AXIS2_CALL
axis2_woden_qname_or_token_any_attr_convert(
void *token_attr,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_element_t *owner_el,
axis2_om_node_t *owner_node,
axis2_char_t *attr_value)
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org