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 [11/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_xpath.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_xpath.c?rev=410750&r1=410749&r2=410750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_xpath.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_xpath.c Wed May 31 22:18:45 2006
@@ -38,36 +38,36 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_xpath_free(void *xpath,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_annotated_t *AXIS2_CALL
axis2_xml_schema_xpath_get_base_impl(void *xpath,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_xpath_type(void *xpath,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_hash_t *AXIS2_CALL
axis2_xml_schema_xpath_super_objs(void *xpath,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_char_t *AXIS2_CALL
axis2_xml_schema_xpath_get_xpath(void *xpath,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_xpath_set_xpath(void *xpath,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *x_path);
AXIS2_EXTERN axis2_xml_schema_xpath_t * AXIS2_CALL
-axis2_xml_schema_xpath_create(axis2_env_t **env)
+axis2_xml_schema_xpath_create(const axis2_env_t *env)
{
axis2_xml_schema_xpath_impl_t *xpath_impl = NULL;
axis2_status_t status = AXIS2_FAILURE;
- xpath_impl = AXIS2_MALLOC((*env)->allocator,
+ xpath_impl = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_xpath_impl_t));
xpath_impl->annotated = NULL;
@@ -75,7 +75,7 @@
xpath_impl->x_path = NULL;
xpath_impl->ht_super = NULL;
xpath_impl->obj_type = AXIS2_XML_SCHEMA_XPATH;
- xpath_impl->xpath.ops = AXIS2_MALLOC((*env)->allocator,
+ xpath_impl->xpath.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_xpath_ops_t));
xpath_impl->xpath.ops->free = axis2_xml_schema_xpath_free;
@@ -93,7 +93,7 @@
xpath_impl->methods = axis2_hash_make(env);
if(!xpath_impl->methods)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
axis2_hash_set(xpath_impl->methods, "free", AXIS2_HASH_KEY_STRING,
@@ -108,7 +108,7 @@
xpath_impl->ht_super = axis2_hash_make(env);
if(!xpath_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;
}
@@ -128,7 +128,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_xpath_free(void *xpath,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_xpath_impl_t *xpath_impl = NULL;
@@ -137,7 +137,7 @@
if(xpath_impl->x_path)
{
- AXIS2_FREE((*env)->allocator, xpath_impl->x_path);
+ AXIS2_FREE(env->allocator, xpath_impl->x_path);
xpath_impl->x_path = NULL;
}
if(xpath_impl->ht_super)
@@ -160,13 +160,13 @@
if((&(xpath_impl->xpath))->ops)
{
- AXIS2_FREE((*env)->allocator, (&(xpath_impl->xpath))->ops);
+ AXIS2_FREE(env->allocator, (&(xpath_impl->xpath))->ops);
(&(xpath_impl->xpath))->ops = NULL;
}
if(xpath_impl)
{
- AXIS2_FREE((*env)->allocator, xpath_impl);
+ AXIS2_FREE(env->allocator, xpath_impl);
xpath_impl = NULL;
}
return AXIS2_SUCCESS;
@@ -174,7 +174,7 @@
axis2_xml_schema_annotated_t *AXIS2_CALL
axis2_xml_schema_xpath_get_base_impl(void *xpath,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_schema_xpath_impl_t *xpath_impl = NULL;
@@ -188,19 +188,19 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_xml_schema_xpath_resolve_methods(
axis2_xml_schema_xpath_t *xpath,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_xml_schema_xpath_t *xpath_impl,
axis2_hash_t *methods)
{
axis2_xml_schema_xpath_impl_t *xpath_impl_l = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, xpath_impl, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, methods, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, xpath_impl, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
xpath_impl_l = (axis2_xml_schema_xpath_impl_t *) xpath_impl;
- xpath->ops = AXIS2_MALLOC((*env)->allocator,
+ xpath->ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_xpath_ops_t));
xpath->ops->free = axis2_hash_get(methods, "free",
AXIS2_HASH_KEY_STRING);
@@ -218,7 +218,7 @@
axis2_char_t *AXIS2_CALL
axis2_xml_schema_xpath_get_xpath(void *xpath,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(xpath)->x_path;
@@ -226,24 +226,24 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_xpath_set_xpath(void *xpath,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *x_path)
{
axis2_xml_schema_xpath_impl_t *xpath_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, xpath, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, xpath, AXIS2_FAILURE);
xpath_impl = AXIS2_INTF_TO_IMPL(xpath);
if(xpath_impl->x_path)
{
- AXIS2_FREE((*env)->allocator, xpath_impl->x_path);
+ AXIS2_FREE(env->allocator, xpath_impl->x_path);
xpath_impl->x_path = NULL;
}
xpath_impl->x_path = AXIS2_STRDUP(x_path, env);
if(!xpath_impl->x_path)
{
- 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;
}
@@ -251,14 +251,14 @@
}
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_schema_xpath_type(void *xpath,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(xpath)->obj_type;
}
axis2_hash_t *AXIS2_CALL
axis2_xml_schema_xpath_super_objs(void *xpath,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(xpath)->ht_super;
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_severity_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_severity_type.c?rev=410750&r1=410749&r2=410750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_severity_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_severity_type.c Wed May 31 22:18:45 2006
@@ -44,36 +44,36 @@
axis2_status_t AXIS2_CALL
axis2_xml_severity_type_free(void *severity_type,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_enum_t *AXIS2_CALL
axis2_xml_severity_type_get_base_impl(void *severity_type,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_array_list_t *AXIS2_CALL
axis2_xml_severity_type_get_values(void *severity_type,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_hash_t *AXIS2_CALL
axis2_xml_severity_type_super_objs(void *severity_type,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_severity_type_type(void *severity_type,
- axis2_env_t **env);
+ const axis2_env_t *env);
AXIS2_EXTERN axis2_xml_severity_type_t * AXIS2_CALL
-axis2_xml_severity_type_create(axis2_env_t **env,
+axis2_xml_severity_type_create(const axis2_env_t *env,
axis2_char_t *value)
{
axis2_xml_severity_type_impl_t *severity_type_impl = NULL;
axis2_status_t status = AXIS2_FAILURE;
- severity_type_impl = AXIS2_MALLOC((*env)->allocator,
+ severity_type_impl = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_severity_type_impl_t));
if(!severity_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;
}
@@ -83,12 +83,12 @@
severity_type_impl->ht_super = NULL;
severity_type_impl->type = AXIS2_XML_SEVERITY_TYPE;
- severity_type_impl->severity_type.ops = AXIS2_MALLOC((*env)->allocator,
+ severity_type_impl->severity_type.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_severity_type_ops_t));
if(!severity_type_impl->severity_type.ops)
{
axis2_xml_severity_type_free(&(severity_type_impl->severity_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;
}
@@ -119,7 +119,7 @@
if(!severity_type_impl->methods)
{
axis2_xml_severity_type_free(&(severity_type_impl->severity_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;
}
@@ -136,7 +136,7 @@
if(!severity_type_impl->schema_enum)
{
axis2_xml_severity_type_free(&(severity_type_impl->severity_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;
}
@@ -144,7 +144,7 @@
if(!severity_type_impl->ht_super)
{
axis2_xml_severity_type_free(&(severity_type_impl->severity_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;
}
@@ -163,7 +163,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_severity_type_free(void *severity_type,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_severity_type_impl_t *severity_type_impl = NULL;
@@ -181,7 +181,7 @@
value =(axis2_char_t* ) AXIS2_ARRAY_LIST_GET(severity_type_impl->members, env, i);
if(NULL != value)
{
- AXIS2_FREE((*env)->allocator, value);
+ AXIS2_FREE(env->allocator, value);
value = NULL;
}
}
@@ -197,17 +197,17 @@
if(severity_type_impl->severity_type.ops)
{
- AXIS2_FREE((*env)->allocator, severity_type_impl->severity_type.ops);
+ AXIS2_FREE(env->allocator, severity_type_impl->severity_type.ops);
severity_type_impl->severity_type.ops = NULL;
}
if(severity_type_impl->severity_type.base.ops)
{
- AXIS2_FREE((*env)->allocator, severity_type_impl->severity_type.base.ops);
+ AXIS2_FREE(env->allocator, severity_type_impl->severity_type.base.ops);
severity_type_impl->severity_type.base.ops = NULL;
}
if(severity_type_impl)
{
- AXIS2_FREE((*env)->allocator, severity_type_impl);
+ AXIS2_FREE(env->allocator, severity_type_impl);
severity_type_impl = NULL;
}
return AXIS2_SUCCESS;
@@ -215,7 +215,7 @@
axis2_xml_schema_enum_t *AXIS2_CALL
axis2_xml_severity_type_get_base_impl(void *severity_type,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_severity_type_impl_t *severity_type_impl = NULL;
@@ -226,7 +226,7 @@
axis2_array_list_t* AXIS2_CALL
axis2_xml_severity_type_get_values(void *severity_type,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
/*
axis2_xml_severity_type_impl_t *severity_impl = NULL;
@@ -245,14 +245,14 @@
axis2_hash_t *AXIS2_CALL
axis2_xml_severity_type_super_objs(void *severity_type,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(severity_type)->ht_super;
}
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_severity_type_type(void *severity_type,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(severity_type)->type;
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_tokenized_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_tokenized_type.c?rev=410750&r1=410749&r2=410750&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_tokenized_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_tokenized_type.c Wed May 31 22:18:45 2006
@@ -45,38 +45,38 @@
axis2_status_t AXIS2_CALL
axis2_xml_tokenized_type_free(void *tokenized_type,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_enum_t *AXIS2_CALL
axis2_xml_tokenized_type_get_base_impl(void *tokenized_type,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_array_list_t * AXIS2_CALL
axis2_xml_tokenized_type_get_values(void *tokenized_type,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_tokenized_type_type(void *tokenized_type,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_hash_t* AXIS2_CALL
axis2_xml_tokenized_type_super_objs(void *tokenized_type,
- axis2_env_t **env);
+ const axis2_env_t *env);
/***************************** end macros **************************************/
AXIS2_EXTERN axis2_xml_tokenized_type_t * AXIS2_CALL
-axis2_xml_tokenized_type_create(axis2_env_t **env,
+axis2_xml_tokenized_type_create(const axis2_env_t *env,
axis2_char_t *value)
{
axis2_xml_tokenized_type_impl_t *tokenized_type_impl = NULL;
axis2_status_t status = AXIS2_FAILURE;
- tokenized_type_impl = AXIS2_MALLOC((*env)->allocator,
+ tokenized_type_impl = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_tokenized_type_impl_t));
if(!tokenized_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;
}
@@ -87,12 +87,12 @@
tokenized_type_impl->tokenized_type.ops = NULL;
tokenized_type_impl->ht_super = NULL;
- tokenized_type_impl->tokenized_type.ops = AXIS2_MALLOC((*env)->allocator,
+ tokenized_type_impl->tokenized_type.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_tokenized_type_ops_t));
if(!tokenized_type_impl->tokenized_type.ops)
{
axis2_xml_tokenized_type_free(&(tokenized_type_impl->tokenized_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;
}
@@ -146,7 +146,7 @@
if(!tokenized_type_impl->methods)
{
axis2_xml_tokenized_type_free(&(tokenized_type_impl->tokenized_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;
}
@@ -167,7 +167,7 @@
if(!tokenized_type_impl->ht_super)
{
axis2_xml_tokenized_type_free(&(tokenized_type_impl->tokenized_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;
}
@@ -186,7 +186,7 @@
axis2_status_t AXIS2_CALL
axis2_xml_tokenized_type_free(void *tokenized_type,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_xml_tokenized_type_impl_t *tokenized_type_impl = NULL;
@@ -210,7 +210,7 @@
value =(axis2_char_t* ) AXIS2_ARRAY_LIST_GET(tokenized_type_impl->members, env, i);
if(NULL != value)
{
- AXIS2_FREE((*env)->allocator, value);
+ AXIS2_FREE(env->allocator, value);
value = NULL;
}
}
@@ -220,13 +220,13 @@
if(NULL != tokenized_type_impl->tokenized_type.ops)
{
- AXIS2_FREE((*env)->allocator, tokenized_type_impl->tokenized_type.ops);
+ AXIS2_FREE(env->allocator, tokenized_type_impl->tokenized_type.ops);
tokenized_type_impl->tokenized_type.ops = NULL;
}
if(NULL != tokenized_type_impl)
{
- AXIS2_FREE((*env)->allocator, tokenized_type_impl);
+ AXIS2_FREE(env->allocator, tokenized_type_impl);
tokenized_type_impl = NULL;
}
return AXIS2_SUCCESS;
@@ -234,14 +234,14 @@
axis2_xml_schema_enum_t *AXIS2_CALL
axis2_xml_tokenized_type_get_base_impl(void *tokenized_type,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(tokenized_type)->schema_enum;
}
axis2_array_list_t *AXIS2_CALL
axis2_xml_tokenized_type_get_values(void *tokenized_type,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
/*
axis2_xml_tokenized_type_impl_t *tokenized_impl = NULL;
@@ -263,14 +263,14 @@
axis2_xml_schema_types_t AXIS2_CALL
axis2_xml_tokenized_type_type(void *tokenized_type,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(tokenized_type)->obj_type;
}
axis2_hash_t* AXIS2_CALL
axis2_xml_tokenized_type_super_objs(void *tokenized_type,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(tokenized_type)->ht_super;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org