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 [9/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_group_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_ref.c?rev=410750&r1=410749&r2=410750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_ref.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_ref.c Wed May 31 22:18:45 2006
@@ -47,53 +47,53 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_group_ref_free(void *group_ref,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_hash_t *AXIS2_CALL
axis2_xml_schema_group_ref_super_objs(
void *group_ref,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_group_ref_type(
void *group_ref,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_particle_t *AXIS2_CALL
axis2_xml_schema_group_ref_get_base_impl(void *group_ref,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_qname_t *AXIS2_CALL
axis2_xml_schema_group_ref_get_ref_qname(void *group_ref,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_group_ref_set_ref_qname(void *group_ref,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *ref_qname);
axis2_xml_schema_group_base_t *AXIS2_CALL
axis2_xml_schema_group_ref_get_particle(void *group_ref,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_group_ref_set_particle(void *group_ref,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_group_base_t *particle);
/************************** end function pointers **************************/
AXIS2_EXTERN axis2_xml_schema_group_ref_t * AXIS2_CALL
-axis2_xml_schema_group_ref_create(axis2_env_t **env)
+axis2_xml_schema_group_ref_create(const axis2_env_t *env)
{
axis2_xml_schema_group_ref_impl_t *group_ref_impl = NULL;
axis2_xml_schema_annotated_t *annotated = NULL;
axis2_status_t status = AXIS2_FAILURE;
- group_ref_impl = AXIS2_MALLOC((*env)->allocator,
+ group_ref_impl = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_group_ref_impl_t));
if(!group_ref_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;
}
@@ -106,13 +106,13 @@
group_ref_impl->particle = NULL;
group_ref_impl->group_ref.ops = NULL;
- group_ref_impl->group_ref.ops = AXIS2_MALLOC((*env)->allocator,
+ group_ref_impl->group_ref.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_group_ref_ops_t));
if(!group_ref_impl->group_ref.ops)
{
axis2_xml_schema_group_ref_free(&(group_ref_impl->group_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;
}
@@ -142,7 +142,7 @@
if(!group_ref_impl->methods)
{
axis2_xml_schema_group_ref_free(&(group_ref_impl->group_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;
}
axis2_hash_set(group_ref_impl->methods, "free", AXIS2_HASH_KEY_STRING,
@@ -168,7 +168,7 @@
if(!group_ref_impl->ht_super)
{
axis2_xml_schema_group_ref_free(&(group_ref_impl->group_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;
}
@@ -195,7 +195,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_group_ref_free(void *group_ref,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_group_ref_impl_t *group_ref_impl = NULL;
@@ -204,7 +204,7 @@
if(NULL != group_ref_impl->ref_qname)
{
- AXIS2_FREE((*env)->allocator, group_ref_impl->ref_qname);
+ AXIS2_FREE(env->allocator, group_ref_impl->ref_qname);
group_ref_impl->ref_qname = NULL;
}
@@ -234,15 +234,15 @@
if(NULL != group_ref_impl->group_ref.base.ops)
{
- AXIS2_FREE((*env)->allocator, group_ref_impl->group_ref.base.ops);
+ AXIS2_FREE(env->allocator, group_ref_impl->group_ref.base.ops);
group_ref_impl->group_ref.base.ops = NULL;
}
if(NULL != group_ref_impl->group_ref.ops)
{
- AXIS2_FREE((*env)->allocator, group_ref_impl->group_ref.ops);
+ AXIS2_FREE(env->allocator, group_ref_impl->group_ref.ops);
group_ref_impl->group_ref.ops = NULL;
}
- AXIS2_FREE((*env)->allocator, group_ref_impl);
+ AXIS2_FREE(env->allocator, group_ref_impl);
group_ref_impl = NULL;
return AXIS2_SUCCESS;
}
@@ -250,7 +250,7 @@
axis2_hash_t *AXIS2_CALL
axis2_xml_schema_group_ref_super_objs(
void *group_ref,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_group_ref_impl_t *group_ref_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -261,7 +261,7 @@
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_group_ref_type(
void *group_ref,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_group_ref_impl_t *group_ref_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -271,7 +271,7 @@
axis2_xml_schema_particle_t *AXIS2_CALL
axis2_xml_schema_group_ref_get_base_impl(void *group_ref,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_group_ref_impl_t *group_ref_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -283,19 +283,19 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_xml_schema_group_ref_resolve_methods(
axis2_xml_schema_group_ref_t *group_ref,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_group_ref_t *group_ref_impl,
axis2_hash_t *methods)
{
axis2_xml_schema_group_ref_impl_t *group_ref_impl_l = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, group_ref_impl, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, methods, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, group_ref_impl, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
group_ref_impl_l = (axis2_xml_schema_group_ref_impl_t *) group_ref_impl;
- group_ref->ops = AXIS2_MALLOC((*env)->allocator,
+ group_ref->ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_group_ref_ops_t));
group_ref->ops->free = axis2_hash_get(methods, "free",
AXIS2_HASH_KEY_STRING);
@@ -329,7 +329,7 @@
axis2_qname_t *AXIS2_CALL
axis2_xml_schema_group_ref_get_ref_qname(void *group_ref,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
/* axis2_xml_schema_group_ref_impl_t *group_ref_impl = NULL;
axis2_hash_t *super = NULL;
@@ -345,7 +345,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_group_ref_set_ref_qname(void *group_ref,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *ref_qname)
{
axis2_xml_schema_group_ref_impl_t *group_ref_impl = NULL;
@@ -367,7 +367,7 @@
group_ref_impl->ref_qname = AXIS2_QNAME_CLONE(ref_qname, env);
if(!group_ref_impl->ref_qname)
{
- 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;
@@ -375,7 +375,7 @@
axis2_xml_schema_group_base_t *AXIS2_CALL
axis2_xml_schema_group_ref_get_particle(void *group_ref,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
/*
axis2_xml_schema_group_ref_impl_t *group_ref_impl = NULL;
@@ -391,7 +391,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_group_ref_set_particle(void *group_ref,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_group_base_t *particle)
{
axis2_xml_schema_group_ref_impl_t *grp_ref_impl = NULL;
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_identity_constraint.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_identity_constraint.c?rev=410750&r1=410749&r2=410750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_identity_constraint.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_identity_constraint.c Wed May 31 22:18:45 2006
@@ -46,63 +46,63 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_identity_constraint_free(void *id_constr,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_annotated_t *AXIS2_CALL
axis2_xml_schema_identity_constraint_get_base_impl(void *id_constr,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_identity_constraint_type(void *id_constr,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_hash_t* AXIS2_CALL
axis2_xml_schema_identity_constraint_super_objs(void *id_constr,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_qname_t* AXIS2_CALL
axis2_xml_schema_identity_constraint_get_refer(void *id_constr,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_identity_constraint_set_refer(void *id_constr,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *refer);
axis2_xml_schema_obj_collection_t *AXIS2_CALL
axis2_xml_schema_identity_constraint_get_fields(void *id_constr,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_char_t *AXIS2_CALL
axis2_xml_schema_identity_constraint_get_name(void *id_constr,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_identity_constraint_set_name(void *id_constr,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *name);
axis2_xml_schema_xpath_t *AXIS2_CALL
axis2_xml_schema_identity_constraint_get_selector(void *id_constr,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_identity_constraint_set_selector(void *id_constr,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_xpath_t *selector);
AXIS2_EXTERN axis2_xml_schema_identity_constraint_t * AXIS2_CALL
-axis2_xml_schema_identity_constraint_create(axis2_env_t **env)
+axis2_xml_schema_identity_constraint_create(const axis2_env_t *env)
{
axis2_xml_schema_identity_constraint_impl_t *id_cns_impl = NULL;
axis2_status_t status = AXIS2_FAILURE;
- id_cns_impl = AXIS2_MALLOC((*env)->allocator,
+ id_cns_impl = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_identity_constraint_impl_t));
if(!id_cns_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;
}
@@ -117,13 +117,13 @@
id_cns_impl->ht_super = NULL;
id_cns_impl->obj_type = AXIS2_XML_SCHEMA_IDENTITY_CONSTRAINT;
- id_cns_impl->id_constr.ops = AXIS2_MALLOC((*env)->allocator,
+ id_cns_impl->id_constr.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_identity_constraint_ops_t));
if(!(id_cns_impl->id_constr.ops))
{
axis2_xml_schema_identity_constraint_free(
&(id_cns_impl->id_constr), 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;
}
id_cns_impl->id_constr.ops->free =
@@ -155,7 +155,7 @@
if(!id_cns_impl->methods || !id_cns_impl->ht_super)
{
axis2_xml_schema_identity_constraint_free(&(id_cns_impl->id_constr), 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(id_cns_impl->methods, "free", AXIS2_HASH_KEY_STRING,
@@ -201,7 +201,7 @@
}
AXIS2_EXTERN axis2_xml_schema_identity_constraint_t * AXIS2_CALL
-axis2_xml_schema_unique_create(axis2_env_t **env)
+axis2_xml_schema_unique_create(const axis2_env_t *env)
{
axis2_xml_schema_identity_constraint_t *id_cns = NULL;
id_cns = axis2_xml_schema_identity_constraint_create(env);
@@ -210,7 +210,7 @@
}
AXIS2_EXTERN axis2_xml_schema_identity_constraint_t * AXIS2_CALL
-axis2_xml_schema_keyref_create(axis2_env_t **env)
+axis2_xml_schema_keyref_create(const axis2_env_t *env)
{
axis2_xml_schema_identity_constraint_t *id_cns = NULL;
id_cns = axis2_xml_schema_identity_constraint_create(env);
@@ -219,7 +219,7 @@
}
AXIS2_EXTERN axis2_xml_schema_identity_constraint_t * AXIS2_CALL
-axis2_xml_schema_key_create(axis2_env_t **env)
+axis2_xml_schema_key_create(const axis2_env_t *env)
{
axis2_xml_schema_identity_constraint_t *id_cns = NULL;
id_cns = axis2_xml_schema_identity_constraint_create(env);
@@ -228,10 +228,10 @@
}
AXIS2_EXTERN axis2_xml_schema_identity_constraint_t * AXIS2_CALL
-axis2_xml_schema_keyref_create(axis2_env_t **env);
+axis2_xml_schema_keyref_create(const axis2_env_t *env);
AXIS2_EXTERN axis2_xml_schema_identity_constraint_t * AXIS2_CALL
-axis2_xml_schema_key_create(axis2_env_t **env);
+axis2_xml_schema_key_create(const axis2_env_t *env);
@@ -239,7 +239,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_identity_constraint_free(void *id_constr,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_identity_constraint_impl_t *id_cns_impl = NULL;
@@ -248,7 +248,7 @@
if(NULL != id_cns_impl->name)
{
- AXIS2_FREE((*env)->allocator, id_cns_impl->name);
+ AXIS2_FREE(env->allocator, id_cns_impl->name);
id_cns_impl->name = NULL;
}
@@ -281,18 +281,18 @@
if(NULL != id_cns_impl->id_constr.ops)
{
- AXIS2_FREE((*env)->allocator, id_cns_impl->id_constr.ops);
+ AXIS2_FREE(env->allocator, id_cns_impl->id_constr.ops);
id_cns_impl->id_constr.ops = NULL;
}
if(NULL != id_cns_impl->id_constr.base.ops)
{
- AXIS2_FREE((*env)->allocator, id_cns_impl->id_constr.base.ops);
+ AXIS2_FREE(env->allocator, id_cns_impl->id_constr.base.ops);
id_cns_impl->id_constr.base.ops = NULL;
}
if(NULL != id_cns_impl)
{
- AXIS2_FREE((*env)->allocator, id_cns_impl);
+ AXIS2_FREE(env->allocator, id_cns_impl);
id_cns_impl = NULL;
}
return AXIS2_SUCCESS;
@@ -300,7 +300,7 @@
axis2_xml_schema_annotated_t *AXIS2_CALL
axis2_xml_schema_identity_constraint_get_base_impl(void *id_constr,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_identity_constraint_impl_t *id_cns_impl = NULL;
@@ -314,23 +314,23 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_xml_schema_identity_constraint_resolve_methods(
axis2_xml_schema_identity_constraint_t *id_constr,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_identity_constraint_t *id_cns_impl,
axis2_hash_t *methods)
{
axis2_xml_schema_identity_constraint_impl_t *identity_constraint_impl_l = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, id_cns_impl, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, methods, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, id_cns_impl, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
identity_constraint_impl_l = (axis2_xml_schema_identity_constraint_impl_t *) id_cns_impl;
- id_constr->ops = AXIS2_MALLOC((*env)->allocator,
+ id_constr->ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_identity_constraint_ops_t));
if(NULL == id_constr->ops)
{
- 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;
}
id_constr->ops->free = axis2_hash_get(methods, "free",
@@ -354,14 +354,14 @@
*/
axis2_xml_schema_obj_collection_t *AXIS2_CALL
axis2_xml_schema_identity_constraint_get_fields(void *id_constr,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(id_constr)->fields;
}
axis2_char_t *AXIS2_CALL
axis2_xml_schema_identity_constraint_get_name(void *id_constr,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(id_constr)->name;
@@ -369,7 +369,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_identity_constraint_set_name(void *id_constr,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *name)
{
axis2_xml_schema_identity_constraint_impl_t *id_cns_impl = NULL;
@@ -379,13 +379,13 @@
if(id_cns_impl->name)
{
- AXIS2_FREE((*env)->allocator, id_cns_impl->name);
+ AXIS2_FREE(env->allocator, id_cns_impl->name);
id_cns_impl->name = NULL;
}
id_cns_impl->name = AXIS2_STRDUP(name, env);
if(!id_cns_impl->name)
{
- 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;
@@ -393,7 +393,7 @@
axis2_xml_schema_xpath_t *AXIS2_CALL
axis2_xml_schema_identity_constraint_get_selector(void *id_constr,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(id_constr)->selector;
@@ -401,13 +401,13 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_identity_constraint_set_selector(void *id_constr,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_xpath_t *selector)
{
axis2_xml_schema_identity_constraint_impl_t *id_cns_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, selector, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, selector, AXIS2_FAILURE);
id_cns_impl = AXIS2_INTF_TO_IMPL(id_constr);
id_cns_impl->selector = selector;
@@ -417,7 +417,7 @@
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_identity_constraint_type(void *id_constr,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(id_constr)->obj_type;
}
@@ -425,25 +425,25 @@
axis2_hash_t* AXIS2_CALL
axis2_xml_schema_identity_constraint_super_objs(void *id_constr,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(id_constr)->ht_super;
}
axis2_qname_t* AXIS2_CALL
axis2_xml_schema_identity_constraint_get_refer(void *id_constr,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(id_constr)->refer;
}
axis2_status_t AXIS2_CALL
axis2_xml_schema_identity_constraint_set_refer(void *id_constr,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *refer)
{
axis2_xml_schema_identity_constraint_impl_t *id_cns_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, refer, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, refer, AXIS2_FAILURE);
id_cns_impl = AXIS2_INTF_TO_IMPL(id_constr);
if(NULL != id_cns_impl->refer)
{
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_import.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_import.c?rev=410750&r1=410749&r2=410750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_import.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_import.c Wed May 31 22:18:45 2006
@@ -44,42 +44,42 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_import_free(void *import,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_external_t *AXIS2_CALL
axis2_xml_schema_import_get_base_impl(void *import,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_import_type(void *import,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_hash_t *AXIS2_CALL
axis2_xml_schema_import_super_objs(void *import,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
axis2_xml_schema_import_get_namespace(void *import,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_import_set_namespace(void *import,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *ns);
/********************* end function prototypes ********************************/
AXIS2_EXTERN axis2_xml_schema_import_t * AXIS2_CALL
-axis2_xml_schema_import_create(axis2_env_t **env)
+axis2_xml_schema_import_create(const axis2_env_t *env)
{
axis2_xml_schema_import_impl_t *import_impl = NULL;
axis2_xml_schema_annotated_t *annotated = NULL;
axis2_status_t status = AXIS2_FAILURE;
- import_impl = AXIS2_MALLOC((*env)->allocator,
+ import_impl = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_import_impl_t));
if(!import_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;
}
import_impl->ns = NULL;
@@ -90,13 +90,13 @@
import_impl->ht_super = NULL;
import_impl->obj_type = AXIS2_XML_SCHEMA_IMPORT;
- import_impl->import.ops = AXIS2_MALLOC((*env)->allocator,
+ import_impl->import.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_import_ops_t));
if(!import_impl->import.ops)
{
axis2_xml_schema_import_free(&(import_impl->import), 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;
}
@@ -118,7 +118,7 @@
if(!import_impl->methods || !import_impl->ht_super)
{
axis2_xml_schema_import_free(&(import_impl->import), 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;
}
@@ -164,7 +164,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_import_free(void *import,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_import_impl_t *import_impl = NULL;
@@ -189,22 +189,22 @@
if(NULL != import_impl->import.ops)
{
- AXIS2_FREE((*env)->allocator, import_impl->import.ops);
+ AXIS2_FREE(env->allocator, import_impl->import.ops);
import_impl->import.ops = NULL;
}
if(NULL != import_impl->import.base.ops)
{
- AXIS2_FREE((*env)->allocator, import_impl->import.base.ops);
+ AXIS2_FREE(env->allocator, import_impl->import.base.ops);
import_impl->import.base.ops = NULL;
}
- AXIS2_FREE((*env)->allocator, import_impl);
+ AXIS2_FREE(env->allocator, import_impl);
import_impl = NULL;
return AXIS2_SUCCESS;
}
axis2_xml_schema_external_t *AXIS2_CALL
axis2_xml_schema_import_get_base_impl(void *import,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_import_impl_t *import_impl = NULL;
@@ -218,19 +218,19 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_xml_schema_import_resolve_methods(
axis2_xml_schema_import_t *import,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_import_t *import_impl,
axis2_hash_t *methods)
{
axis2_xml_schema_import_impl_t *import_impl_l = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, import_impl, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, methods, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, import_impl, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
import_impl_l = (axis2_xml_schema_import_impl_t *) import_impl;
- import->ops = AXIS2_MALLOC((*env)->allocator,
+ import->ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_import_ops_t));
import->ops->free = axis2_hash_get(methods, "free",
@@ -249,7 +249,7 @@
*/
axis2_char_t * AXIS2_CALL
axis2_xml_schema_import_get_namespace(void *import,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(import)->ns;
@@ -257,7 +257,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_import_set_namespace(void *import,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *ns)
{
axis2_xml_schema_import_impl_t *import_impl = NULL;
@@ -265,7 +265,7 @@
import_impl = AXIS2_INTF_TO_IMPL(import);
if(NULL != import_impl->ns)
{
- AXIS2_FREE((*env)->allocator, ns);
+ AXIS2_FREE(env->allocator, ns);
import_impl->ns = NULL;
}
import_impl->ns = ns;
@@ -274,14 +274,14 @@
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_import_type(void *import,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(import)->obj_type;
}
axis2_hash_t *AXIS2_CALL
axis2_xml_schema_import_super_objs(void *import,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(import)->ht_super;
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj.c?rev=410750&r1=410749&r2=410750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj.c Wed May 31 22:18:45 2006
@@ -48,71 +48,71 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_obj_free(
void *obj,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_hash_t *AXIS2_CALL
axis2_xml_schema_obj_super_objs(
void *obj,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_obj_type(
void *obj,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_char_t * AXIS2_CALL
axis2_xml_schema_obj_get_source_uri(
void *obj,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_obj_set_source_uri(
void *obj,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *source_uri);
axis2_bool_t AXIS2_CALL
axis2_xml_schema_obj_equals(
void *obj,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *obj_comp);
int AXIS2_CALL
axis2_xml_schema_obj_get_line_num(
void *obj,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_obj_set_line_num(
void *obj,
- axis2_env_t **env,
+ const axis2_env_t *env,
int line_num);
int AXIS2_CALL
axis2_xml_schema_obj_get_line_pos(
void *obj,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_obj_set_line_pos(
void *obj,
- axis2_env_t **env,
+ const axis2_env_t *env,
int line_pos);
/******************* end function pointers ************************************/
AXIS2_EXTERN axis2_xml_schema_obj_t * AXIS2_CALL
-axis2_xml_schema_obj_create(axis2_env_t **env)
+axis2_xml_schema_obj_create(const axis2_env_t *env)
{
axis2_xml_schema_obj_impl_t *obj_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- obj_impl = AXIS2_MALLOC((*env)->allocator,
+ obj_impl = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_obj_impl_t));
if(!obj_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;
}
@@ -123,12 +123,12 @@
obj_impl->source_uri = NULL;
obj_impl->obj.ops = NULL;
- obj_impl->obj.ops = AXIS2_MALLOC((*env)->allocator,
+ obj_impl->obj.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_obj_ops_t));
if(!obj_impl->obj.ops)
{
axis2_xml_schema_obj_free(&(obj_impl->obj), env);
- AXIS2_ERROR_SET((*env)->error ,
+ AXIS2_ERROR_SET(env->error ,
AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -157,7 +157,7 @@
obj_impl->ht_super = axis2_hash_make(env);
if(!obj_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(obj_impl->ht_super, "AXIS2_XML_SCHEMA_OBJ", AXIS2_HASH_KEY_STRING,
@@ -169,7 +169,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_obj_free(void *obj,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_obj_impl_t *obj_impl = NULL;
@@ -177,7 +177,7 @@
if(NULL != obj_impl->source_uri)
{
- AXIS2_FREE((*env)->allocator, obj_impl->source_uri);
+ AXIS2_FREE(env->allocator, obj_impl->source_uri);
obj_impl->source_uri = NULL;
}
@@ -189,13 +189,13 @@
if(NULL != obj_impl->obj.ops)
{
- AXIS2_FREE((*env)->allocator, obj_impl->obj.ops);
+ AXIS2_FREE(env->allocator, obj_impl->obj.ops);
obj_impl->obj.ops = NULL;
}
if(NULL != obj_impl)
{
- AXIS2_FREE((*env)->allocator, obj_impl);
+ AXIS2_FREE(env->allocator, obj_impl);
obj_impl = NULL;
}
return AXIS2_SUCCESS;
@@ -203,7 +203,7 @@
axis2_hash_t *AXIS2_CALL
axis2_xml_schema_obj_super_objs(void *obj,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_obj_impl_t *obj_impl = NULL;
obj_impl = AXIS2_INTF_TO_IMPL(obj);
@@ -213,7 +213,7 @@
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_obj_type(
void *obj,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_obj_impl_t *obj_impl = NULL;
obj_impl = AXIS2_INTF_TO_IMPL(obj);
@@ -223,23 +223,23 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_xml_schema_obj_resolve_methods(
axis2_xml_schema_obj_t *obj,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_obj_t *obj_impl,
axis2_hash_t *methods)
{
axis2_xml_schema_obj_impl_t *obj_impl_l = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, obj_impl, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, methods, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, obj_impl, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
obj_impl_l = (axis2_xml_schema_obj_impl_t *) obj_impl;
- obj->ops = AXIS2_MALLOC((*env)->allocator,
+ obj->ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_obj_ops_t));
if(!obj->ops)
{
- 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;
}
@@ -294,7 +294,7 @@
}
int AXIS2_CALL
axis2_xml_schema_obj_get_line_num(void *obj,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_obj_impl_t *obj_impl = NULL;
axis2_hash_t *super = NULL;
@@ -312,7 +312,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_obj_set_line_num(void *obj,
- axis2_env_t **env,
+ const axis2_env_t *env,
int line_num)
{
axis2_xml_schema_obj_impl_t *obj_impl = NULL;
@@ -336,7 +336,7 @@
int AXIS2_CALL
axis2_xml_schema_obj_get_line_pos(void *obj,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_obj_impl_t *obj_impl = NULL;
axis2_hash_t *super = NULL;
@@ -352,7 +352,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_obj_set_line_pos(void *obj,
- axis2_env_t **env,
+ const axis2_env_t *env,
int line_pos)
{
axis2_xml_schema_obj_impl_t *obj_impl = NULL;
@@ -371,7 +371,7 @@
axis2_char_t * AXIS2_CALL
axis2_xml_schema_obj_get_source_uri(void *obj,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_obj_impl_t *obj_impl = NULL;
axis2_hash_t *super = NULL;
@@ -383,7 +383,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_obj_set_source_uri(void *obj,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *source_uri)
{
axis2_xml_schema_obj_impl_t *obj_impl = NULL;
@@ -395,7 +395,7 @@
if(NULL != obj_impl->source_uri)
{
- AXIS2_FREE((*env)->allocator, obj_impl->source_uri);
+ AXIS2_FREE(env->allocator, obj_impl->source_uri);
obj_impl->source_uri = NULL;
}
obj_impl->source_uri = AXIS2_STRDUP(source_uri, env);
@@ -405,7 +405,7 @@
axis2_bool_t AXIS2_CALL
axis2_xml_schema_obj_equals(void *obj,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *obj_comp)
{
axis2_xml_schema_obj_impl_t *obj_impl = NULL;
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_collection.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_collection.c?rev=410750&r1=410749&r2=410750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_collection.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_collection.c Wed May 31 22:18:45 2006
@@ -39,70 +39,70 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_obj_collection_free(
axis2_xml_schema_obj_collection_t *obj_collection,
- axis2_env_t **env);
+ const axis2_env_t *env);
int AXIS2_CALL
axis2_xml_schema_obj_collection_get_count(axis2_xml_schema_obj_collection_t *obj_collection,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_obj_t *AXIS2_CALL
axis2_xml_schema_obj_collection_get_item(axis2_xml_schema_obj_collection_t *obj_collection,
- axis2_env_t **env,
+ const axis2_env_t *env,
int i);
axis2_status_t AXIS2_CALL
axis2_xml_schema_obj_collection_set_item(axis2_xml_schema_obj_collection_t *obj_collection,
- axis2_env_t **env,
+ const axis2_env_t *env,
int i,
axis2_xml_schema_obj_t *item);
axis2_status_t AXIS2_CALL
axis2_xml_schema_obj_collection_add(axis2_xml_schema_obj_collection_t *obj_collection,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_obj_t *item);
axis2_bool_t AXIS2_CALL
axis2_xml_schema_obj_collection_contains(axis2_xml_schema_obj_collection_t *obj_collection,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_obj_t *item);
int AXIS2_CALL
axis2_xml_schema_obj_collection_index_of(axis2_xml_schema_obj_collection_t *obj_collection,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_obj_t *item);
void* AXIS2_CALL
axis2_xml_schema_obj_collection_remove_at(axis2_xml_schema_obj_collection_t *obj_collection,
- axis2_env_t **env,
+ const axis2_env_t *env,
int index);
axis2_array_list_t* AXIS2_CALL
axis2_xml_schema_obj_collection_to_array(axis2_xml_schema_obj_collection_t *obj_collection,
- axis2_env_t **env);
+ const axis2_env_t *env);
/**************************** end function prototypes ************************/
AXIS2_EXTERN axis2_xml_schema_obj_collection_t * AXIS2_CALL
-axis2_xml_schema_obj_collection_create(axis2_env_t **env)
+axis2_xml_schema_obj_collection_create(const axis2_env_t *env)
{
axis2_xml_schema_obj_collection_impl_t *obj_collection_impl = NULL;
- obj_collection_impl = AXIS2_MALLOC((*env)->allocator,
+ obj_collection_impl = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_obj_collection_impl_t));
if(!obj_collection_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;
}
obj_collection_impl->objs = NULL;
- obj_collection_impl->obj_collection.ops = AXIS2_MALLOC((*env)->allocator,
+ obj_collection_impl->obj_collection.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_obj_collection_ops_t));
obj_collection_impl->objs = axis2_array_list_create(env, 0);
if(!obj_collection_impl->objs)
{
axis2_xml_schema_obj_collection_free(&(obj_collection_impl->obj_collection), 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;
}
obj_collection_impl->obj_collection.ops->free =
@@ -128,7 +128,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_obj_collection_free(axis2_xml_schema_obj_collection_t *obj_collection,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_obj_collection_impl_t *obj_collection_impl = NULL;
@@ -142,11 +142,11 @@
if(NULL != obj_collection_impl->obj_collection.ops)
{
- AXIS2_FREE((*env)->allocator, obj_collection_impl->obj_collection.ops);
+ AXIS2_FREE(env->allocator, obj_collection_impl->obj_collection.ops);
obj_collection_impl->obj_collection.ops = NULL;
}
- AXIS2_FREE((*env)->allocator, obj_collection_impl);
+ AXIS2_FREE(env->allocator, obj_collection_impl);
obj_collection_impl = NULL;
return AXIS2_SUCCESS;
}
@@ -154,7 +154,7 @@
int AXIS2_CALL
axis2_xml_schema_obj_collection_get_count(axis2_xml_schema_obj_collection_t *obj_collection,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_obj_collection_impl_t *obj_collection_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -164,7 +164,7 @@
axis2_xml_schema_obj_t *AXIS2_CALL
axis2_xml_schema_obj_collection_get_item(axis2_xml_schema_obj_collection_t *obj_collection,
- axis2_env_t **env,
+ const axis2_env_t *env,
int i)
{
axis2_xml_schema_obj_collection_impl_t *obj_collection_impl = NULL;
@@ -176,14 +176,14 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_obj_collection_set_item(axis2_xml_schema_obj_collection_t *obj_collection,
- axis2_env_t **env,
+ const axis2_env_t *env,
int i,
axis2_xml_schema_obj_t *item)
{
axis2_xml_schema_obj_collection_impl_t *obj_collection_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, item, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, item, AXIS2_FAILURE);
obj_collection_impl = AXIS2_INTF_TO_IMPL(obj_collection);
AXIS2_ARRAY_LIST_SET(obj_collection_impl->objs, env, i, item);
@@ -192,26 +192,26 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_obj_collection_add(axis2_xml_schema_obj_collection_t *obj_collection,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_obj_t *item)
{
axis2_xml_schema_obj_collection_impl_t *obj_collection_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, item, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, item, AXIS2_FAILURE);
obj_collection_impl = AXIS2_INTF_TO_IMPL(obj_collection);
return AXIS2_ARRAY_LIST_ADD(obj_collection_impl->objs, env, item);
}
axis2_bool_t AXIS2_CALL
axis2_xml_schema_obj_collection_contains(axis2_xml_schema_obj_collection_t *obj_collection,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_obj_t *item)
{
axis2_xml_schema_obj_collection_impl_t *obj_collection_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, item, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, item, AXIS2_FAILURE);
obj_collection_impl = AXIS2_INTF_TO_IMPL(obj_collection);
return AXIS2_ARRAY_LIST_CONTAINS(obj_collection_impl->objs, env, item);
@@ -219,13 +219,13 @@
int AXIS2_CALL
axis2_xml_schema_obj_collection_index_of(axis2_xml_schema_obj_collection_t *obj_collection,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_obj_t *item)
{
axis2_xml_schema_obj_collection_impl_t *obj_collection_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, item, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, item, AXIS2_FAILURE);
obj_collection_impl = AXIS2_INTF_TO_IMPL(obj_collection);
return AXIS2_ARRAY_LIST_INDEX_OF(obj_collection_impl->objs, env, item);
@@ -233,7 +233,7 @@
void* AXIS2_CALL
axis2_xml_schema_obj_collection_remove_at(axis2_xml_schema_obj_collection_t *obj_collection,
- axis2_env_t **env,
+ const axis2_env_t *env,
int index)
{
axis2_xml_schema_obj_collection_impl_t *obj_collection_impl = NULL;
@@ -248,7 +248,7 @@
axis2_array_list_t* AXIS2_CALL
axis2_xml_schema_obj_collection_to_array(axis2_xml_schema_obj_collection_t *obj_collection,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(obj_collection)->objs;
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_table.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_table.c?rev=410750&r1=410749&r2=410750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_table.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_table.c Wed May 31 22:18:45 2006
@@ -42,67 +42,67 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_obj_table_free(axis2_xml_schema_obj_table_t *obj_table,
- axis2_env_t **env);
+ const axis2_env_t *env);
int AXIS2_CALL
axis2_xml_schema_obj_table_get_count(axis2_xml_schema_obj_table_t *obj_table,
- axis2_env_t **env);
+ const axis2_env_t *env);
void *AXIS2_CALL
axis2_xml_schema_obj_table_get_item(axis2_xml_schema_obj_table_t *obj_table,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname);
axis2_array_list_t *AXIS2_CALL
axis2_xml_schema_obj_table_get_names(axis2_xml_schema_obj_table_t *obj_table,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_array_list_t *AXIS2_CALL
axis2_xml_schema_obj_table_get_values(axis2_xml_schema_obj_table_t *obj_table,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_bool_t AXIS2_CALL
axis2_xml_schema_obj_table_contains(axis2_xml_schema_obj_table_t *obj_table,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname);
axis2_status_t AXIS2_CALL
axis2_xml_schema_obj_table_add(axis2_xml_schema_obj_table_t *obj_table,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname,
void *value);
axis2_status_t AXIS2_CALL
axis2_xml_schema_obj_table_put(
axis2_xml_schema_obj_table_t *obj_table,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *key,
void *value);
void* AXIS2_CALL
axis2_xml_schema_obj_table_get(
axis2_xml_schema_obj_table_t *obj_table,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *key);
axis2_hash_t* AXIS2_CALL
axis2_xml_schema_obj_table_get_hash_table(
axis2_xml_schema_obj_table_t *obj_table,
- axis2_env_t **env);
+ const axis2_env_t *env);
/******************** end function pointers ***********************************/
AXIS2_EXTERN axis2_xml_schema_obj_table_t * AXIS2_CALL
-axis2_xml_schema_obj_table_create(axis2_env_t **env)
+axis2_xml_schema_obj_table_create(const axis2_env_t *env)
{
axis2_xml_schema_obj_table_impl_t *obj_table_impl = NULL;
- obj_table_impl = AXIS2_MALLOC((*env)->allocator,
+ obj_table_impl = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_obj_table_impl_t));
if(!obj_table_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;
}
obj_table_impl->collection = NULL;
@@ -110,12 +110,12 @@
obj_table_impl->values = NULL;
obj_table_impl->obj_table.ops = NULL;
- obj_table_impl->obj_table.ops = AXIS2_MALLOC((*env)->allocator,
+ obj_table_impl->obj_table.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_obj_table_ops_t));
if(!obj_table_impl->obj_table.ops)
{
axis2_xml_schema_obj_table_free(&(obj_table_impl->obj_table), 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;
}
@@ -123,7 +123,7 @@
if(!obj_table_impl->collection)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
obj_table_impl->obj_table.ops->free =
@@ -147,7 +147,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_obj_table_free(axis2_xml_schema_obj_table_t *obj_table,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_obj_table_impl_t *obj_table_impl = NULL;
@@ -173,18 +173,18 @@
if(NULL != obj_table_impl->obj_table.ops)
{
- AXIS2_FREE((*env)->allocator, obj_table_impl->obj_table.ops);
+ AXIS2_FREE(env->allocator, obj_table_impl->obj_table.ops);
obj_table_impl->obj_table.ops = NULL;
}
- AXIS2_FREE((*env)->allocator, obj_table_impl);
+ AXIS2_FREE(env->allocator, obj_table_impl);
obj_table_impl = NULL;
return AXIS2_SUCCESS;
}
int AXIS2_CALL
axis2_xml_schema_obj_table_get_count(axis2_xml_schema_obj_table_t *obj_table,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_obj_table_impl_t *obj_table_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -199,14 +199,14 @@
void *AXIS2_CALL
axis2_xml_schema_obj_table_get_item(axis2_xml_schema_obj_table_t *obj_table,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname)
{
axis2_xml_schema_obj_table_impl_t *obj_table_impl = NULL;
axis2_char_t *name = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, qname, NULL);
+ AXIS2_PARAM_CHECK(env->error, qname, NULL);
obj_table_impl = AXIS2_INTF_TO_IMPL(obj_table);
@@ -221,7 +221,7 @@
axis2_array_list_t *AXIS2_CALL
axis2_xml_schema_obj_table_get_names(axis2_xml_schema_obj_table_t *obj_table,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_obj_table_impl_t *obj_table_impl = NULL;
axis2_hash_index_t *hi = NULL;
@@ -238,7 +238,7 @@
obj_table_impl->names = axis2_array_list_create(env, 0);
if(!obj_table_impl->names)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -255,7 +255,7 @@
axis2_array_list_t *AXIS2_CALL
axis2_xml_schema_obj_table_get_values(axis2_xml_schema_obj_table_t *obj_table,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_obj_table_impl_t *obj_table_impl = NULL;
axis2_hash_index_t *hi = NULL;
@@ -271,7 +271,7 @@
obj_table_impl->values = axis2_array_list_create(env, 0);
if(!obj_table_impl->values)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -288,7 +288,7 @@
axis2_bool_t AXIS2_CALL
axis2_xml_schema_obj_table_contains(axis2_xml_schema_obj_table_t *obj_table,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname)
{
axis2_xml_schema_obj_table_impl_t *obj_table_impl = NULL;
@@ -296,7 +296,7 @@
axis2_char_t *name = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, qname, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, qname, AXIS2_FAILURE);
obj_table_impl = AXIS2_INTF_TO_IMPL(obj_table);
name = AXIS2_QNAME_TO_STRING(qname, env);
if(NULL != name)
@@ -312,7 +312,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_obj_table_add(axis2_xml_schema_obj_table_t *obj_table,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname,
void *value)
{
@@ -320,8 +320,8 @@
axis2_char_t *name = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, qname, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, value, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, qname, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, value, AXIS2_FAILURE);
obj_table_impl = AXIS2_INTF_TO_IMPL(obj_table);
name = AXIS2_QNAME_TO_STRING(qname, env);
if(NULL != name)
@@ -336,14 +336,14 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_obj_table_put(
axis2_xml_schema_obj_table_t *obj_table,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *key,
void *value)
{
axis2_xml_schema_obj_table_impl_t *obj_table_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, key, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, value, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, key, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, value, AXIS2_FAILURE);
obj_table_impl = AXIS2_INTF_TO_IMPL(obj_table);
axis2_hash_set(obj_table_impl->collection, key, AXIS2_HASH_KEY_STRING,
@@ -354,12 +354,12 @@
void* AXIS2_CALL
axis2_xml_schema_obj_table_get(
axis2_xml_schema_obj_table_t *obj_table,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *key)
{
axis2_xml_schema_obj_table_impl_t *obj_table_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, key, NULL);
+ AXIS2_PARAM_CHECK(env->error, key, NULL);
obj_table_impl = AXIS2_INTF_TO_IMPL(obj_table);
return axis2_hash_get(obj_table_impl->collection, key, AXIS2_HASH_KEY_STRING);
}
@@ -367,7 +367,7 @@
axis2_hash_t* AXIS2_CALL
axis2_xml_schema_obj_table_get_hash_table(
axis2_xml_schema_obj_table_t *obj_table,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_obj_table_impl_t *obj_table_impl = NULL;
obj_table_impl = AXIS2_INTF_TO_IMPL(obj_table);
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_particle.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_particle.c?rev=410750&r1=410749&r2=410750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_particle.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_particle.c Wed May 31 22:18:45 2006
@@ -54,54 +54,54 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_particle_free(
void *particle,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_hash_t *AXIS2_CALL
axis2_xml_schema_particle_super_objs(
void *particle,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_particle_type(
void *particle,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_annotated_t *AXIS2_CALL
axis2_xml_schema_particle_get_base_impl(void *particle,
- axis2_env_t **env);
+ const axis2_env_t *env);
long AXIS2_CALL
axis2_xml_schema_particle_get_max_occurs(void *particle,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_particle_set_max_occurs(void *particle,
- axis2_env_t **env,
+ const axis2_env_t *env,
long max_occurs);
long AXIS2_CALL
axis2_xml_schema_particle_get_min_occurs(void *particle,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_particle_set_min_occurs(void *particle,
- axis2_env_t **env,
+ const axis2_env_t *env,
long min_occurs);
/*************** function prototypes *****************************************/
AXIS2_EXTERN axis2_xml_schema_particle_t * AXIS2_CALL
-axis2_xml_schema_particle_create(axis2_env_t **env)
+axis2_xml_schema_particle_create(const axis2_env_t *env)
{
axis2_xml_schema_particle_impl_t *particle_impl = NULL;
axis2_status_t status = AXIS2_FAILURE;
- particle_impl = AXIS2_MALLOC((*env)->allocator,
+ particle_impl = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_particle_impl_t));
if(!particle_impl)
{
- AXIS2_ERROR_SET((*env)->error,
+ AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -115,13 +115,13 @@
particle_impl->min_occurs_string = NULL;
- particle_impl->particle.ops = AXIS2_MALLOC((*env)->allocator,
+ particle_impl->particle.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_particle_ops_t));
if(!particle_impl->particle.ops)
{
axis2_xml_schema_particle_free(&(particle_impl->particle), 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;
}
@@ -153,7 +153,7 @@
if(!particle_impl->methods)
{
axis2_xml_schema_particle_free(&(particle_impl->particle), 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(particle_impl->methods, "free", AXIS2_HASH_KEY_STRING,
@@ -182,7 +182,7 @@
if(!particle_impl->ht_super)
{
axis2_xml_schema_particle_free(&(particle_impl->particle), 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(particle_impl->ht_super, "AXIS2_XML_SCHEMA_PARTICLE", AXIS2_HASH_KEY_STRING,
@@ -202,7 +202,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_particle_free(void *particle,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_particle_impl_t *particle_impl = NULL;
@@ -229,18 +229,18 @@
if(NULL != particle_impl->particle.ops)
{
- AXIS2_FREE((*env)->allocator, particle_impl->particle.ops);
+ AXIS2_FREE(env->allocator, particle_impl->particle.ops);
particle_impl->particle.ops = NULL;
}
if(NULL != particle_impl->particle.base.ops)
{
- AXIS2_FREE((*env)->allocator, particle_impl->particle.base.ops);
+ AXIS2_FREE(env->allocator, particle_impl->particle.base.ops);
particle_impl->particle.base.ops = NULL;
}
if(NULL != particle_impl)
{
- AXIS2_FREE((*env)->allocator, particle_impl);
+ AXIS2_FREE(env->allocator, particle_impl);
particle_impl = NULL;
}
return AXIS2_SUCCESS;
@@ -248,7 +248,7 @@
axis2_hash_t *AXIS2_CALL
axis2_xml_schema_particle_super_objs(void *particle,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_particle_impl_t *particle_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -258,7 +258,7 @@
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_particle_type(void *particle,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_particle_impl_t *particle_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -268,7 +268,7 @@
axis2_xml_schema_annotated_t *AXIS2_CALL
axis2_xml_schema_particle_get_base_impl(void *particle,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_particle_impl_t *particle_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -279,23 +279,23 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_xml_schema_particle_resolve_methods(
axis2_xml_schema_particle_t *particle,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_particle_t *particle_impl,
axis2_hash_t *methods)
{
axis2_xml_schema_particle_impl_t *sch_particle_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, particle_impl, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, methods, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, particle_impl, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
sch_particle_impl = (axis2_xml_schema_particle_impl_t *) particle_impl;
- particle->ops = AXIS2_MALLOC((*env)->allocator,
+ particle->ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_particle_ops_t));
if(!particle->ops)
{
- 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;
}
@@ -336,7 +336,7 @@
long AXIS2_CALL
axis2_xml_schema_particle_get_max_occurs(void *particle,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_particle_impl_t *particle_impl = NULL;
axis2_hash_t *ht_super = NULL;
@@ -355,7 +355,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_particle_set_max_occurs(void *particle,
- axis2_env_t **env,
+ const axis2_env_t *env,
long max_occurs)
{
axis2_xml_schema_particle_impl_t *particle_impl = NULL;
@@ -377,7 +377,7 @@
long AXIS2_CALL
axis2_xml_schema_particle_get_min_occurs(void *particle,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_particle_impl_t *particle_impl = NULL;
axis2_hash_t *ht_super = NULL;
@@ -397,7 +397,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_particle_set_min_occurs(void *particle,
- axis2_env_t **env,
+ const axis2_env_t *env,
long min_occurs)
{
axis2_xml_schema_particle_impl_t *particle_impl = NULL;
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_redefine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_redefine.c?rev=410750&r1=410749&r2=410750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_redefine.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_redefine.c Wed May 31 22:18:45 2006
@@ -50,58 +50,58 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_redefine_free(void *redefine,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_external_t *AXIS2_CALL
axis2_xml_schema_redefine_get_base_impl(void *redefine,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_redefine_type(void *redefine,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_hash_t *AXIS2_CALL
axis2_xml_schema_redefine_super_objs(void *redefine,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_obj_table_t* AXIS2_CALL
axis2_xml_schema_redefine_get_attribute_group(void *redefine,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_redefine_set_attribute_group(void *redefine,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_obj_table_t *group);
axis2_xml_schema_obj_collection_t* AXIS2_CALL
axis2_xml_schema_redefine_get_items(void *redefine,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_obj_table_t* AXIS2_CALL
axis2_xml_schema_redefine_get_schema_types(void *redefine,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_obj_table_t* AXIS2_CALL
axis2_xml_schema_redefine_get_group(void *redefine,
- axis2_env_t **env);
+ const axis2_env_t *env);
/********************* end function prototypes ********************************/
AXIS2_EXTERN axis2_xml_schema_redefine_t * AXIS2_CALL
-axis2_xml_schema_redefine_create(axis2_env_t **env)
+axis2_xml_schema_redefine_create(const axis2_env_t *env)
{
axis2_xml_schema_redefine_impl_t *redefine_impl = NULL;
axis2_xml_schema_annotated_t *annotated = NULL;
axis2_status_t status = AXIS2_FAILURE;
- redefine_impl = AXIS2_MALLOC((*env)->allocator,
+ redefine_impl = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_redefine_impl_t));
if(!redefine_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;
}
redefine_impl->external = NULL;
@@ -115,13 +115,13 @@
redefine_impl->obj_type = AXIS2_XML_SCHEMA_REDEFINE;
redefine_impl->ht_super = NULL;
- redefine_impl->redefine.ops = AXIS2_MALLOC((*env)->allocator,
+ redefine_impl->redefine.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_redefine_ops_t));
if(!redefine_impl->redefine.ops)
{
axis2_xml_schema_redefine_free(&(redefine_impl->redefine), 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;
}
@@ -149,7 +149,7 @@
if(!redefine_impl->methods || !redefine_impl->ht_super)
{
axis2_xml_schema_redefine_free(&(redefine_impl->redefine), 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;
}
@@ -197,7 +197,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_redefine_free(void *redefine,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_redefine_impl_t *redefine_impl = NULL;
@@ -223,22 +223,22 @@
if(NULL != redefine_impl->redefine.ops)
{
- AXIS2_FREE((*env)->allocator, redefine_impl->redefine.ops);
+ AXIS2_FREE(env->allocator, redefine_impl->redefine.ops);
redefine_impl->redefine.ops = NULL;
}
if(NULL != redefine_impl->redefine.base.ops)
{
- AXIS2_FREE((*env)->allocator, redefine_impl->redefine.base.ops);
+ AXIS2_FREE(env->allocator, redefine_impl->redefine.base.ops);
redefine_impl->redefine.base.ops = NULL;
}
- AXIS2_FREE((*env)->allocator, redefine_impl);
+ AXIS2_FREE(env->allocator, redefine_impl);
redefine_impl = NULL;
return AXIS2_SUCCESS;
}
axis2_xml_schema_external_t *AXIS2_CALL
axis2_xml_schema_redefine_get_base_impl(void *redefine,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_redefine_impl_t *redefine_impl = NULL;
@@ -253,19 +253,19 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_xml_schema_redefine_resolve_methods(
axis2_xml_schema_redefine_t *redefine,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_redefine_t *redefine_impl,
axis2_hash_t *methods)
{
axis2_xml_schema_redefine_impl_t *redefine_impl_l = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, redefine_impl, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, methods, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, redefine_impl, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
redefine_impl_l = (axis2_xml_schema_redefine_impl_t *) redefine_impl;
- redefine->ops = AXIS2_MALLOC((*env)->allocator,
+ redefine->ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_redefine_ops_t));
redefine->ops->free = axis2_hash_get(methods, "free",
@@ -284,19 +284,19 @@
*/
axis2_xml_schema_obj_table_t* AXIS2_CALL
axis2_xml_schema_redefine_get_attribute_group(void *redefine,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(redefine)->attr_groups;
}
axis2_status_t AXIS2_CALL
axis2_xml_schema_redefine_set_attribute_group(void *redefine,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_obj_table_t *group)
{
axis2_xml_schema_redefine_impl_t *red_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, group, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, group, AXIS2_FAILURE);
red_impl = AXIS2_INTF_TO_IMPL(redefine);
if(NULL != red_impl->groups)
{
@@ -310,28 +310,28 @@
axis2_xml_schema_obj_collection_t* AXIS2_CALL
axis2_xml_schema_redefine_get_items(void *redefine,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(redefine)->items;
}
axis2_xml_schema_obj_table_t* AXIS2_CALL
axis2_xml_schema_redefine_get_schema_types(void *redefine,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(redefine)->schema_types;
}
axis2_xml_schema_obj_table_t* AXIS2_CALL
axis2_xml_schema_redefine_get_group(void *redefine,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(redefine)->groups;
}
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_redefine_type(void *redefine,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(redefine)->obj_type;
}
@@ -339,7 +339,7 @@
axis2_hash_t *AXIS2_CALL
axis2_xml_schema_redefine_super_objs(void *redefine,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(redefine)->ht_super;
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content.c?rev=410750&r1=410749&r2=410750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content.c Wed May 31 22:18:45 2006
@@ -44,47 +44,47 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_simple_content_free(void *sim_content,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_annotated_t *AXIS2_CALL
axis2_xml_schema_simple_content_get_base_impl(void *sim_content,
- axis2_env_t **env);
+ const axis2_env_t *env);
void* AXIS2_CALL
axis2_xml_schema_simple_content_get_content(void *sim_content,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_simple_content_type(void *sim_content,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_hash_t* AXIS2_CALL
axis2_xml_schema_simple_content_super_objs(void *sim_content,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_simple_content_set_content(void *sim_content,
- axis2_env_t **env,
+ const axis2_env_t *env,
void* content);
axis2_char_t* AXIS2_CALL
axis2_xml_schema_simple_content_to_string(void *sim_content,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *prefix,
int tab);
AXIS2_EXTERN axis2_xml_schema_simple_content_t * AXIS2_CALL
-axis2_xml_schema_simple_content_create(axis2_env_t **env)
+axis2_xml_schema_simple_content_create(const axis2_env_t *env)
{
axis2_xml_schema_simple_content_impl_t *sim_cnt_impl = NULL;
axis2_status_t status = AXIS2_FAILURE;
- sim_cnt_impl = (axis2_xml_schema_simple_content_impl_t*)AXIS2_MALLOC((*env)->allocator,
+ sim_cnt_impl = (axis2_xml_schema_simple_content_impl_t*)AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_simple_content_impl_t));
if(!sim_cnt_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;
}
@@ -96,12 +96,12 @@
sim_cnt_impl->ht_super = NULL;
sim_cnt_impl->obj_type = AXIS2_XML_SCHEMA_SIMPLE_CONTENT;
- sim_cnt_impl->sim_content.ops = AXIS2_MALLOC((*env)->allocator,
+ sim_cnt_impl->sim_content.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_simple_content_ops_t));
if(!sim_cnt_impl->sim_content.ops)
{
axis2_xml_schema_simple_content_free(&(sim_cnt_impl->sim_content), 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;
}
@@ -126,7 +126,7 @@
if(!sim_cnt_impl->methods)
{
axis2_xml_schema_simple_content_free(&(sim_cnt_impl->sim_content), 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(sim_cnt_impl->methods, "free", AXIS2_HASH_KEY_STRING,
@@ -173,7 +173,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_simple_content_free(void *sim_content,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_simple_content_impl_t *sim_cnt_impl = NULL;
@@ -202,23 +202,23 @@
}
if(NULL != sim_cnt_impl->sim_content.base.ops)
{
- AXIS2_FREE((*env)->allocator, sim_cnt_impl->sim_content.base.ops);
+ AXIS2_FREE(env->allocator, sim_cnt_impl->sim_content.base.ops);
sim_cnt_impl->sim_content.base.ops = NULL;
}
if(NULL != sim_cnt_impl->sim_content.ops)
{
- AXIS2_FREE((*env)->allocator, sim_cnt_impl->sim_content.ops);
+ AXIS2_FREE(env->allocator, sim_cnt_impl->sim_content.ops);
sim_cnt_impl->sim_content.ops = NULL;
}
- AXIS2_FREE((*env)->allocator, sim_cnt_impl);
+ AXIS2_FREE(env->allocator, sim_cnt_impl);
sim_cnt_impl = NULL;
return AXIS2_SUCCESS;
}
axis2_xml_schema_annotated_t *AXIS2_CALL
axis2_xml_schema_simple_content_get_base_impl(void *sim_content,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_simple_content_impl_t *sim_cnt_impl = NULL;
@@ -232,24 +232,24 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_xml_schema_simple_content_resolve_methods(
axis2_xml_schema_simple_content_t *sim_content,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_simple_content_t *sim_cnt_impl,
axis2_hash_t *methods)
{
axis2_xml_schema_simple_content_impl_t *group_impl_l = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, sim_cnt_impl, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, methods, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, sim_content, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, sim_cnt_impl, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, sim_content, AXIS2_FAILURE);
group_impl_l = (axis2_xml_schema_simple_content_impl_t *) sim_cnt_impl;
- sim_content->ops = AXIS2_MALLOC((*env)->allocator,
+ sim_content->ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_simple_content_ops_t));
if(!sim_content->ops)
{
- 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;
}
sim_content->ops->free = axis2_hash_get(methods, "free",
@@ -271,7 +271,7 @@
void* AXIS2_CALL
axis2_xml_schema_simple_content_get_content(void *sim_content,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(sim_content)->content;
@@ -279,13 +279,13 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_simple_content_set_content(void *sim_content,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *content)
{
axis2_xml_schema_simple_content_impl_t *sim_cnt_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, content, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, content, AXIS2_FAILURE);
sim_cnt_impl = AXIS2_INTF_TO_IMPL(sim_content);
@@ -300,7 +300,7 @@
axis2_char_t* AXIS2_CALL
axis2_xml_schema_simple_content_to_string(void *sim_content,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *prefix,
int tab)
{
@@ -318,14 +318,14 @@
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_simple_content_type(void *sim_content,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(sim_content)->obj_type;
}
axis2_hash_t* AXIS2_CALL
axis2_xml_schema_simple_content_super_objs(void *sim_content,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(sim_content)->ht_super;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org