You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by sa...@apache.org on 2006/05/31 17:54:39 UTC
svn commit: r410566 [20/49] - in /webservices/axis2/trunk/c: axiom/include/
axiom/src/attachments/ axiom/src/om/ axiom/src/parser/guththila/
axiom/src/parser/libxml2/ axiom/src/soap/ axiom/test/om/ axiom/test/soap/
axiom/test/unit/om/ include/ modules/...
Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Wed May 31 08:54:07 2006
@@ -38,25 +38,25 @@
axis2_status_t AXIS2_CALL
axis2_svc_builder_free (axis2_svc_builder_t *svc_builder,
- axis2_env_t **env);
+ const axis2_env_t *env);
/**
* top most method that is used to populate service from corresponding OM
*/
axis2_status_t AXIS2_CALL
axis2_svc_builder_populate_svc(axis2_svc_builder_t *svc_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *svc_node);
static axis2_array_list_t *
axis2_svc_builder_process_ops(axis2_svc_builder_t *svc_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_children_qname_iterator_t *op_itr);
axis2_status_t AXIS2_CALL
axis2_svc_builder_process_svc_module_conf(axis2_svc_builder_t *svc_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_children_qname_iterator_t *module_confs,
axis2_param_container_t *parent,
axis2_svc_t *svc);
@@ -67,25 +67,25 @@
*/
axis2_status_t AXIS2_CALL
axis2_svc_builder_process_module_refs(axis2_svc_builder_t *svc_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_children_qname_iterator_t *module_refs);
/************************** End of function prototypes ************************/
axis2_svc_builder_t * AXIS2_CALL
-axis2_svc_builder_create (axis2_env_t **env)
+axis2_svc_builder_create (const axis2_env_t *env)
{
axis2_svc_builder_impl_t *svc_builder_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- svc_builder_impl = (axis2_svc_builder_impl_t *) AXIS2_MALLOC((*env)->
+ svc_builder_impl = (axis2_svc_builder_impl_t *) AXIS2_MALLOC(env->
allocator, sizeof(axis2_svc_builder_impl_t));
if(NULL == svc_builder_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -94,11 +94,11 @@
svc_builder_impl->svc_builder.ops = NULL;
svc_builder_impl->svc_builder.ops =
- AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_svc_builder_ops_t));
+ AXIS2_MALLOC (env->allocator, sizeof(axis2_svc_builder_ops_t));
if(NULL == svc_builder_impl->svc_builder.ops)
{
axis2_svc_builder_free(&(svc_builder_impl->svc_builder), 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;
}
@@ -112,7 +112,7 @@
}
axis2_svc_builder_t * AXIS2_CALL
-axis2_svc_builder_create_with_file_and_dep_engine_and_svc (axis2_env_t **env,
+axis2_svc_builder_create_with_file_and_dep_engine_and_svc (const axis2_env_t *env,
axis2_char_t *file_name,
struct axis2_dep_engine *dep_engine,
axis2_svc_t *svc)
@@ -120,9 +120,9 @@
axis2_svc_builder_impl_t *builder_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, file_name, NULL);
- AXIS2_PARAM_CHECK((*env)->error, dep_engine, NULL);
- AXIS2_PARAM_CHECK((*env)->error, svc, NULL);
+ AXIS2_PARAM_CHECK(env->error, file_name, NULL);
+ AXIS2_PARAM_CHECK(env->error, dep_engine, NULL);
+ AXIS2_PARAM_CHECK(env->error, svc, NULL);
builder_impl = (axis2_svc_builder_impl_t *) axis2_svc_builder_create(env);
if(NULL == builder_impl)
{
@@ -141,15 +141,15 @@
}
axis2_svc_builder_t * AXIS2_CALL
-axis2_svc_builder_create_with_dep_engine_and_svc (axis2_env_t **env,
+axis2_svc_builder_create_with_dep_engine_and_svc (const axis2_env_t *env,
axis2_dep_engine_t *dep_engine,
axis2_svc_t *svc)
{
axis2_svc_builder_impl_t *builder_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, dep_engine, NULL);
- AXIS2_PARAM_CHECK((*env)->error, svc, NULL);
+ AXIS2_PARAM_CHECK(env->error, dep_engine, NULL);
+ AXIS2_PARAM_CHECK(env->error, svc, NULL);
builder_impl = (axis2_svc_builder_impl_t *) axis2_svc_builder_create(env);
if(NULL == builder_impl)
{
@@ -170,7 +170,7 @@
axis2_status_t AXIS2_CALL
axis2_svc_builder_free (axis2_svc_builder_t *svc_builder,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_svc_builder_impl_t *svc_builder_impl = NULL;
@@ -188,13 +188,13 @@
if(NULL != svc_builder->ops)
{
- AXIS2_FREE((*env)->allocator, svc_builder->ops);
+ AXIS2_FREE(env->allocator, svc_builder->ops);
svc_builder->ops = NULL;
}
if(svc_builder_impl)
{
- AXIS2_FREE((*env)->allocator, svc_builder_impl);
+ AXIS2_FREE(env->allocator, svc_builder_impl);
svc_builder_impl = NULL;
}
@@ -203,7 +203,7 @@
axis2_status_t AXIS2_CALL
axis2_svc_builder_populate_svc(axis2_svc_builder_t *svc_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *svc_node)
{
axis2_svc_builder_impl_t *builder_impl = NULL;
@@ -254,7 +254,7 @@
axis2_property_t *property = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, svc_node, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, svc_node, AXIS2_FAILURE);
builder_impl = AXIS2_INTF_TO_IMPL(svc_builder);
svc_element = AXIS2_OM_NODE_GET_DATA_ELEMENT(svc_node, env);
@@ -262,7 +262,7 @@
qparamst = axis2_qname_create(env, AXIS2_PARAMETERST, NULL, NULL);
if(!qparamst)
{
- 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;
}
itr = AXIS2_OM_ELEMENT_GET_CHILDREN_WITH_QNAME(svc_element, env, qparamst,
@@ -358,7 +358,7 @@
svc_folder_path = AXIS2_FILE_GET_PATH(svc_folder, env);
temp_path = AXIS2_STRACAT(svc_folder_path, AXIS2_PATH_SEP_STR, env);
dll_path = AXIS2_STRACAT(temp_path, svc_dll_name, env);
- AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI, "dll path is : %s", dll_path);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "dll path is : %s", dll_path);
status = AXIS2_DLL_DESC_SET_NAME(dll_desc, env, dll_path);
if(AXIS2_SUCCESS != status)
{
@@ -366,9 +366,9 @@
return status;
}
/* free all temp vars */
- AXIS2_FREE((*env)->allocator, temp_path);
+ AXIS2_FREE(env->allocator, temp_path);
temp_path = NULL;
- AXIS2_FREE((*env)->allocator, dll_path);
+ AXIS2_FREE(env->allocator, dll_path);
dll_path = NULL;
AXIS2_DLL_DESC_SET_TYPE(dll_desc, env, AXIS2_SVC_DLL);
@@ -526,14 +526,14 @@
static axis2_array_list_t *
axis2_svc_builder_process_ops(axis2_svc_builder_t *svc_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_children_qname_iterator_t *op_itr)
{
axis2_svc_builder_impl_t *builder_impl = NULL;
axis2_array_list_t *ops = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, op_itr, NULL);
+ AXIS2_PARAM_CHECK(env->error, op_itr, NULL);
builder_impl = AXIS2_INTF_TO_IMPL(svc_builder);
ops = axis2_array_list_create(env, 0);
@@ -568,7 +568,7 @@
qattname = NULL;
if(NULL == op_name_att)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_OP_NAME_MISSING,
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_OP_NAME_MISSING,
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
@@ -683,7 +683,7 @@
axis2_status_t AXIS2_CALL
axis2_svc_builder_process_svc_module_conf(axis2_svc_builder_t *svc_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_children_qname_iterator_t *module_confs,
axis2_param_container_t *parent,
axis2_svc_t *svc)
@@ -705,7 +705,7 @@
qattname = NULL;
if(NULL == module_name_att)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_MODULE_CONF,
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_MODULE_CONF,
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
@@ -716,14 +716,14 @@
axis2_status_t AXIS2_CALL
axis2_svc_builder_process_module_refs(axis2_svc_builder_t *svc_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_children_qname_iterator_t *
module_refs)
{
axis2_svc_builder_impl_t *builder_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, module_refs, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, module_refs, AXIS2_FAILURE);
builder_impl = AXIS2_INTF_TO_IMPL(svc_builder);
while(AXIS2_TRUE == AXIS2_OM_CHILDREN_ITERATOR_HAS_NEXT(module_refs, env))
@@ -750,7 +750,7 @@
if(NULL == AXIS2_DEP_ENGINE_GET_MODULE(svc_builder->desc_builder->
engine, env, qrefname))
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_MODULE_NOT_FOUND,
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_MODULE_NOT_FOUND,
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c Wed May 31 08:54:07 2006
@@ -33,12 +33,12 @@
axis2_status_t AXIS2_CALL
axis2_svc_grp_builder_free (axis2_svc_grp_builder_t *svc_grp_builder,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_svc_grp_builder_populate_svc_grp(axis2_svc_grp_builder_t *grp_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_svc_grp_t *svc_grp);
/**
@@ -47,26 +47,26 @@
*/
axis2_status_t AXIS2_CALL
axis2_svc_grp_builder_process_module_refs(axis2_svc_grp_builder_t *grp_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_children_qname_iterator_t *module_refs ,
axis2_svc_grp_t *svc_grp);
/************************** End of function prototypes ************************/
axis2_svc_grp_builder_t * AXIS2_CALL
-axis2_svc_grp_builder_create (axis2_env_t **env)
+axis2_svc_grp_builder_create (const axis2_env_t *env)
{
axis2_svc_grp_builder_impl_t *svc_grp_builder_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- svc_grp_builder_impl = (axis2_svc_grp_builder_impl_t *) AXIS2_MALLOC((*env)->
+ svc_grp_builder_impl = (axis2_svc_grp_builder_impl_t *) AXIS2_MALLOC(env->
allocator, sizeof(axis2_svc_grp_builder_impl_t));
if(NULL == svc_grp_builder_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -75,11 +75,11 @@
svc_grp_builder_impl->svc_grp_builder.desc_builder = NULL;
svc_grp_builder_impl->svc_grp_builder.ops =
- AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_svc_grp_builder_ops_t));
+ AXIS2_MALLOC (env->allocator, sizeof(axis2_svc_grp_builder_ops_t));
if(NULL == svc_grp_builder_impl->svc_grp_builder.ops)
{
axis2_svc_grp_builder_free(&(svc_grp_builder_impl->svc_grp_builder), 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;
}
@@ -93,7 +93,7 @@
}
axis2_svc_grp_builder_t * AXIS2_CALL
-axis2_svc_grp_builder_create_with_svc_and_dep_engine (axis2_env_t **env,
+axis2_svc_grp_builder_create_with_svc_and_dep_engine (const axis2_env_t *env,
axis2_om_node_t *svc_grp,
axis2_dep_engine_t *dep_engine)
{
@@ -103,7 +103,7 @@
axis2_svc_grp_builder_create(env);
if(!grp_builder_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
grp_builder_impl = NULL;
}
grp_builder_impl->svc_grp_builder.desc_builder =
@@ -122,7 +122,7 @@
axis2_status_t AXIS2_CALL
axis2_svc_grp_builder_free (axis2_svc_grp_builder_t *svc_grp_builder,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_svc_grp_builder_impl_t *grp_builder_impl = NULL;
@@ -138,13 +138,13 @@
}
if(NULL != svc_grp_builder->ops)
{
- AXIS2_FREE((*env)->allocator, svc_grp_builder->ops);
+ AXIS2_FREE(env->allocator, svc_grp_builder->ops);
svc_grp_builder->ops = NULL;
}
if(grp_builder_impl)
{
- AXIS2_FREE((*env)->allocator, grp_builder_impl);
+ AXIS2_FREE(env->allocator, grp_builder_impl);
grp_builder_impl = NULL;
}
@@ -153,7 +153,7 @@
axis2_status_t AXIS2_CALL
axis2_svc_grp_builder_populate_svc_grp(axis2_svc_grp_builder_t *grp_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_svc_grp_t *svc_grp)
{
axis2_svc_grp_builder_impl_t *grp_builder_impl = NULL;
@@ -205,7 +205,7 @@
svc_name = AXIS2_OM_ATTRIBUTE_GET_VALUE(svc_name_att, env);
if(NULL == svc_name)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_NAME_ERROR,
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_NAME_ERROR,
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
@@ -247,15 +247,15 @@
axis2_status_t AXIS2_CALL
axis2_svc_grp_builder_process_module_refs(axis2_svc_grp_builder_t *grp_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_children_qname_iterator_t *module_refs ,
axis2_svc_grp_t *svc_grp)
{
axis2_svc_grp_builder_impl_t *grp_builder_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, module_refs, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, svc_grp, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, module_refs, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, svc_grp, AXIS2_FAILURE);
grp_builder_impl = AXIS2_INTF_TO_IMPL(grp_builder);
while (AXIS2_TRUE == AXIS2_OM_CHILDREN_ITERATOR_HAS_NEXT(module_refs, env))
@@ -284,7 +284,7 @@
engine, env, qrefname);
if(NULL == module)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_MODULE_NOT_FOUND,
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_MODULE_NOT_FOUND,
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
Modified: webservices/axis2/trunk/c/modules/core/deployment/ws_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/ws_info.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/ws_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/ws_info.c Wed May 31 08:54:07 2006
@@ -41,51 +41,51 @@
axis2_status_t AXIS2_CALL
axis2_ws_info_free (axis2_ws_info_t *ws_info,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_char_t *AXIS2_CALL
axis2_ws_info_get_file_name(axis2_ws_info_t *ws_info,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_ws_info_set_file_name(axis2_ws_info_t *ws_info,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *file_name);
long AXIS2_CALL
axis2_ws_info_get_last_modified_date(axis2_ws_info_t *ws_info,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_ws_info_set_last_modified_date(axis2_ws_info_t *ws_info,
- axis2_env_t **env,
+ const axis2_env_t *env,
long last_modified_date);
int AXIS2_CALL
axis2_ws_info_get_type(axis2_ws_info_t *ws_info,
- axis2_env_t **env);
+ const axis2_env_t *env);
/************************** End of function prototypes ************************/
axis2_ws_info_t * AXIS2_CALL
-axis2_ws_info_create_with_file_name_and_last_modified_date (axis2_env_t **env,
+axis2_ws_info_create_with_file_name_and_last_modified_date (const axis2_env_t *env,
axis2_char_t *file_name,
long last_modified_date)
{
axis2_ws_info_impl_t *ws_info_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, file_name, NULL);
+ AXIS2_PARAM_CHECK(env->error, file_name, NULL);
- ws_info_impl = (axis2_ws_info_impl_t *) AXIS2_MALLOC((*env)->
+ ws_info_impl = (axis2_ws_info_impl_t *) AXIS2_MALLOC(env->
allocator, sizeof(axis2_ws_info_impl_t));
if(NULL == ws_info_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -98,18 +98,18 @@
if(!ws_info_impl->file_name)
{
axis2_ws_info_free(&(ws_info_impl->ws_info), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
ws_info_impl->last_modified_date = last_modified_date;
ws_info_impl->ws_info.ops =
- AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_ws_info_ops_t));
+ AXIS2_MALLOC (env->allocator, sizeof(axis2_ws_info_ops_t));
if(NULL == ws_info_impl->ws_info.ops)
{
axis2_ws_info_free(&(ws_info_impl->ws_info), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -127,7 +127,7 @@
axis2_ws_info_t * AXIS2_CALL
axis2_ws_info_create_with_file_name_and_last_modified_date_and_type (
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *file_name,
long last_modified_date,
int type)
@@ -135,7 +135,7 @@
axis2_ws_info_impl_t *ws_info_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, file_name, NULL);
+ AXIS2_PARAM_CHECK(env->error, file_name, NULL);
ws_info_impl = (axis2_ws_info_impl_t *)
axis2_ws_info_create_with_file_name_and_last_modified_date(env,
@@ -143,7 +143,7 @@
if(!ws_info_impl)
{
axis2_ws_info_free(&(ws_info_impl->ws_info), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
ws_info_impl->type = type;
@@ -154,7 +154,7 @@
axis2_status_t AXIS2_CALL
axis2_ws_info_free (axis2_ws_info_t *ws_info,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_ws_info_impl_t *ws_info_impl = NULL;
@@ -164,19 +164,19 @@
if(NULL != ws_info->ops)
{
- AXIS2_FREE((*env)->allocator, ws_info->ops);
+ AXIS2_FREE(env->allocator, ws_info->ops);
ws_info->ops = NULL;
}
if(NULL != ws_info_impl->file_name)
{
- AXIS2_FREE((*env)->allocator, ws_info_impl->file_name);
+ AXIS2_FREE(env->allocator, ws_info_impl->file_name);
ws_info_impl->file_name = NULL;
}
if(ws_info_impl)
{
- AXIS2_FREE((*env)->allocator, ws_info_impl);
+ AXIS2_FREE(env->allocator, ws_info_impl);
ws_info_impl = NULL;
}
@@ -185,7 +185,7 @@
axis2_char_t *AXIS2_CALL
axis2_ws_info_get_file_name(axis2_ws_info_t *ws_info,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(ws_info)->file_name;
@@ -193,18 +193,18 @@
axis2_status_t AXIS2_CALL
axis2_ws_info_set_file_name(axis2_ws_info_t *ws_info,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *file_name)
{
axis2_ws_info_impl_t *ws_info_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, file_name, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, file_name, AXIS2_FAILURE);
ws_info_impl = AXIS2_INTF_TO_IMPL(ws_info);
if(ws_info_impl->file_name)
{
- AXIS2_FREE((*env)->allocator, ws_info_impl->file_name);
+ AXIS2_FREE(env->allocator, ws_info_impl->file_name);
ws_info_impl->file_name = NULL;
}
ws_info_impl->file_name = file_name;
@@ -213,7 +213,7 @@
long AXIS2_CALL
axis2_ws_info_get_last_modified_date(axis2_ws_info_t *ws_info,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -222,7 +222,7 @@
axis2_status_t AXIS2_CALL
axis2_ws_info_set_last_modified_date(axis2_ws_info_t *ws_info,
- axis2_env_t **env,
+ const axis2_env_t *env,
long last_modified_date)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -232,7 +232,7 @@
int AXIS2_CALL
axis2_ws_info_get_type(axis2_ws_info_t *ws_info,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return AXIS2_INTF_TO_IMPL(ws_info)->type;
Modified: webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c Wed May 31 08:54:07 2006
@@ -49,62 +49,62 @@
axis2_status_t AXIS2_CALL
axis2_ws_info_list_free (axis2_ws_info_list_t *ws_info_list,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_ws_info_list_init(axis2_ws_info_list_t *info_list,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_ws_info_list_add_ws_info_item(axis2_ws_info_list_t *info_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_file_t *file,
int type);
axis2_ws_info_t *AXIS2_CALL
axis2_ws_info_list_get_file_item(axis2_ws_info_list_t *info_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *file_name);
axis2_bool_t AXIS2_CALL
axis2_ws_info_list_is_modified(axis2_ws_info_list_t *info_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_file_t *file,
axis2_ws_info_t *ws_info);
axis2_bool_t AXIS2_CALL
axis2_ws_info_list_is_file_exist(axis2_ws_info_list_t *info_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *file_name);
axis2_status_t AXIS2_CALL
axis2_ws_info_list_check_for_undeploy(axis2_ws_info_list_t *info_list,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_ws_info_list_update(axis2_ws_info_list_t *info_list,
- axis2_env_t **env);
+ const axis2_env_t *env);
/************************** End of function prototypes ************************/
AXIS2_DECLARE(axis2_ws_info_list_t *)
-axis2_ws_info_list_create_with_dep_engine (axis2_env_t **env,
+axis2_ws_info_list_create_with_dep_engine (const axis2_env_t *env,
struct axis2_dep_engine *dep_engine)
{
axis2_ws_info_list_impl_t *ws_info_list_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- ws_info_list_impl = (axis2_ws_info_list_impl_t *) AXIS2_MALLOC((*env)->
+ ws_info_list_impl = (axis2_ws_info_list_impl_t *) AXIS2_MALLOC(env->
allocator, sizeof(axis2_ws_info_list_impl_t));
if(NULL == ws_info_list_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;
}
@@ -119,7 +119,7 @@
if (!(ws_info_list_impl->info_list))
{
axis2_ws_info_list_free(&(ws_info_list_impl->ws_info_list), 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;
}
@@ -127,16 +127,16 @@
if (!(ws_info_list_impl->current_info_lists))
{
axis2_ws_info_list_free(&(ws_info_list_impl->ws_info_list), 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;
}
ws_info_list_impl->ws_info_list.ops =
- AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_ws_info_list_ops_t));
+ AXIS2_MALLOC (env->allocator, sizeof(axis2_ws_info_list_ops_t));
if(NULL == ws_info_list_impl->ws_info_list.ops)
{
axis2_ws_info_list_free(&(ws_info_list_impl->ws_info_list), 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;
}
@@ -161,7 +161,7 @@
axis2_status_t AXIS2_CALL
axis2_ws_info_list_free (axis2_ws_info_list_t *ws_info_list,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_ws_info_list_impl_t *info_list_impl = NULL;
@@ -180,7 +180,7 @@
file_name = (axis2_char_t *) AXIS2_ARRAY_LIST_GET(info_list_impl->
current_info_lists, env, i);
- AXIS2_FREE((*env)->allocator, file_name);
+ AXIS2_FREE(env->allocator, file_name);
}
AXIS2_ARRAY_LIST_FREE(info_list_impl->current_info_lists, env);
info_list_impl->current_info_lists = NULL;
@@ -203,11 +203,11 @@
info_list_impl->info_list = NULL;
}
if(NULL != ws_info_list->ops)
- AXIS2_FREE((*env)->allocator, ws_info_list->ops);
+ AXIS2_FREE(env->allocator, ws_info_list->ops);
if(info_list_impl)
{
- AXIS2_FREE((*env)->allocator, info_list_impl);
+ AXIS2_FREE(env->allocator, info_list_impl);
info_list_impl = NULL;
}
@@ -216,7 +216,7 @@
axis2_status_t AXIS2_CALL
axis2_ws_info_list_init(axis2_ws_info_list_t *info_list,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_ws_info_list_impl_t *info_list_impl = NULL;
int size = 0;
@@ -226,9 +226,9 @@
info_list_impl = AXIS2_INTF_TO_IMPL(info_list);
size = AXIS2_ARRAY_LIST_SIZE(info_list_impl->info_list, env);
- if(AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE((*env)->error))
+ if(AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
{
- return AXIS2_ERROR_GET_STATUS_CODE((*env)->error);
+ return AXIS2_ERROR_GET_STATUS_CODE(env->error);
}
for (i = 0; i < size; i++)
@@ -244,7 +244,7 @@
axis2_status_t AXIS2_CALL
axis2_ws_info_list_add_ws_info_item(axis2_ws_info_list_t *info_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_file_t *file,
int type)
{
@@ -254,7 +254,7 @@
axis2_char_t *temp_name = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, file, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, file, AXIS2_FAILURE);
temp_name = AXIS2_FILE_GET_NAME(file, env);
info_list_name = AXIS2_STRDUP(temp_name, env);
@@ -339,14 +339,14 @@
axis2_ws_info_t *AXIS2_CALL
axis2_ws_info_list_get_file_item(axis2_ws_info_list_t *info_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *file_name)
{
axis2_ws_info_list_impl_t *info_list_impl = NULL;
int i = 0;
int size = 0;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, file_name, NULL);
+ AXIS2_PARAM_CHECK(env->error, file_name, NULL);
info_list_impl = AXIS2_INTF_TO_IMPL(info_list);
size = AXIS2_ARRAY_LIST_SIZE(info_list_impl->info_list, env);
@@ -368,15 +368,15 @@
axis2_bool_t AXIS2_CALL
axis2_ws_info_list_is_modified(axis2_ws_info_list_t *info_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_file_t *file,
axis2_ws_info_t *ws_info)
{
long last_modified_date = 0;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, file, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, ws_info, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, file, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, ws_info, AXIS2_FAILURE);
last_modified_date = AXIS2_WS_INFO_GET_LAST_MODIFIED_DATE(ws_info, env);
return (last_modified_date != AXIS2_FILE_GET_TIMESTAMP(file, env));
@@ -384,20 +384,20 @@
axis2_bool_t AXIS2_CALL
axis2_ws_info_list_is_file_exist(axis2_ws_info_list_t *info_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *file_name)
{
axis2_ws_info_t *ws_info = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, file_name, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, file_name, AXIS2_FAILURE);
ws_info = axis2_ws_info_list_get_file_item(info_list, env, file_name);
return !(ws_info == NULL);
}
axis2_status_t AXIS2_CALL
axis2_ws_info_list_check_for_undeploy(axis2_ws_info_list_t *info_list,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_ws_info_list_impl_t *info_list_impl = NULL;
int list_size = 0;
@@ -473,7 +473,7 @@
axis2_status_t AXIS2_CALL
axis2_ws_info_list_update(axis2_ws_info_list_t *info_list,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_ws_info_list_impl_t *info_list_impl = NULL;
axis2_status_t status = AXIS2_FAILURE;
Modified: webservices/axis2/trunk/c/modules/core/description/flow.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/flow.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/flow.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/flow.c Wed May 31 08:54:07 2006
@@ -35,36 +35,36 @@
/***************************** Function headers *******************************/
axis2_status_t AXIS2_CALL
-axis2_flow_free (axis2_flow_t *flow, axis2_env_t **env);
+axis2_flow_free (axis2_flow_t *flow, const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_flow_add_handler (axis2_flow_t *flow,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_handler_desc_t *handler);
axis2_handler_desc_t * AXIS2_CALL
axis2_flow_get_handler (axis2_flow_t *flow,
- axis2_env_t **env,
+ const axis2_env_t *env,
int index);
int AXIS2_CALL
axis2_flow_get_handler_count(axis2_flow_t *flow,
- axis2_env_t **env);
+ const axis2_env_t *env);
/************************** End of Function headers ************************/
AXIS2_DECLARE(axis2_flow_t *)
-axis2_flow_create (axis2_env_t **env)
+axis2_flow_create (const axis2_env_t *env)
{
axis2_flow_impl_t *flow_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- flow_impl = (axis2_flow_impl_t *) AXIS2_MALLOC((*env)->allocator,
+ flow_impl = (axis2_flow_impl_t *) AXIS2_MALLOC(env->allocator,
sizeof(axis2_flow_impl_t));
if(NULL == flow_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;
}
@@ -76,16 +76,16 @@
if(NULL == flow_impl->list)
{
axis2_flow_free(&(flow_impl->flow), 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;
}
- flow_impl->flow.ops = AXIS2_MALLOC ((*env)->allocator,
+ flow_impl->flow.ops = AXIS2_MALLOC (env->allocator,
sizeof(axis2_flow_ops_t));
if(NULL == flow_impl->flow.ops)
{
axis2_flow_free(&(flow_impl->flow), 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;
}
@@ -100,7 +100,7 @@
/*************************** Start of op impls *************************/
axis2_status_t AXIS2_CALL
-axis2_flow_free (axis2_flow_t *flow, axis2_env_t **env)
+axis2_flow_free (axis2_flow_t *flow, const axis2_env_t *env)
{
axis2_flow_impl_t *flow_impl = NULL;
@@ -127,13 +127,13 @@
if(NULL != flow->ops)
{
- AXIS2_FREE((*env)->allocator, flow->ops);
+ AXIS2_FREE(env->allocator, flow->ops);
flow->ops = NULL;
}
if(flow_impl)
{
- AXIS2_FREE((*env)->allocator, flow_impl);
+ AXIS2_FREE(env->allocator, flow_impl);
flow_impl = NULL;
}
@@ -142,7 +142,7 @@
axis2_status_t AXIS2_CALL
axis2_flow_free_void_arg (void *flow,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_flow_t *flow_l = NULL;
@@ -153,13 +153,13 @@
axis2_status_t AXIS2_CALL
axis2_flow_add_handler (axis2_flow_t *flow,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_handler_desc_t *handler)
{
axis2_flow_impl_t *flow_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, handler, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, handler, AXIS2_FAILURE);
flow_impl = AXIS2_INTF_TO_IMPL(flow);
@@ -169,7 +169,7 @@
if(NULL == flow_impl->list)
{
axis2_flow_free(&(flow_impl->flow), env);
- 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;
}
}
@@ -178,7 +178,7 @@
axis2_handler_desc_t * AXIS2_CALL
axis2_flow_get_handler (axis2_flow_t *flow,
- axis2_env_t **env,
+ const axis2_env_t *env,
int index)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -188,7 +188,7 @@
int AXIS2_CALL
axis2_flow_get_handler_count(axis2_flow_t *flow,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
Modified: webservices/axis2/trunk/c/modules/core/description/flow_container.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/flow_container.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/flow_container.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/flow_container.c Wed May 31 08:54:07 2006
@@ -47,60 +47,60 @@
axis2_status_t AXIS2_CALL
axis2_flow_container_free(axis2_flow_container_t *flow_container,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_flow_t *AXIS2_CALL
axis2_flow_container_get_inflow(axis2_flow_container_t *flow_container,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_flow_container_set_inflow(axis2_flow_container_t *flow_container,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_flow_t *inflow);
axis2_flow_t *AXIS2_CALL
axis2_flow_container_get_outflow(axis2_flow_container_t *flow_container,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_flow_container_set_outflow(axis2_flow_container_t *flow_container,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_flow_t *outflow);
axis2_flow_t * AXIS2_CALL
axis2_flow_container_get_fault_inflow(axis2_flow_container_t *flow_container,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_flow_container_set_fault_inflow(axis2_flow_container_t *flow_container,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_flow_t *falut_inflow);
axis2_flow_t *AXIS2_CALL
axis2_flow_container_get_fault_outflow(axis2_flow_container_t *flow_container,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_flow_container_set_fault_outflow(axis2_flow_container_t *flow_container,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_flow_t *fault_outflow);
/************************** End of function prototypes ************************/
AXIS2_DECLARE(axis2_flow_container_t *)
-axis2_flow_container_create (axis2_env_t **env)
+axis2_flow_container_create (const axis2_env_t *env)
{
axis2_flow_container_impl_t *flow_container_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- flow_container_impl = (axis2_flow_container_impl_t *) AXIS2_MALLOC((*env)->
+ flow_container_impl = (axis2_flow_container_impl_t *) AXIS2_MALLOC(env->
allocator, sizeof(axis2_flow_container_impl_t));
if(NULL == flow_container_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;
}
@@ -111,11 +111,11 @@
flow_container_impl->out_fault = NULL;
flow_container_impl->flow_container.ops =
- AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_flow_container_ops_t));
+ AXIS2_MALLOC (env->allocator, sizeof(axis2_flow_container_ops_t));
if(NULL == flow_container_impl->flow_container.ops)
{
axis2_flow_container_free(&(flow_container_impl->flow_container), 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 @@
axis2_status_t AXIS2_CALL
axis2_flow_container_free(axis2_flow_container_t *flow_container,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_flow_container_impl_t *container_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -175,11 +175,11 @@
}
if(NULL != flow_container->ops)
- AXIS2_FREE((*env)->allocator, flow_container->ops);
+ AXIS2_FREE(env->allocator, flow_container->ops);
if(container_impl)
{
- AXIS2_FREE((*env)->allocator, container_impl);
+ AXIS2_FREE(env->allocator, container_impl);
container_impl = NULL;
}
@@ -192,7 +192,7 @@
*/
axis2_flow_t *AXIS2_CALL
axis2_flow_container_get_inflow(axis2_flow_container_t *flow_container,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(flow_container)->in;
@@ -204,7 +204,7 @@
*/
axis2_status_t AXIS2_CALL
axis2_flow_container_set_inflow(axis2_flow_container_t *flow_container,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_flow_t *inflow)
{
axis2_flow_container_impl_t *container_impl = NULL;
@@ -227,7 +227,7 @@
*/
axis2_flow_t *AXIS2_CALL
axis2_flow_container_get_outflow(axis2_flow_container_t *flow_container,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(flow_container)->out;
@@ -239,7 +239,7 @@
*/
axis2_status_t AXIS2_CALL
axis2_flow_container_set_outflow(axis2_flow_container_t *flow_container,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_flow_t *outflow)
{
axis2_flow_container_impl_t *container_impl = NULL;
@@ -262,7 +262,7 @@
*/
axis2_flow_t * AXIS2_CALL
axis2_flow_container_get_fault_inflow(axis2_flow_container_t *flow_container,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(flow_container)->in_fault;
@@ -274,7 +274,7 @@
*/
axis2_status_t AXIS2_CALL
axis2_flow_container_set_fault_inflow(axis2_flow_container_t *flow_container,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_flow_t *falut_inflow)
{
axis2_flow_container_impl_t *container_impl = NULL;
@@ -296,7 +296,7 @@
*/
axis2_flow_t *AXIS2_CALL
axis2_flow_container_get_fault_outflow(axis2_flow_container_t *flow_container,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(flow_container)->out_fault;
@@ -308,13 +308,13 @@
*/
axis2_status_t AXIS2_CALL
axis2_flow_container_set_fault_outflow(axis2_flow_container_t *flow_container,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_flow_t *fault_outflow)
{
axis2_flow_container_impl_t *container_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, fault_outflow, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, fault_outflow, AXIS2_FAILURE);
container_impl = AXIS2_INTF_TO_IMPL(flow_container);
if(container_impl->out_fault)
{
Modified: webservices/axis2/trunk/c/modules/core/description/handler_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/handler_desc.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/handler_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/handler_desc.c Wed May 31 08:54:07 2006
@@ -43,72 +43,72 @@
axis2_qname_t* AXIS2_CALL
axis2_handler_desc_get_qname (struct axis2_handler_desc *handler_desc,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_handler_desc_set_qname (struct axis2_handler_desc *handler_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname);
axis2_phase_rule_t* AXIS2_CALL
axis2_handler_desc_get_rules(struct axis2_handler_desc *handler_desc,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_handler_desc_set_rules(struct axis2_handler_desc *handler_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_phase_rule_t *phase_rule);
axis2_param_t* AXIS2_CALL
axis2_handler_desc_get_param(struct axis2_handler_desc *handler_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *name);
axis2_status_t AXIS2_CALL
axis2_handler_desc_add_param(struct axis2_handler_desc *handler_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_param_t *param);
axis2_array_list_t* AXIS2_CALL
axis2_handler_desc_get_params(struct axis2_handler_desc *handler_desc,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_bool_t AXIS2_CALL
axis2_handler_desc_is_param_locked(struct axis2_handler_desc *handler_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t * param_name);
axis2_handler_t* AXIS2_CALL
axis2_handler_desc_get_handler(struct axis2_handler_desc *handler_desc,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_handler_desc_set_handler(struct axis2_handler_desc *handler_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_handler_t * handler);
axis2_char_t* AXIS2_CALL
axis2_handler_desc_get_class_name(struct axis2_handler_desc *handler_desc,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_handler_desc_set_class_name(struct axis2_handler_desc *handler_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *class_name);
axis2_param_container_t* AXIS2_CALL
axis2_handler_desc_get_parent(struct axis2_handler_desc *handler_desc,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_handler_desc_set_parent(struct axis2_handler_desc *handler_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_param_container_t *parent);
axis2_status_t AXIS2_CALL
axis2_handler_desc_free (struct axis2_handler_desc *handler_desc,
- axis2_env_t **env);
+ const axis2_env_t *env);
AXIS2_DECLARE(axis2_handler_desc_t*)
-axis2_handler_desc_create_with_qname(axis2_env_t **env,
+axis2_handler_desc_create_with_qname(const axis2_env_t *env,
axis2_qname_t *qname)
{
axis2_handler_desc_impl_t *handler_desc_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- handler_desc_impl = AXIS2_MALLOC( (*env)->allocator,
+ handler_desc_impl = AXIS2_MALLOC( env->allocator,
sizeof(axis2_handler_desc_impl_t) );
if (!handler_desc_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;
}
@@ -144,12 +144,12 @@
/* initialize ops */
- handler_desc_impl->handler_desc.ops = AXIS2_MALLOC( (*env)->allocator,
+ handler_desc_impl->handler_desc.ops = AXIS2_MALLOC( env->allocator,
sizeof(axis2_handler_desc_ops_t) );
if (!handler_desc_impl->handler_desc.ops)
{
axis2_handler_desc_free(&(handler_desc_impl->handler_desc), 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;
}
@@ -173,14 +173,14 @@
}
axis2_qname_t* AXIS2_CALL axis2_handler_desc_get_qname (struct axis2_handler_desc *handler_desc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(handler_desc)->qname;
}
axis2_status_t AXIS2_CALL axis2_handler_desc_set_qname (struct axis2_handler_desc *handler_desc,
- axis2_env_t **env, axis2_qname_t *qname)
+ const axis2_env_t *env, axis2_qname_t *qname)
{
/**TODO: need to have the qname copy constructor here */
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -190,14 +190,14 @@
}
axis2_phase_rule_t* AXIS2_CALL axis2_handler_desc_get_rules(struct axis2_handler_desc *handler_desc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(handler_desc)->rules;
}
axis2_status_t AXIS2_CALL axis2_handler_desc_set_rules(struct axis2_handler_desc *handler_desc,
- axis2_env_t **env, axis2_phase_rule_t *phase_rule)
+ const axis2_env_t *env, axis2_phase_rule_t *phase_rule)
{
axis2_handler_desc_impl_t *handler_desc_impl = NULL;
@@ -222,7 +222,7 @@
}
axis2_param_t* AXIS2_CALL axis2_handler_desc_get_param(struct axis2_handler_desc *handler_desc,
- axis2_env_t **env, axis2_char_t *name)
+ const axis2_env_t *env, axis2_char_t *name)
{
axis2_handler_desc_impl_t *handler_desc_impl = NULL;
@@ -234,7 +234,7 @@
}
axis2_status_t AXIS2_CALL axis2_handler_desc_add_param(struct axis2_handler_desc *handler_desc,
- axis2_env_t **env, axis2_param_t * param)
+ const axis2_env_t *env, axis2_param_t * param)
{
axis2_handler_desc_impl_t *handler_desc_impl = NULL;
@@ -244,7 +244,7 @@
if (AXIS2_PARAM_CONTAINER_IS_PARAM_LOCKED(handler_desc_impl->parent, env, AXIS2_PARAM_GET_NAME(param, env)) )
{
- AXIS2_ERROR_SET((*env)->error,AXIS2_ERROR_PARAMETER_LOCKED_CANNOT_OVERRIDE , AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error,AXIS2_ERROR_PARAMETER_LOCKED_CANNOT_OVERRIDE , AXIS2_FAILURE);
return AXIS2_FAILURE;
}
@@ -252,7 +252,7 @@
}
axis2_array_list_t* AXIS2_CALL axis2_handler_desc_get_params(struct axis2_handler_desc *handler_desc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_handler_desc_impl_t *handler_desc_impl = NULL;
@@ -264,7 +264,7 @@
}
axis2_bool_t AXIS2_CALL axis2_handler_desc_is_param_locked(struct axis2_handler_desc *handler_desc,
- axis2_env_t **env, axis2_char_t * param_name)
+ const axis2_env_t *env, axis2_char_t * param_name)
{
axis2_handler_desc_impl_t *handler_desc_impl = NULL;
@@ -280,14 +280,14 @@
}
axis2_handler_t* AXIS2_CALL axis2_handler_desc_get_handler(struct axis2_handler_desc *handler_desc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(handler_desc)->handler;
}
axis2_status_t AXIS2_CALL axis2_handler_desc_set_handler(struct axis2_handler_desc *handler_desc,
- axis2_env_t **env, axis2_handler_t * handler)
+ const axis2_env_t *env, axis2_handler_t * handler)
{
/* handler dec is the place wehre the handler really lives. Hence this is a deep copy and
should be freed by the free mechanism. There is a coupling here in trems of freeing */
@@ -310,14 +310,14 @@
}
axis2_char_t* AXIS2_CALL axis2_handler_desc_get_class_name(struct axis2_handler_desc *handler_desc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(handler_desc)->class_name;
}
axis2_status_t AXIS2_CALL axis2_handler_desc_set_class_name(struct axis2_handler_desc *handler_desc,
- axis2_env_t **env, axis2_char_t *class_name)
+ const axis2_env_t *env, axis2_char_t *class_name)
{
axis2_handler_desc_impl_t *handler_desc_impl = NULL;
@@ -326,7 +326,7 @@
handler_desc_impl = AXIS2_INTF_TO_IMPL(handler_desc);
if (handler_desc_impl->class_name)
{
- AXIS2_FREE((*env)->allocator, handler_desc_impl->class_name);
+ AXIS2_FREE(env->allocator, handler_desc_impl->class_name);
handler_desc_impl->class_name = NULL;
}
@@ -335,7 +335,7 @@
handler_desc_impl->class_name = AXIS2_STRDUP(class_name, env);
if (!handler_desc_impl->class_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;
}
}
@@ -344,14 +344,14 @@
}
axis2_param_container_t* AXIS2_CALL axis2_handler_desc_get_parent(struct axis2_handler_desc *handler_desc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(handler_desc)->parent;
}
axis2_status_t AXIS2_CALL axis2_handler_desc_set_parent(struct axis2_handler_desc *handler_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_param_container_t * parent)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -360,7 +360,7 @@
}
axis2_status_t AXIS2_CALL axis2_handler_desc_free (struct axis2_handler_desc *handler_desc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_handler_desc_impl_t *handler_desc_impl = NULL;
@@ -370,7 +370,7 @@
if (handler_desc_impl->handler_desc.ops)
{
- AXIS2_FREE((*env)->allocator, handler_desc_impl->handler_desc.ops);
+ AXIS2_FREE(env->allocator, handler_desc_impl->handler_desc.ops);
handler_desc_impl->handler_desc.ops = NULL;
}
@@ -401,12 +401,12 @@
if (handler_desc_impl->class_name)
{
- AXIS2_FREE((*env)->allocator, handler_desc_impl->class_name);
+ AXIS2_FREE(env->allocator, handler_desc_impl->class_name);
handler_desc_impl->class_name = NULL;
}
if(handler_desc_impl)
{
- AXIS2_FREE((*env)->allocator, handler_desc_impl);
+ AXIS2_FREE(env->allocator, handler_desc_impl);
handler_desc_impl = NULL;
}
Modified: webservices/axis2/trunk/c/modules/core/description/module_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/module_desc.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/module_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/module_desc.c Wed May 31 08:54:07 2006
@@ -40,114 +40,114 @@
axis2_status_t AXIS2_CALL
axis2_module_desc_free(axis2_module_desc_t *module_desc,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_flow_t *AXIS2_CALL
axis2_module_desc_get_inflow(axis2_module_desc_t *module_desc,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_module_desc_set_inflow(axis2_module_desc_t *module_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_flow_t *inflow);
axis2_flow_t *AXIS2_CALL
axis2_module_desc_get_outflow(axis2_module_desc_t *module_desc,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_module_desc_set_outflow(axis2_module_desc_t *module_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_flow_t *outflow);
axis2_flow_t * AXIS2_CALL
axis2_module_desc_get_fault_inflow(axis2_module_desc_t *module_desc,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_module_desc_set_fault_inflow(axis2_module_desc_t *module_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_flow_t *falut_inflow);
axis2_flow_t *AXIS2_CALL
axis2_module_desc_get_fault_outflow(axis2_module_desc_t *module_desc,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_module_desc_set_fault_outflow(axis2_module_desc_t *module_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_flow_t *fault_outflow);
axis2_qname_t * AXIS2_CALL
axis2_module_desc_get_name (axis2_module_desc_t *module_desc,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_module_desc_set_name (axis2_module_desc_t *module_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname);
axis2_status_t AXIS2_CALL
axis2_module_desc_add_op (axis2_module_desc_t *module_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_op_t *op);
axis2_hash_t * AXIS2_CALL
axis2_module_desc_get_ops (axis2_module_desc_t *module_desc,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_conf_t * AXIS2_CALL
axis2_module_desc_get_parent (axis2_module_desc_t *module_desc,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_module_desc_set_parent (axis2_module_desc_t *module_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_conf_t *parent);
axis2_status_t AXIS2_CALL
axis2_module_desc_add_param(axis2_module_desc_t *module_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_param_t *param);
axis2_param_t * AXIS2_CALL
axis2_module_desc_get_param(axis2_module_desc_t *module_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *name);
axis2_array_list_t * AXIS2_CALL
axis2_module_desc_get_params (axis2_module_desc_t *module_desc,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_bool_t AXIS2_CALL
axis2_module_desc_is_param_locked (axis2_module_desc_t *module_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *param_name);
axis2_module_t *AXIS2_CALL
axis2_module_desc_get_module(axis2_module_desc_t *module_desc,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_module_desc_set_module(axis2_module_desc_t *module_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_module_t *module);
/************************** End of function prototypes ************************/
axis2_module_desc_t * AXIS2_CALL
-axis2_module_desc_create (axis2_env_t **env)
+axis2_module_desc_create (const axis2_env_t *env)
{
axis2_module_desc_impl_t *module_desc_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- module_desc_impl = (axis2_module_desc_impl_t *) AXIS2_MALLOC((*env)->allocator,
+ module_desc_impl = (axis2_module_desc_impl_t *) AXIS2_MALLOC(env->allocator,
sizeof(axis2_module_desc_impl_t));
if(NULL == module_desc_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;
}
@@ -162,7 +162,7 @@
if(NULL == module_desc_impl->module_desc.params)
{
axis2_module_desc_free(&(module_desc_impl->module_desc), 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;
}
@@ -170,7 +170,7 @@
if(NULL == module_desc_impl->module_desc.flow_container)
{
axis2_module_desc_free(&(module_desc_impl->module_desc), 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;
}
@@ -178,16 +178,16 @@
if(NULL == module_desc_impl->ops)
{
axis2_module_desc_free(&(module_desc_impl->module_desc), 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;
}
module_desc_impl->module_desc.ops =
- AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_module_desc_ops_t));
+ AXIS2_MALLOC (env->allocator, sizeof(axis2_module_desc_ops_t));
if(NULL == module_desc_impl->module_desc.ops)
{
axis2_module_desc_free(&(module_desc_impl->module_desc), 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;
}
@@ -233,16 +233,16 @@
}
AXIS2_DECLARE(axis2_module_desc_t *)
-axis2_module_desc_create_with_qname (axis2_env_t **env, axis2_qname_t *qname)
+axis2_module_desc_create_with_qname (const axis2_env_t *env, axis2_qname_t *qname)
{
axis2_module_desc_impl_t *module_desc_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, qname, NULL);
+ AXIS2_PARAM_CHECK(env->error, qname, NULL);
module_desc_impl = AXIS2_INTF_TO_IMPL(axis2_module_desc_create(env));
if(NULL == module_desc_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;
}
@@ -256,7 +256,7 @@
axis2_status_t AXIS2_CALL
axis2_module_desc_free(axis2_module_desc_t *module_desc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_module_desc_impl_t * module_desc_impl = NULL;
@@ -313,13 +313,13 @@
if(module_desc->ops)
{
- AXIS2_FREE((*env)->allocator, module_desc->ops);
+ AXIS2_FREE(env->allocator, module_desc->ops);
module_desc->ops = NULL;
}
if(module_desc_impl)
{
- AXIS2_FREE((*env)->allocator, module_desc_impl);
+ AXIS2_FREE(env->allocator, module_desc_impl);
module_desc_impl = NULL;
}
@@ -328,7 +328,7 @@
axis2_status_t AXIS2_CALL
axis2_module_desc_free_void_arg (void *module_desc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_module_desc_t *module_desc_l = NULL;
@@ -339,7 +339,7 @@
axis2_flow_t *AXIS2_CALL
axis2_module_desc_get_inflow(axis2_module_desc_t *module_desc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -348,11 +348,11 @@
axis2_status_t AXIS2_CALL
axis2_module_desc_set_inflow(axis2_module_desc_t *module_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_flow_t *inflow)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, inflow, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, inflow, AXIS2_FAILURE);
return AXIS2_FLOW_CONTAINER_SET_INFLOW(module_desc->flow_container, env,
inflow);
@@ -360,7 +360,7 @@
axis2_flow_t *AXIS2_CALL
axis2_module_desc_get_outflow(axis2_module_desc_t *module_desc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -369,11 +369,11 @@
axis2_status_t AXIS2_CALL
axis2_module_desc_set_outflow(axis2_module_desc_t *module_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_flow_t *outflow)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, outflow, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, outflow, AXIS2_FAILURE);
return AXIS2_FLOW_CONTAINER_SET_OUTFLOW(module_desc->flow_container, env,
outflow);
@@ -381,7 +381,7 @@
axis2_flow_t * AXIS2_CALL
axis2_module_desc_get_fault_inflow(axis2_module_desc_t *module_desc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -390,11 +390,11 @@
axis2_status_t AXIS2_CALL
axis2_module_desc_set_fault_inflow(axis2_module_desc_t *module_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_flow_t *falut_inflow)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, falut_inflow, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, falut_inflow, AXIS2_FAILURE);
return AXIS2_FLOW_CONTAINER_SET_FAULT_INFLOW(module_desc->flow_container,
env, falut_inflow);
@@ -402,7 +402,7 @@
axis2_flow_t *AXIS2_CALL
axis2_module_desc_get_fault_outflow(axis2_module_desc_t *module_desc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_FLOW_CONTAINER_GET_FAULT_OUTFLOW(module_desc->flow_container, env);
@@ -410,11 +410,11 @@
axis2_status_t AXIS2_CALL
axis2_module_desc_set_fault_outflow(axis2_module_desc_t *module_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_flow_t *fault_outflow)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, fault_outflow, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, fault_outflow, AXIS2_FAILURE);
return AXIS2_FLOW_CONTAINER_SET_FAULT_OUTFLOW(module_desc->flow_container,
env, fault_outflow);
@@ -422,7 +422,7 @@
axis2_qname_t * AXIS2_CALL
axis2_module_desc_get_name (axis2_module_desc_t *module_desc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -431,13 +431,13 @@
axis2_status_t AXIS2_CALL
axis2_module_desc_set_name (axis2_module_desc_t *module_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname)
{
axis2_module_desc_impl_t *module_desc_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, qname, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, qname, AXIS2_FAILURE);
module_desc_impl = AXIS2_INTF_TO_IMPL(module_desc);
if(module_desc_impl->qname)
@@ -453,7 +453,7 @@
axis2_status_t AXIS2_CALL
axis2_module_desc_add_op (axis2_module_desc_t *module_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_op_t *op)
{
axis2_module_desc_impl_t *module_desc_impl = NULL;
@@ -461,7 +461,7 @@
axis2_char_t *op_name = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, op, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, op, AXIS2_FAILURE);
module_desc_impl = AXIS2_INTF_TO_IMPL(module_desc);
if (NULL == (module_desc_impl->ops))
@@ -485,7 +485,7 @@
axis2_hash_t * AXIS2_CALL
axis2_module_desc_get_ops (axis2_module_desc_t *module_desc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(module_desc)->ops;
@@ -493,7 +493,7 @@
axis2_conf_t * AXIS2_CALL
axis2_module_desc_get_parent (axis2_module_desc_t *module_desc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(module_desc)->parent;
@@ -501,11 +501,11 @@
axis2_status_t AXIS2_CALL
axis2_module_desc_set_parent (axis2_module_desc_t *module_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_conf_t *parent)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, parent, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, parent, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(module_desc)->parent = parent;
return AXIS2_SUCCESS;
@@ -513,7 +513,7 @@
axis2_status_t AXIS2_CALL
axis2_module_desc_add_param(axis2_module_desc_t *module_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_param_t *param)
{
axis2_char_t *param_name_l = NULL;
@@ -524,13 +524,13 @@
param_name_l = AXIS2_PARAM_GET_NAME(param, env);
if(NULL == param_name_l)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_STATE_PARAM,
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_STATE_PARAM,
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
if(AXIS2_TRUE == axis2_module_desc_is_param_locked(module_desc, env, param_name_l))
{
- AXIS2_ERROR_SET((*env)->error,
+ AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_PARAMETER_LOCKED_CANNOT_OVERRIDE, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
@@ -543,18 +543,18 @@
axis2_param_t * AXIS2_CALL
axis2_module_desc_get_param(axis2_module_desc_t *module_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *name)
{
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, name, NULL);
+ AXIS2_PARAM_CHECK(env->error, name, NULL);
return AXIS2_PARAM_CONTAINER_GET_PARAM(module_desc->params, env, name);
}
axis2_array_list_t * AXIS2_CALL
axis2_module_desc_get_params (axis2_module_desc_t *module_desc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -563,7 +563,7 @@
axis2_bool_t AXIS2_CALL
axis2_module_desc_is_param_locked (axis2_module_desc_t *module_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *param_name)
{
axis2_module_desc_impl_t *module_desc_impl = NULL;
@@ -572,13 +572,13 @@
axis2_param_t *param_l = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, param_name, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, param_name, AXIS2_FAILURE);
module_desc_impl = AXIS2_INTF_TO_IMPL(module_desc);
/* checking the locked value of parent*/
if(NULL == module_desc_impl->parent)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_STATE_MODULE_DESC, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_STATE_MODULE_DESC, AXIS2_FAILURE);
return AXIS2_FALSE;
}
locked = AXIS2_CONF_IS_PARAM_LOCKED(module_desc_impl->parent, env, param_name);
@@ -602,7 +602,7 @@
axis2_module_t *AXIS2_CALL
axis2_module_desc_get_module(axis2_module_desc_t *module_desc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(module_desc)->module;
@@ -610,11 +610,11 @@
axis2_status_t AXIS2_CALL
axis2_module_desc_set_module(axis2_module_desc_t *module_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_module_t *module)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, module, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, module, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(module_desc)->module = module;
return AXIS2_SUCCESS;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org