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 [7/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_collection.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c?rev=410750&r1=410749&r2=410750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c Wed May 31 22:18:45 2006
@@ -64,133 +64,133 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_collection_free(
axis2_xml_schema_collection_t* collection,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_collection_set_base_uri(
axis2_xml_schema_collection_t* collection,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *base_uri);
axis2_status_t AXIS2_CALL
axis2_xml_schema_collection_init(
axis2_xml_schema_collection_t* collection,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_t* AXIS2_CALL
axis2_xml_schema_collection_read_with_reader(
axis2_xml_schema_collection_t* collection,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_reader_t *reader);
axis2_xml_schema_t * AXIS2_CALL
axis2_xml_schema_collection_read_document(
axis2_xml_schema_collection_t* collection,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_document_t* document);
axis2_xml_schema_t * AXIS2_CALL
axis2_xml_schema_collection_read_element(
axis2_xml_schema_collection_t* collection,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *node);
axis2_xml_schema_t* AXIS2_CALL
axis2_xml_schema_collection_read_document_with_uri(
axis2_xml_schema_collection_t* collection,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_document_t *document,
axis2_char_t *uri);
axis2_xml_schema_t * AXIS2_CALL
axis2_xml_schema_collection_read_element_with_uri(
axis2_xml_schema_collection_t* collection,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *node,
axis2_char_t *uri);
axis2_xml_schema_element_t * AXIS2_CALL
axis2_xml_schema_collection_get_element_by_qname(
axis2_xml_schema_collection_t* collection,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname);
axis2_xml_schema_type_t * AXIS2_CALL
axis2_xml_schema_collection_get_type_by_qname(
axis2_xml_schema_collection_t* collection,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *schema_type_qname);
axis2_status_t AXIS2_CALL
axis2_xml_schema_collection_add_unresolved_type(
axis2_xml_schema_collection_t* collection,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qtype,
void *receiver);
axis2_status_t AXIS2_CALL
axis2_xml_schema_collection_resolve_type(
axis2_xml_schema_collection_t* collection,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *type_qname,
axis2_xml_schema_type_t *type);
axis2_char_t * AXIS2_CALL
axis2_xml_schema_collection_get_namespace_for_prefix(
axis2_xml_schema_collection_t *collection,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *prefix);
axis2_status_t AXIS2_CALL
axis2_xml_schema_collection_map_namespace(
axis2_xml_schema_collection_t* collection,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *prefix,
axis2_char_t *namespc_uri);
static axis2_status_t
add_simple_type(
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_t* schema,
axis2_char_t *type_name);
axis2_hash_t* AXIS2_CALL
axis2_xml_schema_collection_get_systemid2_schemas(
axis2_xml_schema_collection_t *collection,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_array_list_t* AXIS2_CALL
axis2_xml_schema_collection_get_schemas(
axis2_xml_schema_collection_t *collection,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_collection_set_schemas(
axis2_xml_schema_collection_t *collection,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_array_list_t *schemas);
axis2_hash_t* AXIS2_CALL
axis2_xml_schema_collection_get_namespaces(
axis2_xml_schema_collection_t *collection,
- axis2_env_t **env);
+ const axis2_env_t *env);
/*************** end function prototypes ****************************/
AXIS2_EXTERN axis2_xml_schema_collection_t * AXIS2_CALL
-axis2_xml_schema_collection_create(axis2_env_t **env)
+axis2_xml_schema_collection_create(const axis2_env_t *env)
{
axis2_xml_schema_collection_impl_t *collection_impl = NULL;
- collection_impl = AXIS2_MALLOC((*env)->allocator,
+ collection_impl = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_collection_impl_t));
if(!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;
}
@@ -203,13 +203,13 @@
collection_impl->systemid2_schemas = NULL;
collection_impl->schemas = NULL;
- collection_impl->collection.ops = AXIS2_MALLOC((*env)->allocator,
+ collection_impl->collection.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_collection_ops_t));
if(!collection_impl->collection.ops)
{
axis2_xml_schema_collection_free(&(collection_impl->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;
}
@@ -282,7 +282,7 @@
!collection_impl->unresolved_types )
{
axis2_xml_schema_collection_free(&(collection_impl->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;
}
@@ -294,20 +294,20 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_collection_free(axis2_xml_schema_collection_t *collection,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
if(NULL != collection->ops)
{
- AXIS2_FREE((*env)->allocator, collection->ops);
+ AXIS2_FREE(env->allocator, collection->ops);
collection->ops = NULL;
}
- AXIS2_FREE((*env)->allocator, AXIS2_INTF_TO_IMPL(collection));
+ AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(collection));
return AXIS2_SUCCESS;
}
axis2_status_t AXIS2_CALL
axis2_xml_schema_collection_set_base_uri(axis2_xml_schema_collection_t*collection,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *base_uri)
{
return AXIS2_SUCCESS;
@@ -316,7 +316,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_collection_init(
axis2_xml_schema_collection_t* collection,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_collection_impl_t *collection_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -405,14 +405,14 @@
axis2_xml_schema_t* AXIS2_CALL
axis2_xml_schema_collection_read_with_reader(
axis2_xml_schema_collection_t* collection,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_reader_t *reader)
{
axis2_xml_schema_builder_t *sch_builder = NULL;
axis2_om_document_t *om_doc = NULL;
axis2_om_stax_builder_t *om_builder = NULL;
- AXIS2_PARAM_CHECK((*env)->error, reader, NULL);
+ AXIS2_PARAM_CHECK(env->error, reader, NULL);
om_builder = axis2_om_stax_builder_create(env, reader);
if(!om_builder)
@@ -439,12 +439,12 @@
axis2_xml_schema_t * AXIS2_CALL
axis2_xml_schema_collection_read_document(
axis2_xml_schema_collection_t* collection,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_document_t* document)
{
axis2_xml_schema_collection_impl_t *sch_col_impl = NULL;
axis2_xml_schema_builder_t *sch_builder = NULL;
- AXIS2_PARAM_CHECK((*env)->error , document, NULL);
+ AXIS2_PARAM_CHECK(env->error , document, NULL);
sch_builder = axis2_xml_schema_builder_create(env, collection);
return AXIS2_XML_SCHEMA_BUILDER_BUILD(sch_builder, env, document, NULL);
@@ -454,12 +454,12 @@
axis2_xml_schema_t * AXIS2_CALL
axis2_xml_schema_collection_read_element(
axis2_xml_schema_collection_t* collection,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *node)
{
axis2_xml_schema_builder_t *sch_builder = NULL;
- AXIS2_PARAM_CHECK((*env)->error, node, NULL);
+ AXIS2_PARAM_CHECK(env->error, node, NULL);
sch_builder = axis2_xml_schema_builder_create(env, collection);
@@ -472,7 +472,7 @@
axis2_xml_schema_t* AXIS2_CALL
axis2_xml_schema_collection_read_document_with_uri(
axis2_xml_schema_collection_t* collection,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_document_t *document,
axis2_char_t *uri)
{
@@ -482,7 +482,7 @@
axis2_xml_schema_t * AXIS2_CALL
axis2_xml_schema_collection_read_element_with_uri(
axis2_xml_schema_collection_t* collection,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *node,
axis2_char_t *uri)
{
@@ -492,13 +492,13 @@
axis2_xml_schema_element_t * AXIS2_CALL
axis2_xml_schema_collection_get_element_by_qname(
axis2_xml_schema_collection_t* collection,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname)
{
axis2_char_t *uri = NULL;
axis2_xml_schema_t *schema = NULL;
axis2_xml_schema_collection_impl_t *collec_impl = NULL;
- AXIS2_PARAM_CHECK((*env)->error, qname, NULL);
+ AXIS2_PARAM_CHECK(env->error, qname, NULL);
collec_impl = AXIS2_INTF_TO_IMPL(collection);
@@ -515,14 +515,14 @@
axis2_xml_schema_type_t * AXIS2_CALL
axis2_xml_schema_collection_get_type_by_qname(
axis2_xml_schema_collection_t* collection,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *schema_type_qname)
{
axis2_xml_schema_collection_impl_t *collecion_impl = NULL;
axis2_char_t *uri = NULL;
axis2_xml_schema_t *schema = NULL;
- AXIS2_PARAM_CHECK((*env)->error, schema_type_qname, NULL);
+ AXIS2_PARAM_CHECK(env->error, schema_type_qname, NULL);
collecion_impl = AXIS2_INTF_TO_IMPL(collection);
uri = AXIS2_QNAME_GET_URI(schema_type_qname, env);
if(NULL != collecion_impl->namespaces)
@@ -537,7 +537,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_collection_add_unresolved_type(
axis2_xml_schema_collection_t* collection,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qtype,
void *obj)
{
@@ -546,8 +546,8 @@
axis2_array_list_t *receivers = NULL;
- AXIS2_PARAM_CHECK((*env)->error, qtype, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, obj, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, qtype, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, obj, AXIS2_FAILURE);
collection_impl = AXIS2_INTF_TO_IMPL(collection);
qn_string = AXIS2_QNAME_TO_STRING(qtype, env);
@@ -573,15 +573,15 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_collection_resolve_type(
axis2_xml_schema_collection_t* collection,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *type_qname,
axis2_xml_schema_type_t *type)
{
axis2_xml_schema_collection_impl_t *collection_impl = NULL;
axis2_char_t *qn_string = NULL;
axis2_array_list_t *receivers = NULL;
- AXIS2_PARAM_CHECK((*env)->error, type_qname, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, type, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, type_qname, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, type, AXIS2_FAILURE);
collection_impl = AXIS2_INTF_TO_IMPL(collection);
qn_string = AXIS2_QNAME_TO_STRING(type_qname, env);
@@ -618,12 +618,12 @@
axis2_char_t *AXIS2_CALL
axis2_xml_schema_collection_get_namespace_for_prefix(
axis2_xml_schema_collection_t *collection,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *prefix)
{
axis2_xml_schema_collection_impl_t *collection_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, prefix, NULL);
+ AXIS2_PARAM_CHECK(env->error, prefix, NULL);
collection_impl = AXIS2_INTF_TO_IMPL(collection);
if(NULL != collection_impl->in_scope_namespaces)
{
@@ -639,7 +639,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_collection_map_namespace(
axis2_xml_schema_collection_t *collection,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *prefix,
axis2_char_t *namespc_uri)
{
@@ -657,7 +657,7 @@
static axis2_status_t
add_simple_type(
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_t* schema,
axis2_char_t *type_name)
{
@@ -671,7 +671,7 @@
axis2_hash_t* AXIS2_CALL
axis2_xml_schema_collection_get_systemid2_schemas(
axis2_xml_schema_collection_t *collection,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_collection_impl_t *collection_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -682,7 +682,7 @@
axis2_array_list_t* AXIS2_CALL
axis2_xml_schema_collection_get_schemas(
axis2_xml_schema_collection_t *collection,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_collection_impl_t *collection_impl = NULL;
collection_impl = AXIS2_INTF_TO_IMPL(collection);
@@ -692,7 +692,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_collection_set_schemas(
axis2_xml_schema_collection_t *collection,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_array_list_t *schemas)
{
axis2_xml_schema_collection_impl_t *collection_impl = NULL;
@@ -708,7 +708,7 @@
axis2_hash_t* AXIS2_CALL
axis2_xml_schema_collection_get_namespaces(
axis2_xml_schema_collection_t *collection,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_collection_impl_t *collection_impl = NULL;
collection_impl = AXIS2_INTF_TO_IMPL(collection);
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content.c?rev=410750&r1=410749&r2=410750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content.c Wed May 31 22:18:45 2006
@@ -46,57 +46,57 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_complex_content_free(void *complex_content,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_annotated_t *AXIS2_CALL
axis2_xml_schema_complex_content_get_base_impl(void *complex_content,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_complex_content_type(void *complex_content,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_hash_t* AXIS2_CALL
axis2_xml_schema_complex_content_super_objs(void *complex_content,
- axis2_env_t **env);
+ const axis2_env_t *env);
void* AXIS2_CALL
axis2_xml_schema_complex_content_get_content(void *complex_content,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_complex_content_set_content(void *complex_content,
- axis2_env_t **env,
+ const axis2_env_t *env,
void* content);
axis2_char_t* AXIS2_CALL
axis2_xml_schema_complex_content_to_string(void *complex_content,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *prefix,
int tab);
axis2_bool_t AXIS2_CALL
axis2_xml_schema_complex_content_is_mixed(void *complex_content,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_complex_content_set_mixed(void *complex_content,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_bool_t mixed);
/***************** end function prototypes ***********************************/
AXIS2_EXTERN axis2_xml_schema_complex_content_t * AXIS2_CALL
-axis2_xml_schema_complex_content_create(axis2_env_t **env)
+axis2_xml_schema_complex_content_create(const axis2_env_t *env)
{
axis2_xml_schema_complex_content_impl_t *complex_content_impl = NULL;
axis2_status_t status = AXIS2_FAILURE;
- complex_content_impl = (axis2_xml_schema_complex_content_impl_t*)AXIS2_MALLOC((*env)->allocator,
+ complex_content_impl = (axis2_xml_schema_complex_content_impl_t*)AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_complex_content_impl_t));
if(!complex_content_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;
}
@@ -109,12 +109,12 @@
complex_content_impl->complex_content.base.ops = NULL;
complex_content_impl->complex_content.ops = NULL;
- complex_content_impl->complex_content.ops = AXIS2_MALLOC((*env)->allocator,
+ complex_content_impl->complex_content.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_complex_content_ops_t));
if(!complex_content_impl->complex_content.ops)
{
axis2_xml_schema_complex_content_free(&(complex_content_impl->complex_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;
}
@@ -141,7 +141,7 @@
if(!complex_content_impl->methods || !complex_content_impl->ht_super)
{
axis2_xml_schema_complex_content_free(&(complex_content_impl->complex_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(complex_content_impl->methods, "free", AXIS2_HASH_KEY_STRING,
@@ -183,7 +183,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_complex_content_free(void *complex_content,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_complex_content_impl_t *complex_content_impl = NULL;
@@ -211,23 +211,23 @@
}
if(NULL != complex_content_impl->complex_content.base.ops)
{
- AXIS2_FREE((*env)->allocator, complex_content_impl->complex_content.base.ops);
+ AXIS2_FREE(env->allocator, complex_content_impl->complex_content.base.ops);
complex_content_impl->complex_content.base.ops = NULL;
}
if(NULL != complex_content_impl->complex_content.ops)
{
- AXIS2_FREE((*env)->allocator, complex_content_impl->complex_content.ops);
+ AXIS2_FREE(env->allocator, complex_content_impl->complex_content.ops);
complex_content_impl->complex_content.ops = NULL;
}
- AXIS2_FREE((*env)->allocator, complex_content_impl);
+ AXIS2_FREE(env->allocator, complex_content_impl);
complex_content_impl = NULL;
return AXIS2_SUCCESS;
}
axis2_xml_schema_annotated_t *AXIS2_CALL
axis2_xml_schema_complex_content_get_base_impl(void *complex_content,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_complex_content_impl_t *complex_content_impl = NULL;
@@ -240,24 +240,24 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_xml_schema_complex_content_resolve_methods(
axis2_xml_schema_complex_content_t *complex_content,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_complex_content_t *complex_content_impl,
axis2_hash_t *methods)
{
axis2_xml_schema_complex_content_impl_t *complex_content_impl_l = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, complex_content_impl, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, methods, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, complex_content, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, complex_content_impl, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, complex_content, AXIS2_FAILURE);
complex_content_impl_l = (axis2_xml_schema_complex_content_impl_t *) complex_content_impl;
- complex_content->ops = AXIS2_MALLOC((*env)->allocator,
+ complex_content->ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_complex_content_ops_t));
if(!complex_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;
}
complex_content->ops->free = axis2_hash_get(methods, "free",
@@ -284,7 +284,7 @@
void* AXIS2_CALL
axis2_xml_schema_complex_content_get_content(void *complex_content,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(complex_content)->content;
@@ -292,13 +292,13 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_complex_content_set_content(void *complex_content,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *content)
{
axis2_xml_schema_complex_content_impl_t *complex_content_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, content, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, content, AXIS2_FAILURE);
complex_content_impl = AXIS2_INTF_TO_IMPL(complex_content);
@@ -313,7 +313,7 @@
axis2_char_t* AXIS2_CALL
axis2_xml_schema_complex_content_to_string(void *complex_content,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *prefix,
int tab)
{
@@ -335,7 +335,7 @@
temp_xml = xml;
xml = AXIS2_STRACAT(xml, "\t", env);
if(NULL != temp_xml)
- AXIS2_FREE((*env)->allocator, temp_xml);
+ AXIS2_FREE(env->allocator, temp_xml);
temp_xml = NULL;
}
}
@@ -351,7 +351,7 @@
xml = AXIS2_STRACAT(temp_xml, "complexContent>\n", env);
if(NULL != temp_xml)
{
- AXIS2_FREE((*env)->allocator, temp_xml);
+ AXIS2_FREE(env->allocator, temp_xml);
temp_xml = NULL;
}
@@ -363,7 +363,7 @@
axis2_bool_t AXIS2_CALL
axis2_xml_schema_complex_content_is_mixed(void *complex_content,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_complex_content_impl_t *complex_content_impl = NULL;
/** AXIS2_ENV_CHECK(env, AXIS2_FAILURE); */
@@ -373,7 +373,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_complex_content_set_mixed(void *complex_content,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_bool_t mixed)
{
axis2_xml_schema_complex_content_impl_t *complex_content_impl = NULL;
@@ -385,14 +385,14 @@
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_complex_content_type(void *complex_content,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(complex_content)->obj_type;
}
axis2_hash_t* AXIS2_CALL
axis2_xml_schema_complex_content_super_objs(void *complex_content,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(complex_content)->ht_super;
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_extension.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_extension.c?rev=410750&r1=410749&r2=410750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_extension.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_extension.c Wed May 31 22:18:45 2006
@@ -51,83 +51,83 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_complex_content_extension_free(
void *cmp_cnt_ext,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_annotated_t *AXIS2_CALL
axis2_xml_schema_complex_content_extension_get_base_impl(
void *cmp_cnt_ext,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_complex_content_extension_type(
void *cmp_cnt_ext,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_hash_t *AXIS2_CALL
axis2_xml_schema_complex_content_extension_super_objs(
void *cmp_cnt_ext,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_any_attribute_t* AXIS2_CALL
axis2_xml_schema_complex_content_extension_get_any_attribute(
void *cmp_cnt_ext,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_complex_content_extension_set_any_attribute(
void *cmp_cnt_ext,
- 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_complex_content_extension_get_attributes(
void *cmp_cnt_ext,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_complex_content_extension_set_base_type_name(
void *cmp_cnt_ext,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *base_type_name);
axis2_qname_t* AXIS2_CALL
axis2_xml_schema_complex_content_extension_get_base_type_name(
void *cmp_cnt_ext,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_particle_t* AXIS2_CALL
axis2_xml_schema_complex_content_extension_get_particle(
void *cmp_cnt_ext,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_complex_content_extension_set_particle(
void *cmp_cnt_ext,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_particle_t *particle);
axis2_char_t *AXIS2_CALL
axis2_xml_schema_complex_content_extension_to_string(
void *cmp_cnt_ext,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *prefix,
int tab);
/*************************** end function protos **********************************/
AXIS2_EXTERN axis2_xml_schema_complex_content_extension_t * AXIS2_CALL
-axis2_xml_schema_complex_content_extension_create(axis2_env_t **env)
+axis2_xml_schema_complex_content_extension_create(const axis2_env_t *env)
{
axis2_xml_schema_complex_content_extension_impl_t *cmp_cnt_ext_impl = NULL;
axis2_status_t status = AXIS2_FAILURE;
cmp_cnt_ext_impl = (axis2_xml_schema_complex_content_extension_impl_t*)
- AXIS2_MALLOC((*env)->allocator,
+ AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_complex_content_extension_impl_t));
if(!cmp_cnt_ext_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;
}
@@ -141,14 +141,14 @@
cmp_cnt_ext_impl->methods = NULL;
cmp_cnt_ext_impl->obj_type = AXIS2_XML_SCHEMA_COMPLEX_CONTENT_RESTRICTION;
- cmp_cnt_ext_impl->cmp_cnt_ext.ops = AXIS2_MALLOC((*env)->allocator,
+ cmp_cnt_ext_impl->cmp_cnt_ext.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_complex_content_extension_ops_t));
if(!cmp_cnt_ext_impl->cmp_cnt_ext.ops)
{
axis2_xml_schema_complex_content_extension_free(
&(cmp_cnt_ext_impl->cmp_cnt_ext), env);
- AXIS2_ERROR_SET((*env)->error,
+ AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -240,7 +240,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_complex_content_extension_free(void *cmp_cnt_ext_ext_ext,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_complex_content_extension_impl_t *content_ext_impl = NULL;
@@ -267,23 +267,23 @@
}
if(NULL != content_ext_impl->cmp_cnt_ext.ops)
{
- AXIS2_FREE((*env)->allocator, content_ext_impl->cmp_cnt_ext.ops);
+ AXIS2_FREE(env->allocator, content_ext_impl->cmp_cnt_ext.ops);
content_ext_impl->cmp_cnt_ext.ops = NULL;
}
if(NULL != content_ext_impl->cmp_cnt_ext.base.ops)
{
- AXIS2_FREE((*env)->allocator, content_ext_impl->cmp_cnt_ext.base.ops);
+ AXIS2_FREE(env->allocator, content_ext_impl->cmp_cnt_ext.base.ops);
content_ext_impl->cmp_cnt_ext.base.ops = NULL;
}
- AXIS2_FREE((*env)->allocator, content_ext_impl);
+ AXIS2_FREE(env->allocator, content_ext_impl);
content_ext_impl = NULL;
return AXIS2_SUCCESS;
}
axis2_xml_schema_annotated_t *AXIS2_CALL
axis2_xml_schema_complex_content_extension_get_base_impl(void *cmp_cnt_ext,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_complex_content_extension_impl_t *content_ext_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -295,7 +295,7 @@
axis2_xml_schema_any_attribute_t* AXIS2_CALL
axis2_xml_schema_complex_content_extension_get_any_attribute(void *cmp_cnt_ext,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_complex_content_extension_impl_t *cnt_ext_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -305,13 +305,13 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_complex_content_extension_set_any_attribute(void *cmp_cnt_ext,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_any_attribute_t *any_attr)
{
axis2_xml_schema_complex_content_extension_impl_t *content_ext_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, any_attr, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, any_attr, AXIS2_FAILURE);
if(NULL != content_ext_impl->any_attribute)
{
AXIS2_XML_SCHEMA_ANY_ATTRIBUTE_FREE(content_ext_impl->any_attribute, env);
@@ -323,7 +323,7 @@
axis2_xml_schema_obj_collection_t* AXIS2_CALL
axis2_xml_schema_complex_content_extension_get_attributes(void *cmp_cnt_ext,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_complex_content_extension_impl_t *cnt_ext_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -334,7 +334,7 @@
axis2_qname_t* AXIS2_CALL
axis2_xml_schema_complex_content_extension_get_base_type_name(
void *cmp_cnt_ext,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_complex_content_extension_impl_t *content_ext_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -345,7 +345,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_complex_content_extension_set_base_type_name(
void *cmp_cnt_ext,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *base_type_name)
{
axis2_xml_schema_complex_content_extension_impl_t *content_ext_impl = NULL;
@@ -363,7 +363,7 @@
axis2_xml_schema_particle_t* AXIS2_CALL
axis2_xml_schema_complex_content_extension_get_particle(
void *cmp_cnt_ext,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(cmp_cnt_ext)->particle;
}
@@ -371,12 +371,12 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_complex_content_extension_set_particle(
void *cmp_cnt_ext,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_particle_t *particle)
{
axis2_xml_schema_complex_content_extension_impl_t *cmp_cnt_ext_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, particle, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, particle, AXIS2_FAILURE);
cmp_cnt_ext_impl = AXIS2_INTF_TO_IMPL(cmp_cnt_ext);
if(NULL != cmp_cnt_ext_impl->particle)
{
@@ -390,7 +390,7 @@
axis2_char_t *AXIS2_CALL
axis2_xml_schema_complex_content_extension_to_string(
void *cmp_cnt_ext,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *prefix,
int tab)
{
@@ -400,7 +400,7 @@
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_complex_content_extension_type(
void *cmp_cnt_ext,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(cmp_cnt_ext)->obj_type;
}
@@ -408,7 +408,7 @@
axis2_hash_t *AXIS2_CALL
axis2_xml_schema_complex_content_extension_super_objs(
void *cmp_cnt_ext,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(cmp_cnt_ext)->ht_super;
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_restriction.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_restriction.c?rev=410750&r1=410749&r2=410750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_restriction.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_restriction.c Wed May 31 22:18:45 2006
@@ -51,82 +51,82 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_complex_content_restriction_free(
void *cmp_content_res,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_annotated_t *AXIS2_CALL
axis2_xml_schema_complex_content_restriction_get_base_impl(
void *cmp_content_res,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_hash_t *AXIS2_CALL
axis2_xml_schema_complex_content_restriction_super_objs(
void *cmp_content_res,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_complex_content_restriction_type(
void *cmp_content_res,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_any_attribute_t* AXIS2_CALL
axis2_xml_schema_complex_content_restriction_get_any_attribute(
void *cmp_content_res,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_complex_content_restriction_set_any_attribute(
void *cmp_content_res,
- 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_complex_content_restriction_get_attributes(
void *cmp_content_res,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_complex_content_restriction_set_base_type_name(
void *cmp_content_res,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *base_type_name);
axis2_qname_t* AXIS2_CALL
axis2_xml_schema_complex_content_restriction_get_base_type_name(
void *cmp_content_res,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
axis2_xml_schema_complex_content_restriction_to_string(
void *cmp_cnt_res,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *prefix,
int tab);
axis2_xml_schema_particle_t* AXIS2_CALL
axis2_xml_schema_complex_content_restriction_get_particle(
void *cmp_cnt_res,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_complex_content_restriction_set_particle(
void *cmp_content,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_particle_t *particle);
/*****************************************************************************/
AXIS2_EXTERN axis2_xml_schema_complex_content_restriction_t * AXIS2_CALL
-axis2_xml_schema_complex_content_restriction_create(axis2_env_t **env)
+axis2_xml_schema_complex_content_restriction_create(const axis2_env_t *env)
{
axis2_xml_schema_complex_content_restriction_impl_t *cmp_content_res_impl = NULL;
axis2_status_t status = AXIS2_FAILURE;
cmp_content_res_impl = (axis2_xml_schema_complex_content_restriction_impl_t*)
- AXIS2_MALLOC((*env)->allocator, sizeof(axis2_xml_schema_complex_content_restriction_impl_t));
+ AXIS2_MALLOC(env->allocator, sizeof(axis2_xml_schema_complex_content_restriction_impl_t));
if(!cmp_content_res_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;
}
@@ -142,13 +142,13 @@
cmp_content_res_impl->obj_type = AXIS2_XML_SCHEMA_COMPLEX_CONTENT_RESTRICTION;
- cmp_content_res_impl->cmp_content_res.ops = AXIS2_MALLOC((*env)->allocator,
+ cmp_content_res_impl->cmp_content_res.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_complex_content_restriction_ops_t));
if(!cmp_content_res_impl->cmp_content_res.ops)
{
axis2_xml_schema_complex_content_restriction_free(
&(cmp_content_res_impl->cmp_content_res), env);
- AXIS2_ERROR_SET((*env)->error,
+ AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -264,7 +264,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_complex_content_restriction_free(
void *cmp_content_res,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_complex_content_restriction_impl_t *content_res_impl = NULL;
@@ -293,16 +293,16 @@
}
if(NULL != content_res_impl->cmp_content_res.base.ops)
{
- AXIS2_FREE((*env)->allocator, content_res_impl->cmp_content_res.base.ops);
+ AXIS2_FREE(env->allocator, content_res_impl->cmp_content_res.base.ops);
content_res_impl->cmp_content_res.base.ops = NULL;
}
if(NULL != content_res_impl->cmp_content_res.ops)
{
- AXIS2_FREE((*env)->allocator, content_res_impl->cmp_content_res.ops);
+ AXIS2_FREE(env->allocator, content_res_impl->cmp_content_res.ops);
content_res_impl->cmp_content_res.ops = NULL;
}
- AXIS2_FREE((*env)->allocator, content_res_impl);
+ AXIS2_FREE(env->allocator, content_res_impl);
content_res_impl = NULL;
return AXIS2_SUCCESS;
}
@@ -310,7 +310,7 @@
axis2_xml_schema_annotated_t *AXIS2_CALL
axis2_xml_schema_complex_content_restriction_get_base_impl(
void *cmp_content_res,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_complex_content_restriction_impl_t *content_res_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -323,7 +323,7 @@
axis2_xml_schema_any_attribute_t* AXIS2_CALL
axis2_xml_schema_complex_content_restriction_get_any_attribute(
void *cmp_content_res,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_complex_content_restriction_impl_t *cnt_res_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -334,13 +334,13 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_complex_content_restriction_set_any_attribute(
void *cmp_content_res,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_any_attribute_t *any_attr)
{
axis2_xml_schema_complex_content_restriction_impl_t *content_res_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, any_attr, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, any_attr, AXIS2_FAILURE);
if(NULL != content_res_impl->any_attribute)
{
AXIS2_XML_SCHEMA_ANY_ATTRIBUTE_FREE(content_res_impl->any_attribute, env);
@@ -354,7 +354,7 @@
axis2_xml_schema_obj_collection_t* AXIS2_CALL
axis2_xml_schema_complex_content_restriction_get_attributes(
void *cmp_content,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_complex_content_restriction_impl_t *cnt_res_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -365,7 +365,7 @@
axis2_qname_t* AXIS2_CALL
axis2_xml_schema_complex_content_restriction_get_base_type_name(
void *cmp_content,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_complex_content_restriction_impl_t *content_res_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -376,7 +376,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_complex_content_restriction_set_base_type_name(
void *cmp_content,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *base_type_name)
{
axis2_xml_schema_complex_content_restriction_impl_t *content_res_impl = NULL;
@@ -394,12 +394,12 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_complex_content_restriction_set_particle(
void *cmp_content,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_particle_t *particle)
{
axis2_xml_schema_complex_content_restriction_impl_t *cmp_cnt_res_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, particle, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, particle, AXIS2_FAILURE);
if(NULL != cmp_cnt_res_impl->particle)
{
@@ -414,7 +414,7 @@
axis2_xml_schema_particle_t* AXIS2_CALL
axis2_xml_schema_complex_content_restriction_get_particle(
void *cmp_cnt_res,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(cmp_cnt_res)->particle;
}
@@ -422,7 +422,7 @@
axis2_char_t* AXIS2_CALL
axis2_xml_schema_complex_content_restriction_to_string(
void *cmp_cnt_res,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *prefix,
int tab)
{
@@ -433,7 +433,7 @@
axis2_hash_t *AXIS2_CALL
axis2_xml_schema_complex_content_restriction_super_objs(
void *cmp_content_res,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(cmp_content_res)->ht_super;
}
@@ -441,7 +441,7 @@
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_complex_content_restriction_type(
void *cmp_content_res,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(cmp_content_res)->obj_type;
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_type.c?rev=410750&r1=410749&r2=410750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_type.c Wed May 31 22:18:45 2006
@@ -68,130 +68,130 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_complex_type_free(
void *complex_type,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_type_t* AXIS2_CALL
axis2_xml_schema_complex_type_get_base_impl(
void *complex_type,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_complex_type_type(
void *complex_type,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_hash_t* AXIS2_CALL
axis2_xml_schema_complex_type_super_objs(
void *complex_type,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_any_attribute_t* AXIS2_CALL
axis2_xml_schema_complex_type_get_any_attribute(
void *cmp_type,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_complex_type_set_any_attribute(
void *cmp_type,
- 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_complex_type_get_attributes(
void *cmp_type,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_obj_table_t* AXIS2_CALL
axis2_xml_schema_complex_type_get_attribute_use(
void *cmp_type,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_any_attribute_t* AXIS2_CALL
axis2_xml_schema_complex_type_get_attribute_wildcard(
void *cmp_type,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_derivation_method_t* AXIS2_CALL
axis2_xml_schema_complex_type_get_block(
void *cmp_type,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_complex_type_set_block(
void *cmp_type,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_derivation_method_t *block);
axis2_xml_schema_derivation_method_t* AXIS2_CALL
axis2_xml_schema_complex_type_get_block_resolved(
void *cmp_type,
- axis2_env_t **env);
+ const axis2_env_t *env);
void* AXIS2_CALL
axis2_xml_schema_complex_type_get_content_model(
void *cmp_type,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_complex_type_set_content_model(
void *cmp_type,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *content_model);
axis2_xml_schema_content_type_t* AXIS2_CALL
axis2_xml_schema_complex_type_get_content_type(
void *cmp_type,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_complex_type_set_content_type(
void *cmp_type,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_content_type_t *content_type);
axis2_xml_schema_particle_t * AXIS2_CALL
axis2_xml_schema_complex_type_get_content_type_particle(
void *cmp_type,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_bool_t AXIS2_CALL
axis2_xml_schema_complex_type_is_abstract(
void *cmp_type,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_complex_type_set_abstract(
void *cmp_type,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_bool_t b);
axis2_bool_t AXIS2_CALL
axis2_xml_schema_complex_type_is_mixed(
void *cmp_type,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_complex_type_set_mixed(
void *cmp_type,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_bool_t b);
axis2_xml_schema_particle_t* AXIS2_CALL
axis2_xml_schema_complex_type_get_particle(
void *cmp_type,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_complex_type_set_particle(
void *cmp_type,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_particle_t *particle);
axis2_char_t* AXIS2_CALL
axis2_xml_schema_complex_type_to_string(
void *cmp_type,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *prefix,
int tab);
@@ -199,18 +199,18 @@
/************************** end ***********************************************/
AXIS2_EXTERN axis2_xml_schema_complex_type_t * AXIS2_CALL
-axis2_xml_schema_complex_type_create(axis2_env_t **env,
+axis2_xml_schema_complex_type_create(const axis2_env_t *env,
axis2_xml_schema_t *schema)
{
axis2_xml_schema_complex_type_impl_t *complex_type_impl = NULL;
axis2_xml_schema_annotated_t *annotated = NULL;
axis2_status_t status = AXIS2_FAILURE;
- complex_type_impl = AXIS2_MALLOC((*env)->allocator,
+ complex_type_impl = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_complex_type_impl_t));
if(!complex_type_impl)
{
- AXIS2_ERROR_SET((*env)->error,
+ AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -232,12 +232,12 @@
complex_type_impl->obj_type = AXIS2_XML_SCHEMA_COMPLEX_TYPE;
complex_type_impl->methods = NULL;
- complex_type_impl->complex_type.ops = AXIS2_MALLOC((*env)->allocator,
+ complex_type_impl->complex_type.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_complex_type_ops_t));
if(!complex_type_impl->complex_type.ops)
{
axis2_xml_schema_complex_type_free(&(complex_type_impl->complex_type), env);
- AXIS2_ERROR_SET((*env)->error,
+ AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -246,7 +246,7 @@
if(!complex_type_impl->schema_type)
{
axis2_xml_schema_complex_type_free(&(complex_type_impl->complex_type), 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;
}
@@ -320,7 +320,7 @@
if(!complex_type_impl->methods || !complex_type_impl->ht_super)
{
axis2_xml_schema_complex_type_free(&(complex_type_impl->complex_type), 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(complex_type_impl->methods, "free", AXIS2_HASH_KEY_STRING,
@@ -398,7 +398,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_complex_type_free(void *complex_type,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_complex_type_impl_t *complex_type_impl = NULL;
@@ -412,16 +412,16 @@
}
if(NULL != complex_type_impl->complex_type.base.ops)
{
- AXIS2_FREE((*env)->allocator, complex_type_impl->complex_type.base.ops);
+ AXIS2_FREE(env->allocator, complex_type_impl->complex_type.base.ops);
complex_type_impl->complex_type.base.ops = NULL;
}
if(NULL != complex_type_impl->complex_type.ops)
{
- AXIS2_FREE((*env)->allocator, complex_type_impl->complex_type.ops);
+ AXIS2_FREE(env->allocator, complex_type_impl->complex_type.ops);
complex_type_impl->complex_type.ops = NULL;
}
- AXIS2_FREE((*env)->allocator, complex_type_impl);
+ AXIS2_FREE(env->allocator, complex_type_impl);
complex_type_impl = NULL;
return AXIS2_SUCCESS;
}
@@ -429,7 +429,7 @@
axis2_xml_schema_type_t *AXIS2_CALL
axis2_xml_schema_complex_type_get_base_impl(
void *complex_type,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_complex_type_impl_t *complex_type_impl = NULL;
@@ -442,7 +442,7 @@
axis2_xml_schema_any_attribute_t* AXIS2_CALL
axis2_xml_schema_complex_type_get_any_attribute(
void *cmp_type,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(cmp_type)->any_attr;
}
@@ -450,7 +450,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_complex_type_set_any_attribute(
void *cmp_type,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_any_attribute_t *any_attr)
{
axis2_xml_schema_complex_type_impl_t *cmp_type_impl = NULL;
@@ -467,7 +467,7 @@
axis2_xml_schema_obj_collection_t* AXIS2_CALL
axis2_xml_schema_complex_type_get_attributes(
void *cmp_type,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(cmp_type)->attributes;
}
@@ -475,7 +475,7 @@
axis2_xml_schema_obj_table_t* AXIS2_CALL
axis2_xml_schema_complex_type_get_attribute_use(
void *cmp_type,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(cmp_type)->attr_uses;
}
@@ -483,7 +483,7 @@
axis2_xml_schema_any_attribute_t* AXIS2_CALL
axis2_xml_schema_complex_type_get_attribute_wildcard(
void *cmp_type,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(cmp_type)->attr_wildcard;
}
@@ -491,7 +491,7 @@
axis2_xml_schema_derivation_method_t* AXIS2_CALL
axis2_xml_schema_complex_type_get_block(
void *cmp_type,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(cmp_type)->block;
}
@@ -499,7 +499,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_complex_type_set_block(
void *cmp_type,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_derivation_method_t *block)
{
axis2_xml_schema_complex_type_impl_t *cmp_type_impl = NULL;
@@ -516,7 +516,7 @@
axis2_xml_schema_derivation_method_t* AXIS2_CALL
axis2_xml_schema_complex_type_get_block_resolved(
void *cmp_type,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(cmp_type)->block_resolved;
@@ -525,7 +525,7 @@
void* AXIS2_CALL
axis2_xml_schema_complex_type_get_content_model(
void *cmp_type,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(cmp_type)->content_model;
@@ -534,7 +534,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_complex_type_set_content_model(
void *cmp_type,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *content_model)
{
axis2_xml_schema_complex_type_impl_t *cmp_type_impl = NULL;
@@ -551,7 +551,7 @@
axis2_xml_schema_content_type_t* AXIS2_CALL
axis2_xml_schema_complex_type_get_content_type(
void *cmp_type,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(cmp_type)->content_type;
}
@@ -559,7 +559,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_complex_type_set_content_type(
void *cmp_type,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_content_type_t *content_type)
{
axis2_xml_schema_complex_type_impl_t *cmp_type_impl = NULL;
@@ -576,7 +576,7 @@
axis2_xml_schema_particle_t * AXIS2_CALL
axis2_xml_schema_complex_type_get_content_type_particle(
void *cmp_type,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(cmp_type)->particle_type;
}
@@ -584,7 +584,7 @@
axis2_bool_t AXIS2_CALL
axis2_xml_schema_complex_type_is_abstract(
void *cmp_type,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(cmp_type)->is_abstract;
}
@@ -592,7 +592,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_complex_type_set_abstract(
void *cmp_type,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_bool_t b)
{
AXIS2_INTF_TO_IMPL(cmp_type)->is_abstract = b;
@@ -602,7 +602,7 @@
axis2_bool_t AXIS2_CALL
axis2_xml_schema_complex_type_is_mixed(
void *cmp_type,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(cmp_type)->is_mixed;
}
@@ -610,7 +610,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_complex_type_set_mixed(
void *cmp_type,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_bool_t b)
{
AXIS2_INTF_TO_IMPL(cmp_type)->is_mixed = b;
@@ -620,7 +620,7 @@
axis2_xml_schema_particle_t* AXIS2_CALL
axis2_xml_schema_complex_type_get_particle(
void *cmp_type,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(cmp_type)->particle;
}
@@ -628,7 +628,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_complex_type_set_particle(
void *cmp_type,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_particle_t *particle)
{
axis2_xml_schema_complex_type_impl_t *cmp_type_impl = NULL;
@@ -646,7 +646,7 @@
axis2_char_t* AXIS2_CALL
axis2_xml_schema_complex_type_to_string(
void *complex_type,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *prefix,
int tab)
{
@@ -660,7 +660,7 @@
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_complex_type_type(
void *complex_type,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(complex_type)->obj_type;
}
@@ -668,7 +668,7 @@
axis2_hash_t* AXIS2_CALL
axis2_xml_schema_complex_type_super_objs(
void *complex_type,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(complex_type)->ht_super;
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_processing.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_processing.c?rev=410750&r1=410749&r2=410750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_processing.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_processing.c Wed May 31 22:18:45 2006
@@ -46,39 +46,39 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_content_processing_free(
void *content_processing,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_hash_t *AXIS2_CALL
axis2_xml_schema_content_processing_super_objs(
void *content_processing,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_content_processing_type(
void *content_processing,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_enum_t *AXIS2_CALL
axis2_xml_schema_content_processing_get_base_impl(void *content_processing,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_array_list_t *AXIS2_CALL
axis2_xml_schema_content_processing_get_values(void *content_processing,
- axis2_env_t **env);
+ const axis2_env_t *env);
AXIS2_EXTERN axis2_xml_schema_content_processing_t * AXIS2_CALL
-axis2_xml_schema_content_processing_create(axis2_env_t **env,
+axis2_xml_schema_content_processing_create(const axis2_env_t *env,
axis2_char_t *value)
{
axis2_xml_schema_content_processing_impl_t *content_processing_impl = NULL;
axis2_status_t status = AXIS2_FAILURE;
- content_processing_impl = AXIS2_MALLOC((*env)->allocator,
+ content_processing_impl = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_content_processing_impl_t));
if(!content_processing_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;
}
@@ -91,13 +91,13 @@
content_processing_impl->content_processing.ops = NULL;
content_processing_impl->content_processing.ops =
- AXIS2_MALLOC((*env)->allocator,
+ AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_content_processing_ops_t));
if(!content_processing_impl->content_processing.ops)
{
axis2_xml_schema_content_processing_free(
&(content_processing_impl->content_processing), 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;
}
@@ -135,7 +135,7 @@
{
axis2_xml_schema_content_processing_free(
&(content_processing_impl->content_processing), 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;
}
@@ -156,7 +156,7 @@
{
axis2_xml_schema_content_processing_free(
&(content_processing_impl->content_processing), 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;
}
@@ -176,7 +176,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_content_processing_free(void *content_processing,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_content_processing_impl_t *content_processing_impl = NULL;
@@ -195,7 +195,7 @@
AXIS2_ARRAY_LIST_GET(content_processing_impl->members, env, i);
if(NULL != value)
{
- AXIS2_FREE((*env)->allocator, value);
+ AXIS2_FREE(env->allocator, value);
value = NULL;
}
}
@@ -223,17 +223,17 @@
if(NULL != content_processing_impl->content_processing.ops)
{
- AXIS2_FREE((*env)->allocator, content_processing_impl->content_processing.ops);
+ AXIS2_FREE(env->allocator, content_processing_impl->content_processing.ops);
content_processing_impl->content_processing.ops = NULL;
}
if(NULL != content_processing_impl->content_processing.base.ops)
{
- AXIS2_FREE((*env)->allocator, content_processing_impl->content_processing.base.ops);
+ AXIS2_FREE(env->allocator, content_processing_impl->content_processing.base.ops);
content_processing_impl->content_processing.base.ops = NULL;
}
if(NULL != content_processing_impl)
{
- AXIS2_FREE((*env)->allocator, content_processing_impl);
+ AXIS2_FREE(env->allocator, content_processing_impl);
content_processing_impl = NULL;
}
return AXIS2_SUCCESS;
@@ -242,7 +242,7 @@
axis2_hash_t *AXIS2_CALL
axis2_xml_schema_content_processing_super_objs(
void *content_processing,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_content_processing_impl_t *content_processing_impl = NULL;
@@ -255,7 +255,7 @@
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_content_processing_type(
void *content_processing,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_content_processing_impl_t *content_processing_impl = NULL;
@@ -268,7 +268,7 @@
axis2_xml_schema_enum_t *AXIS2_CALL
axis2_xml_schema_content_processing_get_base_impl(
void *content_processing,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_content_processing_impl_t *content_processing_impl = NULL;
@@ -280,7 +280,7 @@
axis2_array_list_t *AXIS2_CALL
axis2_xml_schema_content_processing_get_values(void *content_processing,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_content_processing_impl_t *content_processing_impl = NULL;
axis2_hash_t *super = NULL;
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_type.c?rev=410750&r1=410749&r2=410750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_type.c Wed May 31 22:18:45 2006
@@ -46,46 +46,46 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_content_type_free(void *content_type,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_enum_t *AXIS2_CALL
axis2_xml_schema_content_type_get_base_impl(void *content_type,
- axis2_env_t **env);
+ const axis2_env_t *env);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_xml_schema_content_type_resolve_methods(
axis2_xml_schema_content_type_t *content_type,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_content_type_t *content_type_impl,
axis2_hash_t *methods);
axis2_array_list_t *AXIS2_CALL
axis2_xml_schema_content_type_get_values(void *content_type,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_content_type_type(void *content_type,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_hash_t* AXIS2_CALL
axis2_xml_schema_content_type_super_objs(void *content_type,
- axis2_env_t **env);
+ const axis2_env_t *env);
AXIS2_EXTERN axis2_xml_schema_content_type_t * AXIS2_CALL
-axis2_xml_schema_content_type_create(axis2_env_t **env,
+axis2_xml_schema_content_type_create(const axis2_env_t *env,
axis2_char_t *value)
{
axis2_xml_schema_content_type_impl_t *content_type_impl = NULL;
axis2_status_t status = AXIS2_FAILURE;
- content_type_impl = AXIS2_MALLOC((*env)->allocator,
+ content_type_impl = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_content_type_impl_t));
if(!content_type_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;
}
@@ -95,12 +95,12 @@
content_type_impl->obj_type = AXIS2_XML_SCHEMA_CONTENT_TYPE;
content_type_impl->ht_super = NULL;
- content_type_impl->content_type.ops = AXIS2_MALLOC((*env)->allocator,
+ content_type_impl->content_type.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_content_type_ops_t));
if(!content_type_impl->content_type.ops)
{
axis2_xml_schema_content_type_free(&(content_type_impl->content_type), 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;
}
@@ -138,7 +138,7 @@
if(!content_type_impl->methods)
{
axis2_xml_schema_content_type_free(&(content_type_impl->content_type), 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;
}
@@ -155,14 +155,14 @@
if(!content_type_impl->schema_enum)
{
axis2_xml_schema_content_type_free(&(content_type_impl->content_type), 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;
}
content_type_impl->ht_super = axis2_hash_make(env);
if(!content_type_impl->ht_super)
{
axis2_xml_schema_content_type_free(&(content_type_impl->content_type), 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;
}
@@ -180,7 +180,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_content_type_free(void *content_type,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_content_type_impl_t *content_type_impl = NULL;
@@ -198,7 +198,7 @@
value =(axis2_char_t* ) AXIS2_ARRAY_LIST_GET(content_type_impl->members, env, i);
if(NULL != value)
{
- AXIS2_FREE((*env)->allocator, value);
+ AXIS2_FREE(env->allocator, value);
value = NULL;
}
}
@@ -214,13 +214,13 @@
if((&(content_type_impl->content_type))->ops)
{
- AXIS2_FREE((*env)->allocator, (&(content_type_impl->content_type))->ops);
+ AXIS2_FREE(env->allocator, (&(content_type_impl->content_type))->ops);
(&(content_type_impl->content_type))->ops = NULL;
}
if(content_type_impl)
{
- AXIS2_FREE((*env)->allocator, content_type_impl);
+ AXIS2_FREE(env->allocator, content_type_impl);
content_type_impl = NULL;
}
return AXIS2_SUCCESS;
@@ -228,7 +228,7 @@
axis2_xml_schema_enum_t *AXIS2_CALL
axis2_xml_schema_content_type_get_base_impl(void *content_type,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_content_type_impl_t *content_type_impl = NULL;
@@ -239,7 +239,7 @@
axis2_array_list_t* AXIS2_CALL
axis2_xml_schema_content_type_get_values(void *content_type,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
/* axis2_xml_schema_content_type_impl_t *schema_impl = NULL;
axis2_hash_t *super = NULL;
@@ -252,14 +252,14 @@
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_content_type_type(void *content_type,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(content_type)->obj_type;
}
axis2_hash_t* AXIS2_CALL
axis2_xml_schema_content_type_super_objs(void *content_type,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(content_type)->ht_super;
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_data_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_data_type.c?rev=410750&r1=410749&r2=410750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_data_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_data_type.c Wed May 31 22:18:45 2006
@@ -36,37 +36,37 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_data_type_free(void *data_type,
- axis2_env_t **env);
+ const axis2_env_t *env);
void * AXIS2_CALL
axis2_xml_schema_data_type_parse_value(void *data_type,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *input);
void *AXIS2_CALL
axis2_xml_schema_data_type_value_type(void *data_type,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_tokenized_type_t *AXIS2_CALL
axis2_xml_schema_data_type_tokenized_type(void *data_type,
- axis2_env_t **env);
+ const axis2_env_t *env);
AXIS2_EXTERN axis2_xml_schema_data_type_t * AXIS2_CALL
-axis2_xml_schema_data_type_create(axis2_env_t **env)
+axis2_xml_schema_data_type_create(const axis2_env_t *env)
{
axis2_xml_schema_data_type_impl_t *data_type_impl = NULL;
- data_type_impl = AXIS2_MALLOC((*env)->allocator,
+ data_type_impl = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_data_type_impl_t));
if(NULL != data_type_impl)
{
return NULL;
}
- data_type_impl->data_type.ops = AXIS2_MALLOC((*env)->allocator,
+ data_type_impl->data_type.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_data_type_ops_t));
if(NULL != data_type_impl->data_type.ops)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -85,7 +85,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_data_type_free(void *data_type,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_data_type_impl_t *data_type_impl = NULL;
@@ -93,13 +93,13 @@
if(NULL != data_type_impl->data_type.ops)
{
- AXIS2_FREE((*env)->allocator ,data_type_impl->data_type.ops);
+ AXIS2_FREE(env->allocator ,data_type_impl->data_type.ops);
data_type_impl->data_type.ops = NULL;
}
if(NULL != data_type_impl)
{
- AXIS2_FREE((*env)->allocator, data_type_impl);
+ AXIS2_FREE(env->allocator, data_type_impl);
data_type_impl = NULL;
}
return AXIS2_SUCCESS;
@@ -108,19 +108,19 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_xml_schema_data_type_resolve_methods(
axis2_xml_schema_data_type_t *data_type,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_data_type_t *data_type_impl,
axis2_hash_t *methods)
{
axis2_xml_schema_data_type_impl_t *data_type_impl_l = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, data_type_impl, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, methods, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, data_type_impl, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
data_type_impl_l = (axis2_xml_schema_data_type_impl_t *) data_type_impl;
- data_type->ops = AXIS2_MALLOC((*env)->allocator,
+ data_type->ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_data_type_ops_t));
data_type->ops->free = axis2_hash_get(methods, "free",
AXIS2_HASH_KEY_STRING);
@@ -135,7 +135,7 @@
}
void * AXIS2_CALL
axis2_xml_schema_data_type_parse_value(void *data_type,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *input)
{
axis2_xml_schema_data_type_impl_t *data_type_impl = NULL;
@@ -147,7 +147,7 @@
void *AXIS2_CALL
axis2_xml_schema_data_type_value_type(void *data_type,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_data_type_impl_t *data_type_impl = NULL;
@@ -159,7 +159,7 @@
axis2_xml_tokenized_type_t *AXIS2_CALL
axis2_xml_schema_data_type_tokenized_type(void *data_type,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_data_type_impl_t *data_type_impl = NULL;
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_derivation_method.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_derivation_method.c?rev=410750&r1=410749&r2=410750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_derivation_method.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_derivation_method.c Wed May 31 22:18:45 2006
@@ -46,39 +46,39 @@
/************************* function prototypes ************************************/
axis2_hash_t* AXIS2_CALL
axis2_xml_schema_derivation_method_super_objs(void *derivation_method,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_derivation_method_type(void *derivation_method,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_derivation_method_free(void *derivation_method,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_enum_t *AXIS2_CALL
axis2_xml_schema_derivation_method_get_base_impl(void *derivation_method,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_array_list_t * AXIS2_CALL
axis2_xml_schema_derivation_method_get_values(void *derivation_method,
- axis2_env_t **env);
+ const axis2_env_t *env);
/************************** end function prototypes ********************************/
AXIS2_EXTERN axis2_xml_schema_derivation_method_t * AXIS2_CALL
-axis2_xml_schema_derivation_method_create(axis2_env_t **env,
+axis2_xml_schema_derivation_method_create(const axis2_env_t *env,
axis2_char_t *value)
{
axis2_xml_schema_derivation_method_impl_t *derivation_method_impl = NULL;
axis2_status_t status = AXIS2_FAILURE;
- derivation_method_impl = AXIS2_MALLOC((*env)->allocator,
+ derivation_method_impl = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_derivation_method_impl_t));
if(!derivation_method_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;
}
@@ -90,13 +90,13 @@
derivation_method_impl->derivation_method.base.ops = NULL;
derivation_method_impl->derivation_method.ops = NULL;
- derivation_method_impl->derivation_method.ops = AXIS2_MALLOC((*env)->allocator,
+ derivation_method_impl->derivation_method.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_derivation_method_ops_t));
if(!derivation_method_impl->derivation_method.ops)
{
axis2_xml_schema_derivation_method_free(
&(derivation_method_impl->derivation_method), 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 @@
{
axis2_xml_schema_derivation_method_free(
&(derivation_method_impl->derivation_method), 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;
}
@@ -171,7 +171,7 @@
{
axis2_xml_schema_derivation_method_free(
&(derivation_method_impl->derivation_method), 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;
}
@@ -191,7 +191,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_derivation_method_free(void *derivation_method,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_derivation_method_impl_t *derivation_method_impl = NULL;
@@ -209,7 +209,7 @@
value =(axis2_char_t* ) AXIS2_ARRAY_LIST_GET(derivation_method_impl->members, env, i);
if(NULL != value)
{
- AXIS2_FREE((*env)->allocator, value);
+ AXIS2_FREE(env->allocator, value);
value = NULL;
}
}
@@ -225,17 +225,17 @@
if(NULL != derivation_method_impl->derivation_method.ops)
{
- AXIS2_FREE((*env)->allocator, derivation_method_impl->derivation_method.ops);
+ AXIS2_FREE(env->allocator, derivation_method_impl->derivation_method.ops);
derivation_method_impl->derivation_method.ops = NULL;
}
if(NULL != derivation_method_impl->derivation_method.base.ops)
{
- AXIS2_FREE((*env)->allocator, derivation_method_impl->derivation_method.base.ops);
+ AXIS2_FREE(env->allocator, derivation_method_impl->derivation_method.base.ops);
derivation_method_impl->derivation_method.base.ops = NULL;
}
if(NULL != derivation_method_impl)
{
- AXIS2_FREE((*env)->allocator, derivation_method_impl);
+ AXIS2_FREE(env->allocator, derivation_method_impl);
derivation_method_impl = NULL;
}
return AXIS2_SUCCESS;
@@ -243,7 +243,7 @@
axis2_xml_schema_enum_t *AXIS2_CALL
axis2_xml_schema_derivation_method_get_base_impl(void *derivation_method,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_derivation_method_impl_t *derivation_method_impl = NULL;
@@ -255,7 +255,7 @@
axis2_array_list_t *AXIS2_CALL
axis2_xml_schema_derivation_method_get_values(void *derivation_method,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
/*
axis2_xml_schema_derivation_method_impl_t *deri_impl = NULL;
@@ -274,14 +274,14 @@
axis2_hash_t* AXIS2_CALL
axis2_xml_schema_derivation_method_super_objs(void *derivation_method,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(derivation_method)->ht_super;
}
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_derivation_method_type(void *derivation_method,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(derivation_method)->type;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org