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 [6/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/xml_schema/src/xml_schema_app_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_app_info.c?rev=410750&r1=410749&r2=410750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_app_info.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_app_info.c Wed May 31 22:18:45 2006
@@ -48,54 +48,54 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_app_info_free(
void *app_info,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_hash_t *AXIS2_CALL
axis2_xml_schema_app_info_super_objs(
void *app_info,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_app_info_type(
void *app_info,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_obj_t *AXIS2_CALL
axis2_xml_schema_app_info_get_base_impl(void *app_info,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_char_t *AXIS2_CALL
axis2_xml_schema_app_info_get_source(void *app_info,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_app_info_set_source(void *app_info,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *source);
/* TODO replace (void *) mark up with node list */
void *AXIS2_CALL
axis2_xml_schema_app_info_get_markup(void *app_info,
- axis2_env_t **env);
+ const axis2_env_t *env);
/* TODO replace (void *) mark up with node list */
axis2_status_t AXIS2_CALL
axis2_xml_schema_app_info_set_markup(void *app_info,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *markup);
/****************** end macros ***********************************************/
AXIS2_EXTERN axis2_xml_schema_app_info_t * AXIS2_CALL
-axis2_xml_schema_app_info_create(axis2_env_t **env)
+axis2_xml_schema_app_info_create(const axis2_env_t *env)
{
axis2_xml_schema_app_info_impl_t *app_info_impl = NULL;
axis2_status_t status = AXIS2_FAILURE;
- app_info_impl = AXIS2_MALLOC((*env)->allocator,
+ app_info_impl = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_app_info_impl_t));
if(!app_info_impl)
{
- AXIS2_ERROR_SET((*env)->error , AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error , AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -108,13 +108,13 @@
app_info_impl->source = NULL;
app_info_impl->markup = NULL;
- app_info_impl->app_info.ops = AXIS2_MALLOC((*env)->allocator,
+ app_info_impl->app_info.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_app_info_ops_t));
if(!app_info_impl->app_info.ops)
{
axis2_xml_schema_app_info_free(&(app_info_impl->app_info), env);
- AXIS2_ERROR_SET((*env)->error , AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error , AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
app_info_impl->app_info.ops->free =
@@ -145,7 +145,7 @@
if(!app_info_impl->methods)
{
axis2_xml_schema_app_info_free(&(app_info_impl->app_info), env);
- 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(app_info_impl->methods, "free",
@@ -181,7 +181,7 @@
if(!app_info_impl->ht_super)
{
axis2_xml_schema_app_info_free(&(app_info_impl->app_info), env);
- 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(app_info_impl->ht_super, "AXIS2_XML_SCHEMA_APP_INFO",
@@ -197,7 +197,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_app_info_free(void *app_info,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_app_info_impl_t *app_info_impl = NULL;
@@ -206,7 +206,7 @@
if(NULL != app_info_impl->source)
{
- AXIS2_FREE((*env)->allocator, app_info_impl->source);
+ AXIS2_FREE(env->allocator, app_info_impl->source);
app_info_impl->source = NULL;
}
@@ -232,17 +232,17 @@
if(NULL != app_info_impl->app_info.ops)
{
- AXIS2_FREE((*env)->allocator, app_info_impl->app_info.ops);
+ AXIS2_FREE(env->allocator, app_info_impl->app_info.ops);
app_info_impl->app_info.ops = NULL;
}
if(NULL != app_info_impl->app_info.base.ops)
{
- AXIS2_FREE((*env)->allocator, app_info_impl->app_info.base.ops);
+ AXIS2_FREE(env->allocator, app_info_impl->app_info.base.ops);
app_info_impl->app_info.base.ops = NULL;
}
if(NULL != app_info_impl)
{
- AXIS2_FREE((*env)->allocator, app_info_impl);
+ AXIS2_FREE(env->allocator, app_info_impl);
app_info_impl = NULL;
}
return AXIS2_SUCCESS;
@@ -251,7 +251,7 @@
axis2_hash_t *AXIS2_CALL
axis2_xml_schema_app_info_super_objs(
void *app_info,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(app_info)->ht_super;
}
@@ -259,7 +259,7 @@
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_app_info_type(
void *app_info,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(app_info)->obj_type;
}
@@ -267,14 +267,14 @@
axis2_xml_schema_obj_t *AXIS2_CALL
axis2_xml_schema_app_info_get_base_impl(
void *app_info,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(app_info)->schema_obj;
}
axis2_char_t *AXIS2_CALL
axis2_xml_schema_app_info_get_source(void *app_info,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_app_info_impl_t *app_info_impl = NULL;
@@ -294,13 +294,13 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_app_info_set_source(void *app_info,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *source)
{
axis2_xml_schema_app_info_impl_t *app_info_impl = NULL;
axis2_hash_t *ht_super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, source, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, source, AXIS2_FAILURE);
ht_super = AXIS2_XML_SCHEMA_USE_SUPER_OBJS(app_info, env);
if(NULL != ht_super)
@@ -313,14 +313,14 @@
if(NULL != app_info_impl->source)
{
- AXIS2_FREE((*env)->allocator, app_info_impl->source);
+ AXIS2_FREE(env->allocator, app_info_impl->source);
app_info_impl->source = NULL;
}
app_info_impl->source = AXIS2_STRDUP(source, env);
if(!app_info_impl->source)
{
- 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;
@@ -329,7 +329,7 @@
/* TODO replace (void *) mark up with node list */
void *AXIS2_CALL
axis2_xml_schema_app_info_get_markup(void *app_info,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_app_info_impl_t *app_info_impl = NULL;
axis2_hash_t *ht_super = NULL;
@@ -348,13 +348,13 @@
/* TODO replace (void *) mark up with node list */
axis2_status_t AXIS2_CALL
axis2_xml_schema_app_info_set_markup(void *app_info,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *markup)
{
axis2_xml_schema_app_info_impl_t *app_info_impl = NULL;
axis2_hash_t *ht_super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, markup, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, markup, AXIS2_FAILURE);
ht_super = AXIS2_XML_SCHEMA_USE_SUPER_OBJS(app_info, env);
if(NULL != ht_super)
{
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute.c?rev=410750&r1=410749&r2=410750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute.c Wed May 31 22:18:45 2006
@@ -63,127 +63,127 @@
/******************* function prototypes **********************************/
axis2_status_t AXIS2_CALL
axis2_xml_schema_attribute_free(void *attr,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_annotated_t *AXIS2_CALL
axis2_xml_schema_attribute_get_base_impl(void *attr,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_attribute_type(void *attr,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_hash_t* AXIS2_CALL
axis2_xml_schema_attribute_super_objs(void *attr,
- axis2_env_t **env);
+ const axis2_env_t *env);
void * AXIS2_CALL
axis2_xml_schema_attribute_get_attr_type(
void *attr,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_char_t * AXIS2_CALL
axis2_xml_schema_attribute_get_default_value(
void *attr,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_attribute_set_default_value(
void *attr,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *default_value);
axis2_char_t* AXIS2_CALL
axis2_xml_schema_attribute_get_fixed_value(void *attr,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_attribute_set_fixed_value(void *attr,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *fixed_value);
axis2_xml_schema_form_t* AXIS2_CALL
axis2_xml_schema_attribute_get_schema_form (void *attr,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_attribute_set_schema_form(void *attr,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_form_t *schema_form);
axis2_qname_t* AXIS2_CALL
axis2_xml_schema_attribute_get_qname(void *attr,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_attribute_set_qname(void *attr,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qualified_name);
axis2_char_t* AXIS2_CALL
axis2_xml_schema_attribute_get_name(void *attr,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_attribute_set_name(void *attr,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *name);
axis2_qname_t* AXIS2_CALL
axis2_xml_schema_attribute_get_ref_name(void *attr,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_attribute_set_ref_name(void *attr,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *ref_name);
axis2_xml_schema_simple_type_t* AXIS2_CALL
axis2_xml_schema_attribute_get_schema_type(void *attr,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_attribute_set_schema_type(void *attr,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_simple_type_t* sch_type);
axis2_qname_t* AXIS2_CALL
axis2_xml_schema_attribute_get_schema_type_name(void *attr,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_attribute_set_schema_type_name(void *attr,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *sch_type_name);
axis2_xml_schema_use_t* AXIS2_CALL
axis2_xml_schema_attribute_get_use(void *attr,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_attribute_set_use(void *attr,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_use_t *use);
axis2_char_t* AXIS2_CALL
axis2_xml_schema_attribute_to_string(void *attr,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *prefix,
int tab);
/************************ end function prototypes ******************************/
AXIS2_EXTERN axis2_xml_schema_attribute_t * AXIS2_CALL
-axis2_xml_schema_attribute_create(axis2_env_t **env)
+axis2_xml_schema_attribute_create(const axis2_env_t *env)
{
axis2_xml_schema_attribute_impl_t *attr_impl = NULL;
axis2_status_t status = AXIS2_FAILURE;
- attr_impl = AXIS2_MALLOC((*env)->allocator,
+ attr_impl = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_attribute_impl_t));
if(!attr_impl)
{
- AXIS2_ERROR_SET((*env)->error , AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error , AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
attr_impl->attr.base.ops = NULL;
@@ -203,13 +203,13 @@
attr_impl->name = NULL;
attr_impl->ref_name = NULL;
- attr_impl->attr.ops = AXIS2_MALLOC((*env)->allocator,
+ attr_impl->attr.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_attribute_ops_t));
if(!attr_impl->attr.ops)
{
axis2_xml_schema_attribute_free(&(attr_impl->attr), env);
- AXIS2_ERROR_SET((*env)->error ,
+ AXIS2_ERROR_SET(env->error ,
AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -270,7 +270,7 @@
attr_impl->ht_super = axis2_hash_make(env);
if(!attr_impl->methods || !attr_impl->ht_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(attr_impl->methods, "free", AXIS2_HASH_KEY_STRING,
@@ -284,7 +284,7 @@
if(!attr_impl->methods)
{
axis2_xml_schema_attribute_free(&(attr_impl->attr), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -306,7 +306,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_attribute_free(void *attr,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_attribute_impl_t *attr_impl = NULL;
@@ -324,17 +324,17 @@
}
if(NULL != attr_impl->default_value)
{
- AXIS2_FREE((*env)->allocator, attr_impl->default_value);
+ AXIS2_FREE(env->allocator, attr_impl->default_value);
attr_impl->default_value = NULL;
}
if(NULL != attr_impl->default_value)
{
- AXIS2_FREE((*env)->allocator, attr_impl->fixed_value);
+ AXIS2_FREE(env->allocator, attr_impl->fixed_value);
attr_impl->fixed_value = NULL;
}
if(NULL != attr_impl->name)
{
- AXIS2_FREE((*env)->allocator, attr_impl->name);
+ AXIS2_FREE(env->allocator, attr_impl->name);
attr_impl->name = NULL;
}
@@ -363,23 +363,23 @@
if(NULL != attr_impl->attr.ops)
{
- AXIS2_FREE((*env)->allocator, attr_impl->attr.ops);
+ AXIS2_FREE(env->allocator, attr_impl->attr.ops);
attr_impl->attr.ops = NULL;
}
if(NULL != attr_impl->attr.base.ops)
{
- AXIS2_FREE((*env)->allocator, attr_impl->attr.base.ops);
+ AXIS2_FREE(env->allocator, attr_impl->attr.base.ops);
attr_impl->attr.base.ops = NULL;
}
- AXIS2_FREE((*env)->allocator, attr_impl);
+ AXIS2_FREE(env->allocator, attr_impl);
attr_impl = NULL;
return AXIS2_SUCCESS;
}
axis2_xml_schema_annotated_t *AXIS2_CALL
axis2_xml_schema_attribute_get_base_impl(void *attr,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_attribute_impl_t *attr_impl = NULL;
@@ -392,23 +392,23 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_xml_schema_attribute_resolve_methods(
axis2_xml_schema_attribute_t *attr,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_attribute_t *attr_impl,
axis2_hash_t *methods)
{
axis2_xml_schema_attribute_impl_t *any_impl_l = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, attr_impl, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, methods, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, attr_impl, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
any_impl_l = (axis2_xml_schema_attribute_impl_t *) attr_impl;
- attr->ops = AXIS2_MALLOC((*env)->allocator,
+ attr->ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_attribute_ops_t));
if(NULL != attr->ops)
{
- AXIS2_ERROR_SET((*env)->error,
+ AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
@@ -435,14 +435,14 @@
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_attribute_type(void *attr,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(attr)->obj_type;
}
axis2_hash_t* AXIS2_CALL
axis2_xml_schema_attribute_super_objs(void *attr,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(attr)->ht_super;
}
@@ -450,7 +450,7 @@
void * AXIS2_CALL
axis2_xml_schema_attribute_get_attr_type(
void *attr,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(attr)->attribute_type;
}
@@ -458,7 +458,7 @@
axis2_char_t * AXIS2_CALL
axis2_xml_schema_attribute_get_default_value(
void *attr,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(attr)->default_value;
}
@@ -466,15 +466,15 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_attribute_set_default_value(
void *attr,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *default_value)
{
axis2_xml_schema_attribute_impl_t *attr_impl = NULL;
- AXIS2_PARAM_CHECK((*env)->error, default_value, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, default_value, AXIS2_FAILURE);
attr_impl = AXIS2_INTF_TO_IMPL(attr);
if(NULL != attr_impl->default_value)
{
- AXIS2_FREE((*env)->allocator, attr_impl->default_value);
+ AXIS2_FREE(env->allocator, attr_impl->default_value);
attr_impl->default_value = NULL;
}
attr_impl->default_value = AXIS2_STRDUP(default_value, env);
@@ -483,22 +483,22 @@
axis2_char_t* AXIS2_CALL
axis2_xml_schema_attribute_get_fixed_value(void *attr,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(attr)->fixed_value;
}
axis2_status_t AXIS2_CALL
axis2_xml_schema_attribute_set_fixed_value(void *attr,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *fixed_value)
{
axis2_xml_schema_attribute_impl_t *attr_impl = NULL;
- AXIS2_PARAM_CHECK((*env)->error, fixed_value, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, fixed_value, AXIS2_FAILURE);
attr_impl = AXIS2_INTF_TO_IMPL(attr);
if(NULL != attr_impl->fixed_value)
{
- AXIS2_FREE((*env)->allocator, attr_impl->fixed_value);
+ AXIS2_FREE(env->allocator, attr_impl->fixed_value);
attr_impl->fixed_value = NULL;
}
attr_impl->fixed_value = AXIS2_STRDUP(fixed_value, env);
@@ -507,18 +507,18 @@
axis2_xml_schema_form_t* AXIS2_CALL
axis2_xml_schema_attribute_get_schema_form(void *attr,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(attr)->form;
}
axis2_status_t AXIS2_CALL
axis2_xml_schema_attribute_set_schema_form(void *attr,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_form_t *schema_form)
{
axis2_xml_schema_attribute_impl_t *attr_impl = NULL;
- AXIS2_PARAM_CHECK((*env)->error, schema_form, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, schema_form, AXIS2_FAILURE);
attr_impl = AXIS2_INTF_TO_IMPL(attr);
if(NULL != attr_impl->form)
{
@@ -531,18 +531,18 @@
axis2_qname_t* AXIS2_CALL
axis2_xml_schema_attribute_get_qname(void *attr,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(attr)->qualified_name;
}
axis2_status_t AXIS2_CALL
axis2_xml_schema_attribute_set_qname(void *attr,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qualified_name)
{
axis2_xml_schema_attribute_impl_t *attr_impl = NULL;
- AXIS2_PARAM_CHECK((*env)->error, qualified_name, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, qualified_name, AXIS2_FAILURE);
attr_impl = AXIS2_INTF_TO_IMPL(attr);
if(NULL != attr_impl->qualified_name)
{
@@ -557,22 +557,22 @@
axis2_char_t* AXIS2_CALL
axis2_xml_schema_attribute_get_name(void *attr,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(attr)->name;
}
axis2_status_t AXIS2_CALL
axis2_xml_schema_attribute_set_name(void *attr,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *name)
{
axis2_xml_schema_attribute_impl_t *attr_impl = NULL;
- AXIS2_PARAM_CHECK((*env)->error, name, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, name, AXIS2_FAILURE);
attr_impl = AXIS2_INTF_TO_IMPL(attr);
if(NULL != attr_impl->name)
{
- AXIS2_FREE((*env)->allocator, attr_impl->name);
+ AXIS2_FREE(env->allocator, attr_impl->name);
attr_impl->name = NULL;
}
attr_impl->name = AXIS2_STRDUP(name, env);
@@ -581,18 +581,18 @@
axis2_qname_t* AXIS2_CALL
axis2_xml_schema_attribute_get_ref_name(void *attr,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(attr)->ref_name;
}
axis2_status_t AXIS2_CALL
axis2_xml_schema_attribute_set_ref_name(void *attr,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *ref_name)
{
axis2_xml_schema_attribute_impl_t *attr_impl = NULL;
- AXIS2_PARAM_CHECK((*env)->error, ref_name, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, ref_name, AXIS2_FAILURE);
attr_impl = AXIS2_INTF_TO_IMPL(attr);
if(NULL != attr_impl->ref_name)
{
@@ -604,18 +604,18 @@
axis2_xml_schema_simple_type_t* AXIS2_CALL
axis2_xml_schema_attribute_get_schema_type(void *attr,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(attr)->schema_type;
}
axis2_status_t AXIS2_CALL
axis2_xml_schema_attribute_set_schema_type(void *attr,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_simple_type_t* sch_type)
{
axis2_xml_schema_attribute_impl_t *attr_impl = NULL;
- AXIS2_PARAM_CHECK((*env)->error, sch_type, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, sch_type, AXIS2_FAILURE);
attr_impl = AXIS2_INTF_TO_IMPL(attr);
if(NULL != attr_impl->schema_type)
{
@@ -628,7 +628,7 @@
axis2_qname_t* AXIS2_CALL
axis2_xml_schema_attribute_get_schema_type_name(void *attr,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(attr)->schema_type_name;
}
@@ -636,11 +636,11 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_attribute_set_schema_type_name(void *attr,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *sch_type_name)
{
axis2_xml_schema_attribute_impl_t *attr_impl = NULL;
- AXIS2_PARAM_CHECK((*env)->error, sch_type_name, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, sch_type_name, AXIS2_FAILURE);
attr_impl = AXIS2_INTF_TO_IMPL(attr);
if(NULL != attr_impl->schema_type_name)
{
@@ -653,18 +653,18 @@
axis2_xml_schema_use_t* AXIS2_CALL
axis2_xml_schema_attribute_get_use(void *attr,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(attr)->use;
}
axis2_status_t AXIS2_CALL
axis2_xml_schema_attribute_set_use(void *attr,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_use_t *use)
{
axis2_xml_schema_attribute_impl_t *attr_impl = NULL;
- AXIS2_PARAM_CHECK((*env)->error, use, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, use, AXIS2_FAILURE);
attr_impl = AXIS2_INTF_TO_IMPL(attr);
if(NULL != attr_impl->use)
{
@@ -677,7 +677,7 @@
axis2_char_t* AXIS2_CALL
axis2_xml_schema_attribute_to_string(void *attr,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *prefix,
int tab)
{
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute_group.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute_group.c?rev=410750&r1=410749&r2=410750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute_group.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute_group.c Wed May 31 22:18:45 2006
@@ -49,62 +49,62 @@
/******************* function prototypes **********************************/
axis2_status_t AXIS2_CALL
axis2_xml_schema_attribute_group_free(void *attr_grp,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_annotated_t *AXIS2_CALL
axis2_xml_schema_attribute_group_get_base_impl(void *attr_grp,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_attribute_group_type(void *attr_grp,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_hash_t* AXIS2_CALL
axis2_xml_schema_attribute_group_super_objs(void *attr_grp,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_any_attribute_t* AXIS2_CALL
axis2_xml_schema_attribute_group_get_any_attribute(
void *attr_grp,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_attribute_group_set_any_attribute(
void *attr_grp,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_any_attribute_t *any_attr);
axis2_xml_schema_obj_collection_t* AXIS2_CALL
axis2_xml_schema_attribute_group_get_attributes(void *attr_grp,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_attribute_group_set_attributes(void *attr_grp,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_obj_collection_t *attrs);
axis2_char_t* AXIS2_CALL
axis2_xml_schema_attribute_group_get_name(void *attr_grp,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_attribute_group_set_name(void *attr_grp,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *name);
/************************ end function prototypes ******************************/
AXIS2_EXTERN axis2_xml_schema_attribute_group_t * AXIS2_CALL
-axis2_xml_schema_attribute_group_create(axis2_env_t **env)
+axis2_xml_schema_attribute_group_create(const axis2_env_t *env)
{
axis2_xml_schema_attribute_group_impl_t *attr_impl = NULL;
axis2_status_t status = AXIS2_FAILURE;
- attr_impl = AXIS2_MALLOC((*env)->allocator,
+ attr_impl = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_attribute_group_impl_t));
if(!attr_impl)
{
- AXIS2_ERROR_SET((*env)->error , AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error , AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
attr_impl->attr_grp.base.ops = NULL;
@@ -117,13 +117,13 @@
attr_impl->attributes = NULL;
attr_impl->obj_type = AXIS2_XML_SCHEMA_ATTRIBUTE_GROUP;
- attr_impl->attr_grp.ops = AXIS2_MALLOC((*env)->allocator,
+ attr_impl->attr_grp.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_attribute_group_ops_t));
if(!attr_impl->attr_grp.ops)
{
axis2_xml_schema_attribute_group_free(&(attr_impl->attr_grp), env);
- AXIS2_ERROR_SET((*env)->error ,
+ AXIS2_ERROR_SET(env->error ,
AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -153,7 +153,7 @@
attr_impl->ht_super = axis2_hash_make(env);
if(!attr_impl->methods || !attr_impl->ht_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(attr_impl->methods, "free", AXIS2_HASH_KEY_STRING,
@@ -167,7 +167,7 @@
if(!attr_impl->methods)
{
axis2_xml_schema_attribute_group_free(&(attr_impl->attr_grp), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -189,7 +189,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_attribute_group_free(void *attr_grp,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_attribute_group_impl_t *attr_impl = NULL;
@@ -214,7 +214,7 @@
}
if(NULL != attr_impl->name)
{
- AXIS2_FREE((*env)->allocator, attr_impl->name);
+ AXIS2_FREE(env->allocator, attr_impl->name);
attr_impl->name = NULL;
}
@@ -232,23 +232,23 @@
if(NULL != attr_impl->attr_grp.ops)
{
- AXIS2_FREE((*env)->allocator, attr_impl->attr_grp.ops);
+ AXIS2_FREE(env->allocator, attr_impl->attr_grp.ops);
attr_impl->attr_grp.ops = NULL;
}
if(NULL != attr_impl->attr_grp.base.ops)
{
- AXIS2_FREE((*env)->allocator, attr_impl->attr_grp.base.ops);
+ AXIS2_FREE(env->allocator, attr_impl->attr_grp.base.ops);
attr_impl->attr_grp.base.ops = NULL;
}
- AXIS2_FREE((*env)->allocator, attr_impl);
+ AXIS2_FREE(env->allocator, attr_impl);
attr_impl = NULL;
return AXIS2_SUCCESS;
}
axis2_xml_schema_annotated_t *AXIS2_CALL
axis2_xml_schema_attribute_group_get_base_impl(void *attr_grp,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_attribute_group_impl_t *attr_impl = NULL;
@@ -261,23 +261,23 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_xml_schema_attribute_group_resolve_methods(
axis2_xml_schema_attribute_group_t *attr_grp,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_attribute_group_t *attr_impl,
axis2_hash_t *methods)
{
axis2_xml_schema_attribute_group_impl_t *any_impl_l = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, attr_impl, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, methods, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, attr_impl, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
any_impl_l = (axis2_xml_schema_attribute_group_impl_t *) attr_impl;
- attr_grp->ops = AXIS2_MALLOC((*env)->allocator,
+ attr_grp->ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_attribute_group_ops_t));
if(NULL != attr_grp->ops)
{
- AXIS2_ERROR_SET((*env)->error,
+ AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
@@ -304,14 +304,14 @@
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_attribute_group_type(void *attr_grp,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(attr_grp)->obj_type;
}
axis2_hash_t* AXIS2_CALL
axis2_xml_schema_attribute_group_super_objs(void *attr_grp,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(attr_grp)->ht_super;
}
@@ -319,7 +319,7 @@
axis2_xml_schema_any_attribute_t* AXIS2_CALL
axis2_xml_schema_attribute_group_get_any_attribute(
void *attr_grp,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(attr_grp)->any_attribute;
}
@@ -327,11 +327,11 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_attribute_group_set_any_attribute(
void *attr_grp,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_any_attribute_t *any_attr)
{
axis2_xml_schema_attribute_group_impl_t *attr_grp_impl = NULL;
- AXIS2_PARAM_CHECK((*env)->error, any_attr, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, any_attr, AXIS2_FAILURE);
attr_grp_impl = AXIS2_INTF_TO_IMPL(attr_grp);
if(NULL != attr_grp_impl->any_attribute)
{
@@ -343,18 +343,18 @@
axis2_xml_schema_obj_collection_t* AXIS2_CALL
axis2_xml_schema_attribute_group_get_attributes(void *attr_grp,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(attr_grp)->attributes;
}
axis2_status_t AXIS2_CALL
axis2_xml_schema_attribute_group_set_attributes(void *attr_grp,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_obj_collection_t *attrs)
{
axis2_xml_schema_attribute_group_impl_t *attr_grp_impl = NULL;
- AXIS2_PARAM_CHECK((*env)->error, attrs, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, attrs, AXIS2_FAILURE);
attr_grp_impl = AXIS2_INTF_TO_IMPL(attr_grp);
if(NULL != attr_grp_impl->attributes)
{
@@ -366,22 +366,22 @@
axis2_char_t* AXIS2_CALL
axis2_xml_schema_attribute_group_get_name(void *attr_grp,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(attr_grp)->name;
}
axis2_status_t AXIS2_CALL
axis2_xml_schema_attribute_group_set_name(void *attr_grp,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *name)
{
axis2_xml_schema_attribute_group_impl_t *attr_grp_impl = NULL;
- AXIS2_PARAM_CHECK((*env)->error, name, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, name, AXIS2_FAILURE);
attr_grp_impl = AXIS2_INTF_TO_IMPL(attr_grp);
if(NULL != attr_grp_impl->name)
{
- AXIS2_FREE((*env)->allocator, attr_grp_impl->name);
+ AXIS2_FREE(env->allocator, attr_grp_impl->name);
attr_grp_impl->name = NULL;
}
attr_grp_impl->name = AXIS2_STRDUP(name, env);
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute_group_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute_group_ref.c?rev=410750&r1=410749&r2=410750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute_group_ref.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute_group_ref.c Wed May 31 22:18:45 2006
@@ -46,44 +46,44 @@
/******************* function prototypes **********************************/
axis2_status_t AXIS2_CALL
axis2_xml_schema_attribute_group_ref_free(void *grp_ref,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_annotated_t *AXIS2_CALL
axis2_xml_schema_attribute_group_ref_get_base_impl(void *grp_ref,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_attribute_group_ref_type(void *grp_ref,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_hash_t* AXIS2_CALL
axis2_xml_schema_attribute_group_ref_super_objs(void *grp_ref,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_qname_t* AXIS2_CALL
axis2_xml_schema_attribute_group_ref_get_ref_qname(
void *grp_ref,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_attribute_group_ref_set_ref_qname(
void *grp_ref,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *any_attr);
/************************ end function prototypes ******************************/
AXIS2_EXTERN axis2_xml_schema_attribute_group_ref_t * AXIS2_CALL
-axis2_xml_schema_attribute_group_ref_create(axis2_env_t **env)
+axis2_xml_schema_attribute_group_ref_create(const axis2_env_t *env)
{
axis2_xml_schema_attribute_group_ref_impl_t *attr_impl = NULL;
axis2_status_t status = AXIS2_FAILURE;
- attr_impl = AXIS2_MALLOC((*env)->allocator,
+ attr_impl = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_attribute_group_ref_impl_t));
if(!attr_impl)
{
- AXIS2_ERROR_SET((*env)->error , AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error , AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
attr_impl->grp_ref.base.ops = NULL;
@@ -94,13 +94,13 @@
attr_impl->ref_qname = NULL;
attr_impl->obj_type = AXIS2_XML_SCHEMA_ATTRIBUTE_GROUP_REF;
- attr_impl->grp_ref.ops = AXIS2_MALLOC((*env)->allocator,
+ attr_impl->grp_ref.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_attribute_group_ref_ops_t));
if(!attr_impl->grp_ref.ops)
{
axis2_xml_schema_attribute_group_ref_free(&(attr_impl->grp_ref), env);
- AXIS2_ERROR_SET((*env)->error ,
+ AXIS2_ERROR_SET(env->error ,
AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -123,7 +123,7 @@
attr_impl->ht_super = axis2_hash_make(env);
if(!attr_impl->methods || !attr_impl->ht_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(attr_impl->methods, "free", AXIS2_HASH_KEY_STRING,
@@ -137,7 +137,7 @@
if(!attr_impl->methods)
{
axis2_xml_schema_attribute_group_ref_free(&(attr_impl->grp_ref), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -159,7 +159,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_attribute_group_ref_free(void *grp_ref,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_attribute_group_ref_impl_t *attr_impl = NULL;
@@ -190,23 +190,23 @@
if(NULL != attr_impl->grp_ref.ops)
{
- AXIS2_FREE((*env)->allocator, attr_impl->grp_ref.ops);
+ AXIS2_FREE(env->allocator, attr_impl->grp_ref.ops);
attr_impl->grp_ref.ops = NULL;
}
if(NULL != attr_impl->grp_ref.base.ops)
{
- AXIS2_FREE((*env)->allocator, attr_impl->grp_ref.base.ops);
+ AXIS2_FREE(env->allocator, attr_impl->grp_ref.base.ops);
attr_impl->grp_ref.base.ops = NULL;
}
- AXIS2_FREE((*env)->allocator, attr_impl);
+ AXIS2_FREE(env->allocator, attr_impl);
attr_impl = NULL;
return AXIS2_SUCCESS;
}
axis2_xml_schema_annotated_t *AXIS2_CALL
axis2_xml_schema_attribute_group_ref_get_base_impl(void *grp_ref,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_attribute_group_ref_impl_t *attr_impl = NULL;
@@ -219,23 +219,23 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_xml_schema_attribute_group_ref_resolve_methods(
axis2_xml_schema_attribute_group_ref_t *grp_ref,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_attribute_group_ref_t *attr_impl,
axis2_hash_t *methods)
{
axis2_xml_schema_attribute_group_ref_impl_t *any_impl_l = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, attr_impl, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, methods, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, attr_impl, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
any_impl_l = (axis2_xml_schema_attribute_group_ref_impl_t *) attr_impl;
- grp_ref->ops = AXIS2_MALLOC((*env)->allocator,
+ grp_ref->ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_attribute_group_ref_ops_t));
if(NULL != grp_ref->ops)
{
- AXIS2_ERROR_SET((*env)->error,
+ AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
@@ -259,14 +259,14 @@
*/
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_attribute_group_ref_type(void *grp_ref,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(grp_ref)->obj_type;
}
axis2_hash_t* AXIS2_CALL
axis2_xml_schema_attribute_group_ref_super_objs(void *grp_ref,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(grp_ref)->ht_super;
}
@@ -274,7 +274,7 @@
axis2_qname_t* AXIS2_CALL
axis2_xml_schema_attribute_group_ref_get_ref_qname(
void *grp_ref,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(grp_ref)->ref_qname;
}
@@ -282,11 +282,11 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_attribute_group_ref_set_ref_qname(
void *grp_ref,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *ref_qname)
{
axis2_xml_schema_attribute_group_ref_impl_t *attr_grp_impl = NULL;
- AXIS2_PARAM_CHECK((*env)->error, ref_qname, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, ref_qname, AXIS2_FAILURE);
attr_grp_impl = AXIS2_INTF_TO_IMPL(grp_ref);
if(NULL != attr_grp_impl->ref_qname)
{
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c?rev=410750&r1=410749&r2=410750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c Wed May 31 22:18:45 2006
@@ -46,90 +46,90 @@
axis2_xml_schema_t* AXIS2_CALL
axis2_xml_schema_builder_build(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_document_t *om_doc,
axis2_char_t *uri);
axis2_xml_schema_t* AXIS2_CALL
axis2_xml_schema_builder_build_with_root_node(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *root,
axis2_char_t *uri);
axis2_status_t AXIS2_CALL
axis2_xml_schema_builder_free(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env);
+ const axis2_env_t *env);
static axis2_xml_schema_t*
handle_xml_schema_element(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *ele_node,
axis2_char_t *uri);
static axis2_xml_schema_annotation_t*
handle_annotation(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *ann_node,
axis2_om_node_t *sch_node);
static axis2_xml_schema_redefine_t*
handle_redefine(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *redefine_node,
axis2_om_node_t *sch_node);
static axis2_status_t
set_namespace_attributes(
axis2_xml_schema_builder_t* builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_t *schema,
axis2_om_node_t *sch_node);
static axis2_status_t
put_namespace(
axis2_xml_schema_builder_t* builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *prefix,
axis2_char_t *ns);
static axis2_xml_schema_simple_type_t*
handle_simple_type(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *simple_node,
axis2_om_node_t *sch_node);
static axis2_xml_schema_complex_type_t*
handle_complex_type(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *complex_node,
axis2_om_node_t *schema_node);
static axis2_xml_schema_simple_content_t*
handle_simple_content(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *simple_node,
axis2_om_node_t *schema_node);
static axis2_xml_schema_complex_content_t*
handle_complex_content(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *complex_node,
axis2_om_node_t *schema_node);
static axis2_xml_schema_simple_content_restriction_t*
handle_simple_content_restriction(
axis2_xml_schema_builder_t* builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *res_node,
axis2_om_node_t *schema_node);
@@ -137,98 +137,98 @@
static axis2_xml_schema_simple_content_extension_t*
handle_simple_content_extension(
axis2_xml_schema_builder_t* builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *sim_ext_node,
axis2_om_node_t *schema_node);
static axis2_xml_schema_complex_content_restriction_t*
handle_complex_content_restriction(
axis2_xml_schema_builder_t* builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *res_node,
axis2_om_node_t *schema_node);
static axis2_xml_schema_complex_content_extension_t*
handle_complex_content_extension(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *cmp_ext_node,
axis2_om_node_t *schema_node);
static axis2_xml_schema_attribute_group_ref_t*
handle_attribute_group_ref(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *attr_grp_node,
axis2_om_node_t *schema_node);
static axis2_xml_schema_group_base_t*
handle_sequence(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *seq_node,
axis2_om_node_t *schema_node);
static axis2_xml_schema_any_t*
handle_any(
axis2_xml_schema_builder_t* builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *any_node,
axis2_om_node_t *schema_node);
static axis2_xml_schema_group_base_t*
handle_choice(
axis2_xml_schema_builder_t* builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *choice_node,
axis2_om_node_t *schema_node);
static axis2_xml_schema_group_base_t*
handle_all(
axis2_xml_schema_builder_t* builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *all_node,
axis2_om_node_t *schema_node);
static axis2_xml_schema_group_t*
handle_group(
axis2_xml_schema_builder_t* builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *group_node,
axis2_om_node_t *schema_node);
static axis2_xml_schema_attribute_group_t*
handle_attribute_group(
axis2_xml_schema_builder_t* builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *attr_grp_node,
axis2_om_node_t *schema_node);
static axis2_xml_schema_any_attribute_t*
handle_any_attribute(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *any_attr_node,
axis2_om_node_t *schema_node);
static axis2_xml_schema_group_ref_t*
handle_group_ref(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *grp_ref_node,
axis2_om_node_t *schema_node);
static axis2_xml_schema_attribute_t*
handle_attribute(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *attr_node,
axis2_om_node_t *schema_node);
static axis2_xml_schema_element_t*
handle_element(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *ele_node,
axis2_om_node_t *schema_node,
axis2_bool_t is_global);
@@ -236,14 +236,14 @@
static axis2_status_t
populate_element_namespaces(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *ele_node,
axis2_hash_t* ele_to_ns_map);
static axis2_xml_schema_identity_constraint_t*
handle_constraint(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *attr_node,
axis2_om_node_t *schema_node,
int type);
@@ -251,14 +251,14 @@
static axis2_xml_schema_import_t*
handle_import(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *import_node,
axis2_om_node_t *schema_node);
static axis2_xml_schema_external_t *
handle_include(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *include_node,
axis2_om_node_t *schema_node);
@@ -266,67 +266,67 @@
static axis2_xml_schema_app_info_t*
handle_app_info(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *content);
static axis2_xml_schema_documentation_t*
handle_documentation(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *content);
static long
get_min_occurs(
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *content);
static long
get_max_occurs(
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *content);
static axis2_xml_schema_derivation_method_t*
get_derivation(
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *ele_node,
axis2_char_t *attr_name);
static axis2_char_t *
get_enum_string(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_element_t *om_ele,
axis2_char_t *attr_name);
axis2_xml_schema_t* AXIS2_CALL
axis2_xml_schema_builder_resolve_xml_schema(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *target_namespace,
axis2_char_t *schema_location,
axis2_char_t *base_uri);
static axis2_bool_t
value_exist_in_hash(
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_hash_t *ht,
axis2_char_t *value);
static axis2_xml_schema_form_t*
get_from_default(
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *ele_node,
axis2_char_t *attr_name);
static axis2_xml_schema_t *
resolve_xml_schema(
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *target_namespace,
axis2_char_t *schema_location);
static axis2_xml_schema_t *
resolve_xml_schema_with_uri(
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *target_namespace,
axis2_char_t *schema_location,
axis2_char_t *base_uri);
@@ -334,24 +334,24 @@
static axis2_xml_schema_annotation_t*
handle_annotation_with_element(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *ann_node);
/*************** end function prototypes **************************************/
AXIS2_EXTERN axis2_xml_schema_builder_t * AXIS2_CALL
axis2_xml_schema_builder_create(
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_collection_t *sch_collection)
{
axis2_xml_schema_builder_impl_t *builder_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, sch_collection, NULL);
- builder_impl = (axis2_xml_schema_builder_impl_t *)AXIS2_MALLOC((*env)->allocator,
+ AXIS2_PARAM_CHECK(env->error, sch_collection, NULL);
+ builder_impl = (axis2_xml_schema_builder_impl_t *)AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_builder_impl_t));
if(!builder_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -370,11 +370,11 @@
}
builder_impl->collection = sch_collection;
- builder_impl->builder.ops = AXIS2_MALLOC((*env)->allocator,
+ builder_impl->builder.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_builder_t));
if(!builder_impl->builder.ops)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
axis2_xml_schema_builder_free(&(builder_impl->builder), env);
return NULL;
}
@@ -394,12 +394,12 @@
axis2_xml_schema_t* AXIS2_CALL
axis2_xml_schema_builder_build(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_document_t *om_doc,
axis2_char_t *uri)
{
axis2_xml_schema_builder_impl_t *builder_impl = NULL;
- AXIS2_PARAM_CHECK((*env)->error, om_doc, NULL);
+ AXIS2_PARAM_CHECK(env->error, om_doc, NULL);
builder_impl = AXIS2_INTF_TO_IMPL(builder);
builder_impl->om_doc = om_doc;
builder_impl->root_node = AXIS2_OM_DOCUMENT_GET_ROOT_ELEMENT(om_doc, env);
@@ -411,7 +411,7 @@
axis2_xml_schema_t* AXIS2_CALL
axis2_xml_schema_builder_build_with_root_node(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *root,
axis2_char_t *uri)
{
@@ -421,7 +421,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_builder_free(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_builder_impl_t *builder_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -434,7 +434,7 @@
static axis2_xml_schema_t*
handle_xml_schema_element(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *ele_node,
axis2_char_t *uri)
{
@@ -457,7 +457,7 @@
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, ele_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, ele_node, NULL);
builder_impl = AXIS2_INTF_TO_IMPL(builder);
set_namespace_attributes( builder, env, builder_impl->schema, ele_node);
@@ -715,7 +715,7 @@
static axis2_xml_schema_annotation_t*
handle_annotation(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *ann_node,
axis2_om_node_t *sch_node)
{
@@ -725,9 +725,9 @@
axis2_om_element_t *ann_ele = NULL;
axis2_xml_schema_obj_collection_t *collection = NULL;
- AXIS2_PARAM_CHECK((*env)->error, builder, NULL);
- AXIS2_PARAM_CHECK((*env)->error, ann_node, NULL);
- AXIS2_PARAM_CHECK((*env)->error, sch_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, builder, NULL);
+ AXIS2_PARAM_CHECK(env->error, ann_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, sch_node, NULL);
annotation = axis2_xml_schema_annotation_create(env);
collection = AXIS2_XML_SCHEMA_ANNOTATION_GET_ITEMS(annotation, env);
@@ -764,7 +764,7 @@
static axis2_xml_schema_redefine_t*
handle_redefine(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *redefine_node,
axis2_om_node_t *sch_node)
{
@@ -778,8 +778,8 @@
axis2_xml_schema_obj_table_t *schema_types = NULL;
axis2_xml_schema_obj_collection_t *items = NULL;
- AXIS2_PARAM_CHECK((*env)->error, redefine_node, NULL);
- AXIS2_PARAM_CHECK((*env)->error, sch_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, redefine_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, sch_node, NULL);
redefine_ele = (axis2_om_element_t*)AXIS2_OM_NODE_GET_DATA_ELEMENT(redefine_node, env);
if(!redefine_ele)
@@ -858,7 +858,7 @@
static axis2_status_t
set_namespace_attributes(
axis2_xml_schema_builder_t* builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_t *schema,
axis2_om_node_t *sch_node)
{
@@ -872,8 +872,8 @@
axis2_qname_t *target_ns_qn = NULL;
axis2_char_t *contain = NULL;
- AXIS2_PARAM_CHECK((*env)->error, schema, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, sch_node, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, schema, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, sch_node, AXIS2_FAILURE);
if(AXIS2_OM_NODE_GET_NODE_TYPE(sch_node, env) != AXIS2_OM_ELEMENT)
return AXIS2_FAILURE;
@@ -955,20 +955,20 @@
static axis2_status_t
put_namespace(
axis2_xml_schema_builder_t* builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *prefix,
axis2_char_t *ns)
{
axis2_xml_schema_builder_impl_t *builder_impl = NULL;
axis2_hash_t *ht_sch_ns = NULL;
builder_impl = AXIS2_INTF_TO_IMPL(builder);
- AXIS2_PARAM_CHECK((*env)->error, prefix, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, ns , AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, prefix, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, ns , AXIS2_FAILURE);
ht_sch_ns = AXIS2_XML_SCHEMA_GET_PREFIX_TO_NAMESPACE_MAP(builder_impl->schema, env);
if(NULL != axis2_hash_get(ht_sch_ns, prefix, AXIS2_HASH_KEY_STRING))
{
/** key already exist */
- axis2_char_t *gen_prefix = AXIS2_MALLOC((*env)->allocator, sizeof(10));
+ axis2_char_t *gen_prefix = AXIS2_MALLOC(env->allocator, sizeof(10));
sprintf(gen_prefix, "gen%d", builder_impl->gen_no++);
axis2_hash_set(ht_sch_ns, gen_prefix, AXIS2_HASH_KEY_STRING, ns);
}
@@ -979,7 +979,7 @@
static axis2_xml_schema_simple_type_t*
handle_simple_type(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *simple_node,
axis2_om_node_t *sch_node)
{
@@ -1004,7 +1004,7 @@
axis2_om_node_t *restriction_node = NULL;
- AXIS2_PARAM_CHECK((*env)->error, simple_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, simple_node, NULL);
builder_impl = AXIS2_INTF_TO_IMPL(builder);
@@ -1288,8 +1288,8 @@
uri = axis2_hash_get(ht_namespaces, prefix, AXIS2_HASH_KEY_STRING);
qn = axis2_qname_create(env, localname, uri, prefix);
/*
- AXIS2_FREE((*env)->allocator, mem_dup);
- AXIS2_FFRE((*env)->allocator, localname);
+ AXIS2_FREE(env->allocator, mem_dup);
+ AXIS2_FFRE(env->allocator, localname);
*/
AXIS2_ARRAY_LIST_ADD(v, env, qn);
}
@@ -1310,11 +1310,11 @@
base_types = AXIS2_XML_SCHEMA_SIMPLE_TYPE_UNION_GET_BASE_TYPES(sch_union, env);
AXIS2_XML_SCHEMA_OBJ_COLLECTION_ADD(base_types, env, union_sim_type);
sim_type_name = AXIS2_XML_SCHEMA_TYPE_GET_NAME(union_sim_type, env);
- mem_types = AXIS2_MALLOC((*env)->allocator, sizeof(strlen(sim_type_name)+ 3));
+ mem_types = AXIS2_MALLOC(env->allocator, sizeof(strlen(sim_type_name)+ 3));
sprintf(mem_types, " %s", sim_type_name);
AXIS2_XML_SCHEMA_SIMPLE_TYPE_UNION_SET_MEMBER_TYPES_SOURCE(union_sim_type,
env, mem_types);
- AXIS2_FREE((*env)->allocator, mem_types);
+ AXIS2_FREE(env->allocator, mem_types);
inline_uni_ele = axis2_om_util_get_next_sibling_element_with_uri_localname(
union_ele, env, union_node, "simpleType", AXIS2_XML_SCHEMA_NS, &inline_uni_node);
@@ -1337,7 +1337,7 @@
static axis2_xml_schema_complex_type_t*
handle_complex_type(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *complex_node,
axis2_om_node_t *schema_node)
{
@@ -1529,7 +1529,7 @@
static axis2_xml_schema_simple_content_t*
handle_simple_content(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *simple_node,
axis2_om_node_t *schema_node)
{
@@ -1586,7 +1586,7 @@
static axis2_xml_schema_complex_content_t*
handle_complex_content(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *complex_node,
axis2_om_node_t *schema_node)
{
@@ -1642,7 +1642,7 @@
static axis2_xml_schema_simple_content_restriction_t*
handle_simple_content_restriction(
axis2_xml_schema_builder_t* builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *res_node,
axis2_om_node_t *schema_node)
{
@@ -1770,7 +1770,7 @@
static axis2_xml_schema_simple_content_extension_t*
handle_simple_content_extension(
axis2_xml_schema_builder_t* builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *ext_node,
axis2_om_node_t *schema_node)
{
@@ -1872,7 +1872,7 @@
static axis2_xml_schema_complex_content_restriction_t*
handle_complex_content_restriction(
axis2_xml_schema_builder_t* builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *res_node,
axis2_om_node_t *schema_node)
{
@@ -1990,7 +1990,7 @@
static axis2_xml_schema_complex_content_extension_t*
handle_complex_content_extension(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *ext_node,
axis2_om_node_t *schema_node)
{
@@ -2110,7 +2110,7 @@
static axis2_xml_schema_attribute_group_ref_t*
handle_attribute_group_ref(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *attr_grp_node,
axis2_om_node_t *schema_node)
{
@@ -2181,7 +2181,7 @@
static axis2_xml_schema_group_base_t*
handle_sequence(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *seq_node,
axis2_om_node_t *schema_node)
{
@@ -2254,7 +2254,7 @@
static axis2_xml_schema_any_t*
handle_any(
axis2_xml_schema_builder_t* builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *any_node,
axis2_om_node_t *schema_node)
{
@@ -2309,7 +2309,7 @@
static axis2_xml_schema_group_base_t*
handle_choice(
axis2_xml_schema_builder_t* builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *choice_node,
axis2_om_node_t *schema_node)
{
@@ -2320,9 +2320,9 @@
axis2_om_element_t *ele1 = NULL;
axis2_om_node_t *node1 = NULL;
axis2_xml_schema_obj_collection_t *items = NULL;
- AXIS2_PARAM_CHECK((*env)->error, choice_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, choice_node, NULL);
- AXIS2_PARAM_CHECK((*env)->error, schema_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, schema_node, NULL);
choice = axis2_xml_schema_choice_create(env);
@@ -2393,7 +2393,7 @@
static axis2_xml_schema_group_base_t*
handle_all(
axis2_xml_schema_builder_t* builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *all_node,
axis2_om_node_t *schema_node)
{
@@ -2438,7 +2438,7 @@
static axis2_xml_schema_group_t*
handle_group(
axis2_xml_schema_builder_t* builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *group_node,
axis2_om_node_t *schema_node)
{
@@ -2504,7 +2504,7 @@
static axis2_xml_schema_attribute_group_t*
handle_attribute_group(
axis2_xml_schema_builder_t* builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *attr_grp_node,
axis2_om_node_t *schema_node)
{
@@ -2579,7 +2579,7 @@
static axis2_xml_schema_any_attribute_t*
handle_any_attribute(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *any_attr_node,
axis2_om_node_t *schema_node)
{
@@ -2641,7 +2641,7 @@
static axis2_xml_schema_group_ref_t*
handle_group_ref(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *grp_ref_node,
axis2_om_node_t *schema_node)
{
@@ -2739,7 +2739,7 @@
static axis2_xml_schema_attribute_t*
handle_attribute(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *attr_node,
axis2_om_node_t *schema_node)
{
@@ -2976,7 +2976,7 @@
static axis2_xml_schema_element_t*
handle_element(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *ele_node,
axis2_om_node_t *schema_node,
axis2_bool_t is_global)
@@ -3023,7 +3023,7 @@
axis2_char_t *ele_n = NULL; /* to be removed */
- AXIS2_PARAM_CHECK((*env)->error, ele_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, ele_node, NULL);
builder_impl = AXIS2_INTF_TO_IMPL(builder);
@@ -3347,15 +3347,15 @@
static axis2_status_t
populate_element_namespaces(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *ele_node,
axis2_hash_t* ele_to_ns_map)
{
axis2_om_element_t *ele = NULL;
axis2_hash_t *ns_hash = NULL;
- AXIS2_PARAM_CHECK((*env)->error, ele_node, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, ele_to_ns_map, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, ele_node, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, ele_to_ns_map, AXIS2_FAILURE);
ele = (axis2_om_element_t*)AXIS2_OM_NODE_GET_DATA_ELEMENT(ele_node, env);
ns_hash = AXIS2_OM_ELEMENT_GET_NAMESPACES(ele, env);
@@ -3388,7 +3388,7 @@
static axis2_xml_schema_identity_constraint_t*
handle_constraint(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *cnst_node,
axis2_om_node_t *schema_node,
int type)
@@ -3546,7 +3546,7 @@
static axis2_xml_schema_import_t*
handle_import(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *import_node,
axis2_om_node_t *schema_node)
{
@@ -3608,7 +3608,7 @@
static axis2_xml_schema_external_t *
handle_include(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *include_node,
axis2_om_node_t *schema_node)
{
@@ -3620,7 +3620,7 @@
axis2_char_t *source_uri = NULL;
axis2_xml_schema_builder_impl_t *builder_impl = NULL;
void *sch = NULL;
- AXIS2_PARAM_CHECK((*env)->error, include_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, include_node, NULL);
builder_impl = AXIS2_INTF_TO_IMPL(builder);
@@ -3656,7 +3656,7 @@
static axis2_xml_schema_annotation_t*
handle_annotation_with_element(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *ann_node)
{
axis2_xml_schema_obj_collection_t *content = NULL;
@@ -3710,7 +3710,7 @@
static axis2_xml_schema_app_info_t*
handle_app_info(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *content)
{
void *app_info = NULL;
@@ -3718,7 +3718,7 @@
axis2_om_child_element_iterator_t *ele_iter = NULL;
axis2_char_t *attr_value = NULL;
- AXIS2_PARAM_CHECK((*env)->error, content, NULL);
+ AXIS2_PARAM_CHECK(env->error, content, NULL);
app_info = axis2_xml_schema_app_info_create(env);
cnt_ele = AXIS2_OM_NODE_GET_DATA_ELEMENT(content, env);
@@ -3737,7 +3737,7 @@
static axis2_xml_schema_documentation_t*
handle_documentation(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *content)
{
void *documentation = NULL;
@@ -3746,7 +3746,7 @@
axis2_char_t *attr_value = NULL;
axis2_char_t *xmllang = NULL;
- AXIS2_PARAM_CHECK((*env)->error, content, NULL);
+ AXIS2_PARAM_CHECK(env->error, content, NULL);
documentation = axis2_xml_schema_documentation_create(env);
cnt_ele = (axis2_om_element_t*)
@@ -3770,7 +3770,7 @@
static long
get_min_occurs(
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *ele_node)
{
axis2_char_t *attr_value = NULL;
@@ -3794,7 +3794,7 @@
static long
get_max_occurs(
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *ele_node)
{
axis2_om_element_t *om_ele = NULL;
@@ -3820,7 +3820,7 @@
static axis2_xml_schema_derivation_method_t*
get_derivation(
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *ele_node,
axis2_char_t *attr_name)
{
@@ -3849,7 +3849,7 @@
static axis2_char_t *
get_enum_string(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_element_t *om_ele,
axis2_char_t *attr_name)
{
@@ -3868,7 +3868,7 @@
axis2_xml_schema_t* AXIS2_CALL
axis2_xml_schema_builder_resolve_xml_schema(
axis2_xml_schema_builder_t *builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *target_namespace,
axis2_char_t *schema_location,
axis2_char_t *base_uri)
@@ -3880,7 +3880,7 @@
static axis2_bool_t
value_exist_in_hash(
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_hash_t *ht,
axis2_char_t *value)
{
@@ -3905,7 +3905,7 @@
static axis2_xml_schema_form_t*
get_from_default(
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *ele_node,
axis2_char_t *attr_name)
{
@@ -3926,7 +3926,7 @@
static axis2_xml_schema_t *
resolve_xml_schema(
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *target_namespace,
axis2_char_t *schema_location)
{
@@ -3936,7 +3936,7 @@
static axis2_xml_schema_t *
resolve_xml_schema_with_uri(
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *target_namespace,
axis2_char_t *schema_location,
axis2_char_t *base_uri)
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org