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 [23/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/description/transport_out_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c Wed May 31 08:54:07 2006
@@ -64,94 +64,94 @@
axis2_status_t AXIS2_CALL
axis2_transport_out_desc_free (
axis2_transport_out_desc_t *transport_out,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_qname_t *AXIS2_CALL
axis2_transport_out_desc_get_qname(axis2_transport_out_desc_t *transport_out,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_transport_out_desc_set_qname(axis2_transport_out_desc_t *transport_out,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname);
axis2_flow_t *AXIS2_CALL
axis2_transport_out_desc_get_outflow(axis2_transport_out_desc_t *transport_out,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_transport_out_desc_set_outflow(axis2_transport_out_desc_t *transport_out,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_flow_t *outflow);
axis2_flow_t *AXIS2_CALL
axis2_transport_out_desc_get_faultflow(axis2_transport_out_desc_t *transport_out,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_transport_out_desc_set_faultflow(axis2_transport_out_desc_t *transport_out,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_flow_t *faultflow);
axis2_transport_sender_t * AXIS2_CALL
axis2_transport_out_desc_get_sender(axis2_transport_out_desc_t *transport_out,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_transport_out_desc_set_sender(axis2_transport_out_desc_t *transport_out,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_transport_sender_t *sender);
axis2_phase_t * AXIS2_CALL
axis2_transport_out_desc_get_out_phase(axis2_transport_out_desc_t *transport_out,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_transport_out_desc_set_out_phase(axis2_transport_out_desc_t *transport_out,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_phase_t *out_phase);
axis2_phase_t *AXIS2_CALL
axis2_transport_out_desc_get_faultphase(axis2_transport_out_desc_t *transport_out,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_transport_out_desc_set_faultphase(axis2_transport_out_desc_t *transport_out,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_phase_t *faultphase);
axis2_status_t AXIS2_CALL
axis2_transport_out_desc_add_param(axis2_transport_out_desc_t *transport_out_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_param_t *param);
axis2_param_t *AXIS2_CALL
axis2_transport_out_desc_get_param(axis2_transport_out_desc_t *transport_out_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *param_name);
axis2_bool_t AXIS2_CALL
axis2_transport_out_desc_is_param_locked (axis2_transport_out_desc_t *
transport_out_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *param_name);
/************************** End of function prototypes ************************/
AXIS2_DECLARE(axis2_transport_out_desc_t *)
-axis2_transport_out_desc_create_with_qname (axis2_env_t **env, axis2_qname_t *qname)
+axis2_transport_out_desc_create_with_qname (const axis2_env_t *env, axis2_qname_t *qname)
{
axis2_transport_out_desc_impl_t *transport_out_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, qname, NULL);
+ AXIS2_PARAM_CHECK(env->error, qname, NULL);
- transport_out_impl = (axis2_transport_out_desc_impl_t *) AXIS2_MALLOC((*env)->
+ transport_out_impl = (axis2_transport_out_desc_impl_t *) AXIS2_MALLOC(env->
allocator, sizeof(axis2_transport_out_desc_impl_t));
if(NULL == transport_out_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;
}
@@ -168,18 +168,18 @@
if(NULL == transport_out_impl->transport_out.param_container)
{
axis2_transport_out_desc_free(&(transport_out_impl->transport_out), 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;
}
transport_out_impl->qname = AXIS2_QNAME_CLONE(qname, env);
transport_out_impl->transport_out.ops =
- AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_transport_out_desc_ops_t));
+ AXIS2_MALLOC (env->allocator, sizeof(axis2_transport_out_desc_ops_t));
if(NULL == transport_out_impl->transport_out.ops)
{
axis2_transport_out_desc_free(&(transport_out_impl->transport_out), 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;
}
@@ -223,7 +223,7 @@
axis2_status_t AXIS2_CALL
axis2_transport_out_desc_free (axis2_transport_out_desc_t *transport_out,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_transport_out_desc_impl_t *transport_out_impl = NULL;
@@ -239,7 +239,7 @@
if(NULL != transport_out->ops)
{
- AXIS2_FREE((*env)->allocator, transport_out->ops);
+ AXIS2_FREE(env->allocator, transport_out->ops);
transport_out->ops = NULL;
}
@@ -279,14 +279,14 @@
transport_out_impl->faultphase = NULL;
}
- AXIS2_FREE((*env)->allocator, transport_out_impl);
+ AXIS2_FREE(env->allocator, transport_out_impl);
return AXIS2_SUCCESS;
}
axis2_qname_t *AXIS2_CALL
axis2_transport_out_desc_get_qname(axis2_transport_out_desc_t *transport_out,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(transport_out)->qname;
@@ -294,12 +294,12 @@
axis2_status_t AXIS2_CALL
axis2_transport_out_desc_set_qname(axis2_transport_out_desc_t *transport_out,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname)
{
axis2_transport_out_desc_impl_t *transport_out_impl = AXIS2_INTF_TO_IMPL(transport_out);
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, qname, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, qname, AXIS2_FAILURE);
if(transport_out_impl->qname)
{
@@ -312,7 +312,7 @@
axis2_flow_t *AXIS2_CALL
axis2_transport_out_desc_get_outflow(axis2_transport_out_desc_t *transport_out,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(transport_out)->outflow;
@@ -320,12 +320,12 @@
axis2_status_t AXIS2_CALL
axis2_transport_out_desc_set_outflow(axis2_transport_out_desc_t *transport_out,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_flow_t *outflow)
{
axis2_transport_out_desc_impl_t *transport_out_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, outflow, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, outflow, AXIS2_FAILURE);
transport_out_impl = AXIS2_INTF_TO_IMPL(transport_out);
if(transport_out_impl->outflow)
@@ -339,19 +339,19 @@
axis2_flow_t *AXIS2_CALL
axis2_transport_out_desc_get_faultflow(axis2_transport_out_desc_t *transport_out,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(transport_out)->faultflow;
}
axis2_status_t AXIS2_CALL
axis2_transport_out_desc_set_faultflow(axis2_transport_out_desc_t *transport_out,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_flow_t *faultflow)
{
axis2_transport_out_desc_impl_t *transport_out_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, faultflow, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, faultflow, AXIS2_FAILURE);
transport_out_impl = AXIS2_INTF_TO_IMPL(transport_out);
if(transport_out_impl->faultflow)
@@ -365,7 +365,7 @@
axis2_transport_sender_t * AXIS2_CALL
axis2_transport_out_desc_get_sender(axis2_transport_out_desc_t *transport_out,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(transport_out)->sender;
@@ -373,12 +373,12 @@
axis2_status_t AXIS2_CALL
axis2_transport_out_desc_set_sender(axis2_transport_out_desc_t *transport_out,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_transport_sender_t *sender)
{
axis2_transport_out_desc_impl_t *transport_out_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, sender, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, sender, AXIS2_FAILURE);
transport_out_impl = AXIS2_INTF_TO_IMPL(transport_out);
@@ -394,7 +394,7 @@
axis2_phase_t * AXIS2_CALL
axis2_transport_out_desc_get_out_phase(axis2_transport_out_desc_t *transport_out,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -403,13 +403,13 @@
axis2_status_t AXIS2_CALL
axis2_transport_out_desc_set_out_phase(axis2_transport_out_desc_t *transport_out,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_phase_t *out_phase)
{
axis2_transport_out_desc_impl_t *transport_out_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, out_phase, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, out_phase, AXIS2_FAILURE);
transport_out_impl = AXIS2_INTF_TO_IMPL(transport_out);
if(transport_out_impl->out_phase)
@@ -423,7 +423,7 @@
axis2_phase_t *AXIS2_CALL
axis2_transport_out_desc_get_faultphase(axis2_transport_out_desc_t *transport_out,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -432,13 +432,13 @@
axis2_status_t AXIS2_CALL
axis2_transport_out_desc_set_faultphase(axis2_transport_out_desc_t *transport_out,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_phase_t *faultphase)
{
axis2_transport_out_desc_impl_t *transport_out_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, faultphase, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, faultphase, AXIS2_FAILURE);
transport_out_impl = AXIS2_INTF_TO_IMPL(transport_out);
if(transport_out_impl->faultphase)
@@ -453,11 +453,11 @@
axis2_status_t AXIS2_CALL
axis2_transport_out_desc_add_param(axis2_transport_out_desc_t *transport_out_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_param_t *param)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, param, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, param, AXIS2_FAILURE);
return AXIS2_PARAM_CONTAINER_ADD_PARAM(transport_out_desc->
param_container, env, param);
@@ -465,11 +465,11 @@
axis2_param_t *AXIS2_CALL
axis2_transport_out_desc_get_param(axis2_transport_out_desc_t *transport_out_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *param_name)
{
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, param_name, NULL);
+ AXIS2_PARAM_CHECK(env->error, param_name, NULL);
return AXIS2_PARAM_CONTAINER_GET_PARAM(transport_out_desc->param_container,
env, param_name);
@@ -478,11 +478,11 @@
axis2_bool_t AXIS2_CALL
axis2_transport_out_desc_is_param_locked (axis2_transport_out_desc_t *
transport_out_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *param_name)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, param_name, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, param_name, AXIS2_FAILURE);
return AXIS2_PARAM_CONTAINER_IS_PARAM_LOCKED(transport_out_desc->
param_container, env, param_name);
Modified: webservices/axis2/trunk/c/modules/core/engine/addr_disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/addr_disp.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/addr_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/addr_disp.c Wed May 31 08:54:07 2006
@@ -26,22 +26,22 @@
axis2_status_t AXIS2_CALL
axis2_addr_disp_invoke (struct axis2_handler * handler,
- axis2_env_t **env,
+ const axis2_env_t *env,
struct axis2_msg_ctx *msg_ctx);
axis2_svc_t* AXIS2_CALL
axis2_addr_disp_find_svc(axis2_msg_ctx_t *msg_ctx,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_op_t* AXIS2_CALL
axis2_addr_disp_find_op(axis2_msg_ctx_t *msg_ctx,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_svc_t *svc);
axis2_disp_t* AXIS2_CALL
-axis2_addr_disp_create(axis2_env_t **env)
+axis2_addr_disp_create(const axis2_env_t *env)
{
axis2_disp_t *disp = NULL;
axis2_handler_t *handler = NULL;
@@ -56,14 +56,14 @@
disp = axis2_disp_create(env, qname);
if (!disp)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
handler = AXIS2_DISP_GET_BASE(disp, env);
if (!handler)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_HANDLER_STATE, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE, AXIS2_FAILURE);
return NULL;
}
@@ -90,7 +90,7 @@
*/
axis2_svc_t* AXIS2_CALL
axis2_addr_disp_find_svc(axis2_msg_ctx_t *msg_ctx,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_endpoint_ref_t *endpoint_ref = NULL;
axis2_svc_t *svc = NULL;
@@ -107,7 +107,7 @@
if (address)
{
axis2_char_t **url_tokens = NULL;
- AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI,
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"Checking for service using WSA enpoint address : %s", address);
if ( (AXIS2_STRCMP(AXIS2_WSA_ANONYMOUS_URL, address) == 0 ) ||
@@ -137,17 +137,17 @@
AXIS2_QNAME_FREE(qname, env);
if(svc)
- AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI,
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"Service found using WSA enpoint address");
}
}
- AXIS2_FREE((*env)->allocator, url_tokens[0]);
+ AXIS2_FREE(env->allocator, url_tokens[0]);
}
if(url_tokens[1])
{
- AXIS2_FREE((*env)->allocator, url_tokens[1]);
+ AXIS2_FREE(env->allocator, url_tokens[1]);
}
- AXIS2_FREE((*env)->allocator, url_tokens);
+ AXIS2_FREE(env->allocator, url_tokens);
url_tokens = NULL;
}
}
@@ -165,7 +165,7 @@
*/
axis2_op_t* AXIS2_CALL
axis2_addr_disp_find_op(axis2_msg_ctx_t *msg_ctx,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_svc_t *svc)
{
axis2_char_t *action = NULL;
@@ -173,19 +173,19 @@
axis2_op_t *op = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, svc, NULL);
+ AXIS2_PARAM_CHECK(env->error, svc, NULL);
action = AXIS2_MSG_CTX_GET_WSA_ACTION(msg_ctx, env);
if (action)
{
- AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI,
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"Checking for operation using WSA Action : %s", action);
qname = axis2_qname_create(env, action, NULL, NULL);
op = AXIS2_SVC_GET_OP_WITH_QNAME(svc, env, qname);
if (op)
- AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI,
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"Operation found using WSA Action");
AXIS2_QNAME_FREE(qname, env);
}
@@ -196,7 +196,7 @@
axis2_status_t AXIS2_CALL
axis2_addr_disp_invoke(struct axis2_handler * handler,
- axis2_env_t **env,
+ const axis2_env_t *env,
struct axis2_msg_ctx *msg_ctx)
{
axis2_relates_to_t *relates_to = NULL;
Modified: webservices/axis2/trunk/c/modules/core/engine/axis2_engine.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/axis2_engine.h?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/axis2_engine.h (original)
+++ webservices/axis2/trunk/c/modules/core/engine/axis2_engine.h Wed May 31 08:54:07 2006
@@ -62,7 +62,7 @@
*/
axis2_status_t (AXIS2_CALL *
send)(struct axis2_engine *engine,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_msg_ctx_t *msg_ctx);
/**
* This methods represents the inflow of the Axis, this could be either at the server side or the client side.
@@ -75,7 +75,7 @@
*/
axis2_status_t (AXIS2_CALL *
receive)(struct axis2_engine *engine,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_msg_ctx_t *msg_ctx);
/**
* Sends the SOAP Fault to another SOAP node.
@@ -84,7 +84,7 @@
*/
axis2_status_t (AXIS2_CALL *
send_fault)(struct axis2_engine *engine,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_msg_ctx_t *msg_ctx);
/**
* This is invoked when a SOAP Fault is received from a Other SOAP Node
@@ -94,7 +94,7 @@
*/
axis2_status_t (AXIS2_CALL *
receive_fault)(struct axis2_engine *engine,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_msg_ctx_t *msg_ctx);
/**
* This method is called to handle any error that occurs at inflow or outflow. But if the
@@ -106,7 +106,7 @@
*/
axis2_msg_ctx_t* (AXIS2_CALL *
create_fault_msg_ctx)(struct axis2_engine *engine,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_msg_ctx_t *processing_context);
/**
* Information to create the SOAPFault can be extracted from different places.
@@ -142,45 +142,45 @@
*/
axis2_status_t (AXIS2_CALL *
extract_fault_info_from_msg_ctx)(struct axis2_engine *engine,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_msg_ctx_t *msg_ctx,
struct axis2_soap_fault *fault);
axis2_status_t (AXIS2_CALL *
verify_ctx_built)(struct axis2_engine *engine,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_msg_ctx_t *msg_ctx);
axis2_status_t (AXIS2_CALL *
invoke_phases)(struct axis2_engine *engine,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_array_list_t *phases,
axis2_msg_ctx_t *msg_ctx);
axis2_status_t (AXIS2_CALL *
resume_invocation_phases)(struct axis2_engine *engine,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_array_list_t *phases,
axis2_msg_ctx_t *msg_ctx);
axis2_char_t* (AXIS2_CALL *
get_sender_fault_code)(struct axis2_engine *engine,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *soap_namespace);
axis2_char_t* (AXIS2_CALL *
get_receiver_fault_code)(struct axis2_engine *engine,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *soap_namespace);
axis2_status_t (AXIS2_CALL *
free)(struct axis2_engine *engine,
- axis2_env_t **env);
+ const axis2_env_t *env);
};
@@ -194,7 +194,7 @@
};
AXIS2_DECLARE(axis2_engine_t*)
-axis2_engine_create(axis2_env_t **env,
+axis2_engine_create(const axis2_env_t *env,
axis2_conf_ctx_t *conf_ctx);
/************************** Start of function macros **************************/
Modified: webservices/axis2/trunk/c/modules/core/engine/axis2_event.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/axis2_event.h?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/axis2_event.h (original)
+++ webservices/axis2/trunk/c/modules/core/engine/axis2_event.h Wed May 31 08:54:07 2006
@@ -53,17 +53,17 @@
axis2_svc_t* (AXIS2_CALL *
get_svc)(struct axis2_event *event,
- axis2_env_t **env);
+ const axis2_env_t *env);
int (AXIS2_CALL *
get_event_type)(struct axis2_event *event,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t (AXIS2_CALL *
free)(struct axis2_event *event,
- axis2_env_t **env);
+ const axis2_env_t *env);
};
/**
@@ -76,7 +76,7 @@
};
AXIS2_DECLARE(axis2_event_t*)
-axis2_event_create(axis2_env_t **env,
+axis2_event_create(const axis2_env_t *env,
axis2_svc_t *svc,
int event_type);
Modified: webservices/axis2/trunk/c/modules/core/engine/conf.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/conf.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/conf.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/conf.c Wed May 31 08:54:07 2006
@@ -68,54 +68,54 @@
axis2_status_t AXIS2_CALL
axis2_conf_free (axis2_conf_t *conf,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_conf_add_svc_grp (axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_svc_grp_t *svc_grp);
axis2_svc_grp_t * AXIS2_CALL
axis2_conf_get_svc_grp (axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *svc_grp_name);
axis2_hash_t * AXIS2_CALL
axis2_conf_get_svc_grps(axis2_conf_t *conf,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_conf_add_svc (axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_svc_t *svc);
axis2_svc_t * AXIS2_CALL
axis2_conf_get_svc (axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t* svc_name);
axis2_status_t AXIS2_CALL
axis2_conf_remove_svc (axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
const axis2_char_t *name);
axis2_status_t AXIS2_CALL
axis2_conf_add_param (axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_param_t *param);
axis2_param_t * AXIS2_CALL
axis2_conf_get_param (axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
const axis2_char_t *name);
axis2_array_list_t * AXIS2_CALL
axis2_conf_get_params (axis2_conf_t *conf,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_bool_t AXIS2_CALL
axis2_conf_is_param_locked (axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *param_name);
/**
@@ -128,115 +128,115 @@
* @return svc name and grp name
*/
axis2_status_t
-split_svc_name(axis2_env_t **env,
+split_svc_name(const axis2_env_t *env,
axis2_char_t *svc_name,
axis2_char_t **svc_name_st);
axis2_transport_in_desc_t * AXIS2_CALL
axis2_conf_get_transport_in(axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname);
axis2_status_t AXIS2_CALL
axis2_conf_add_transport_in(axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_transport_in_desc_t *transport);
axis2_transport_out_desc_t * AXIS2_CALL
axis2_conf_get_transport_out(axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname);
axis2_status_t AXIS2_CALL
axis2_conf_add_transport_out(axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_transport_out_desc_t *transport);
axis2_hash_t * AXIS2_CALL
axis2_conf_get_transports_in(axis2_conf_t *conf,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_hash_t * AXIS2_CALL
axis2_conf_get_transports_out(axis2_conf_t *conf,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_module_desc_t *AXIS2_CALL
axis2_conf_get_module(axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname);
axis2_array_list_t * AXIS2_CALL
axis2_conf_get_engaged_modules(axis2_conf_t *conf,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_array_list_t * AXIS2_CALL
axis2_conf_get_in_phases_upto_and_including_post_dispatch(
axis2_conf_t *conf,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_array_list_t * AXIS2_CALL
axis2_conf_get_outflow(axis2_conf_t *conf,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_array_list_t * AXIS2_CALL
axis2_conf_get_in_faultflow(axis2_conf_t *conf,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_array_list_t * AXIS2_CALL
axis2_conf_get_out_faultflow(axis2_conf_t *conf,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_hash_t *AXIS2_CALL
axis2_conf_get_faulty_svcs(axis2_conf_t *conf,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_hash_t *AXIS2_CALL
axis2_conf_get_faulty_modules(axis2_conf_t *conf,
- axis2_env_t **env);
+ const axis2_env_t *env);
/*to get all the services in the system */
axis2_hash_t *AXIS2_CALL
axis2_conf_get_svcs(axis2_conf_t *conf,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_bool_t AXIS2_CALL
axis2_conf_is_engaged(axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *module_name);
axis2_phases_info_t *AXIS2_CALL
axis2_conf_get_phases_info(axis2_conf_t *conf,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_conf_set_phases_info(axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_phases_info_t *phases_info);
axis2_status_t AXIS2_CALL
axis2_conf_add_msg_recv(axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *key,
axis2_msg_recv_t *msg_recv);
axis2_msg_recv_t *AXIS2_CALL
axis2_conf_get_msg_recv(axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *key);
axis2_status_t AXIS2_CALL
axis2_conf_set_out_phases(axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_array_list_t *out_phases);
axis2_array_list_t* AXIS2_CALL
axis2_conf_get_out_phases(axis2_conf_t *conf,
- axis2_env_t **env);
+ const axis2_env_t *env);
/**
* @param list
*/
axis2_status_t AXIS2_CALL
axis2_conf_set_in_faultphases(axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_array_list_t *list);
/**
@@ -244,7 +244,7 @@
*/
axis2_status_t AXIS2_CALL
axis2_conf_set_out_faultphases(axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_array_list_t *list);
/**
@@ -252,7 +252,7 @@
*/
axis2_hash_t *AXIS2_CALL
axis2_conf_get_modules(axis2_conf_t *conf,
- axis2_env_t **env);
+ const axis2_env_t *env);
/**
* Method addMdoule
@@ -261,60 +261,60 @@
*/
axis2_status_t AXIS2_CALL
axis2_conf_add_module(axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_module_desc_t *module);
axis2_status_t AXIS2_CALL
axis2_conf_set_default_dispatchers(axis2_conf_t *conf,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_conf_set_dispatch_phase(axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_phase_t *dispatch);
axis2_status_t AXIS2_CALL
axis2_conf_set_dep_engine(axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_dep_engine_t *dep_engine);
axis2_status_t AXIS2_CALL
axis2_conf_engage_module(axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *module_ref);
axis2_char_t *AXIS2_CALL
axis2_conf_get_repos(axis2_conf_t *conf,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_conf_set_repos(axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *repos_path);
axis2_char_t * AXIS2_CALL
-axis2_conf_get_default_module_version(axis2_conf_t *conf, axis2_env_t **env,
+axis2_conf_get_default_module_version(axis2_conf_t *conf, const axis2_env_t *env,
axis2_char_t* module_name);
axis2_module_desc_t* AXIS2_CALL
-axis2_conf_get_default_module(axis2_conf_t *conf,axis2_env_t **env,
+axis2_conf_get_default_module(axis2_conf_t *conf,const axis2_env_t *env,
axis2_char_t *module_name);
axis2_status_t AXIS2_CALL
-axis2_conf_add_default_module_version(axis2_conf_t *conf, axis2_env_t **env,
+axis2_conf_add_default_module_version(axis2_conf_t *conf, const axis2_env_t *env,
axis2_char_t *module_name,
axis2_char_t *module_version);
axis2_status_t AXIS2_CALL
-axis2_conf_engage_module_with_version(axis2_conf_t *conf, axis2_env_t **env,
+axis2_conf_engage_module_with_version(axis2_conf_t *conf, const axis2_env_t *env,
axis2_char_t *module_name,
axis2_char_t *version_id);
/************************** End of function prototypes ************************/
axis2_conf_t * AXIS2_CALL
-axis2_conf_create (axis2_env_t **env)
+axis2_conf_create (const axis2_env_t *env)
{
axis2_conf_impl_t *config_impl = NULL;
axis2_status_t status = AXIS2_FAILURE;
@@ -322,12 +322,12 @@
AXIS2_ENV_CHECK(env, NULL);
- config_impl = (axis2_conf_impl_t *) AXIS2_MALLOC ((*env)->allocator
+ config_impl = (axis2_conf_impl_t *) AXIS2_MALLOC (env->allocator
, sizeof(axis2_conf_impl_t));
if(NULL == config_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;
}
@@ -356,7 +356,7 @@
if(NULL == config_impl->conf.param_container)
{
axis2_conf_free(&(config_impl->conf), 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;
}
@@ -364,7 +364,7 @@
if(NULL == config_impl->svc_grps)
{
axis2_conf_free(&(config_impl->conf), 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;
}
@@ -372,7 +372,7 @@
if(NULL == config_impl->transports_in)
{
axis2_conf_free(&(config_impl->conf), 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;
}
@@ -380,7 +380,7 @@
if(NULL == config_impl->transports_out)
{
axis2_conf_free(&(config_impl->conf), 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;
}
@@ -388,7 +388,7 @@
if(NULL == config_impl->modules)
{
axis2_conf_free(&(config_impl->conf), 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;
}*/
@@ -396,7 +396,7 @@
if(NULL == config_impl->engaged_modules)
{
axis2_conf_free(&(config_impl->conf), 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;
}
@@ -405,7 +405,7 @@
if(NULL == config_impl->in_phases_upto_and_including_post_dispatch)
{
axis2_conf_free(&(config_impl->conf), 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;
}
else
@@ -443,7 +443,7 @@
if(NULL == config_impl->out_phases)
{
axis2_conf_free(&(config_impl->conf), 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;
}
@@ -451,7 +451,7 @@
if(NULL == config_impl->in_faultphases)
{
axis2_conf_free(&(config_impl->conf), 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;
}
@@ -459,7 +459,7 @@
if(NULL == config_impl->out_faultphases)
{
axis2_conf_free(&(config_impl->conf), 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;
}*/
@@ -467,7 +467,7 @@
if(NULL == config_impl->handlers)
{
axis2_conf_free(&(config_impl->conf), 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;
}
@@ -475,7 +475,7 @@
if(NULL == config_impl->all_svcs)
{
axis2_conf_free(&(config_impl->conf), 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;
}
@@ -483,7 +483,7 @@
if(NULL == config_impl->msg_recvs)
{
axis2_conf_free(&(config_impl->conf), 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;
}
@@ -491,7 +491,7 @@
if(NULL == config_impl->faulty_svcs)
{
axis2_conf_free(&(config_impl->conf), 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;
}
@@ -499,7 +499,7 @@
if(NULL == config_impl->faulty_modules)
{
axis2_conf_free(&(config_impl->conf), 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;
}
@@ -507,7 +507,7 @@
if(NULL == config_impl->all_modules)
{
axis2_conf_free(&(config_impl->conf), 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;
}
@@ -515,16 +515,16 @@
if(NULL == config_impl->name_to_version_map)
{
axis2_conf_free(&(config_impl->conf), 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;
}
- config_impl->conf.ops = AXIS2_MALLOC((*env)->allocator,
+ config_impl->conf.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_conf_ops_t));
if(NULL == config_impl->conf.ops)
{
axis2_conf_free(&(config_impl->conf), 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;
}
@@ -622,7 +622,7 @@
axis2_status_t AXIS2_CALL
axis2_conf_free (axis2_conf_t *conf,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_conf_impl_t *config_impl = NULL;
axis2_status_t status = AXIS2_SUCCESS;
@@ -761,7 +761,7 @@
module_ver = (axis2_char_t *) val;
if (module_ver)
{
- AXIS2_FREE((*env)->allocator, module_ver);
+ AXIS2_FREE(env->allocator, module_ver);
module_ver = NULL;
}
@@ -945,19 +945,19 @@
if(config_impl->axis2_repos)
{
- AXIS2_FREE((*env)->allocator, config_impl->axis2_repos);
+ AXIS2_FREE(env->allocator, config_impl->axis2_repos);
config_impl->axis2_repos = NULL;
}
if(NULL != conf->ops)
{
- AXIS2_FREE((*env)->allocator, conf->ops);
+ AXIS2_FREE(env->allocator, conf->ops);
conf->ops = NULL;
}
if(config_impl)
{
- AXIS2_FREE((*env)->allocator, config_impl);
+ AXIS2_FREE(env->allocator, config_impl);
config_impl = NULL;
}
@@ -966,7 +966,7 @@
axis2_status_t AXIS2_CALL
axis2_conf_add_svc_grp (axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_svc_grp_t *svc_grp)
{
axis2_conf_impl_t *config_impl = NULL;
@@ -977,7 +977,7 @@
int k = 0;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, svc_grp, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, svc_grp, AXIS2_FAILURE);
config_impl = AXIS2_INTF_TO_IMPL(conf);
svcs = AXIS2_SVC_GRP_GET_SVCS(svc_grp, env);
@@ -1006,7 +1006,7 @@
/* no two service names deployed in the engine can be same */
if(NULL != svc_name2)
{
- AXIS2_ERROR_SET((*env)->error,
+ AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_TWO_SVCS_CANNOT_HAVE_SAME_NAME, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
@@ -1059,17 +1059,17 @@
axis2_svc_grp_t * AXIS2_CALL
axis2_conf_get_svc_grp (axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *svc_grp_name)
{
axis2_conf_impl_t *config_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, svc_grp_name, NULL);
+ AXIS2_PARAM_CHECK(env->error, svc_grp_name, NULL);
config_impl = AXIS2_INTF_TO_IMPL(conf);
if(!config_impl->svc_grps)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_STATE_CONF,
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_STATE_CONF,
AXIS2_FAILURE);
return NULL;
}
@@ -1079,7 +1079,7 @@
axis2_hash_t * AXIS2_CALL
axis2_conf_get_svc_grps(axis2_conf_t *conf,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(conf)->svc_grps;
@@ -1087,7 +1087,7 @@
axis2_status_t AXIS2_CALL
axis2_conf_add_svc (axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_svc_t *svc)
{
axis2_svc_grp_t *svc_grp = NULL;
@@ -1095,13 +1095,13 @@
axis2_char_t *svc_grp_name = NULL;
axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, svc, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, svc, AXIS2_FAILURE);
svc_grp = axis2_svc_grp_create(env);
if(NULL == svc_grp)
{
- 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;
}
@@ -1109,7 +1109,7 @@
svc_grp_qname = AXIS2_SVC_GET_QNAME(svc, env);
if(NULL == svc_grp_qname)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_STATE_SVC,
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_STATE_SVC,
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
@@ -1141,11 +1141,11 @@
axis2_svc_t * AXIS2_CALL
axis2_conf_get_svc (axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t* svc_name)
{
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, svc_name, NULL);
+ AXIS2_PARAM_CHECK(env->error, svc_name, NULL);
return axis2_hash_get(AXIS2_INTF_TO_IMPL(conf)->all_svcs, svc_name,
AXIS2_HASH_KEY_STRING);
@@ -1153,13 +1153,13 @@
axis2_status_t AXIS2_CALL
axis2_conf_remove_svc (axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
const axis2_char_t *svc_name)
{
axis2_conf_impl_t *config_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, svc_name, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, svc_name, AXIS2_FAILURE);
axis2_hash_set(config_impl->all_svcs, svc_name, AXIS2_HASH_KEY_STRING,
NULL);
@@ -1168,18 +1168,18 @@
axis2_status_t AXIS2_CALL
axis2_conf_add_param (axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_param_t *param)
{
axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, param, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, param, AXIS2_FAILURE);
if(AXIS2_TRUE == axis2_conf_is_param_locked(conf, env,
AXIS2_PARAM_GET_NAME(param, env)))
{
- AXIS2_ERROR_SET((*env)->error,
+ AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_PARAMETER_LOCKED_CANNOT_OVERRIDE, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
@@ -1193,15 +1193,15 @@
axis2_param_t * AXIS2_CALL
axis2_conf_get_param (axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
const axis2_char_t *name)
{
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, name, NULL);
+ AXIS2_PARAM_CHECK(env->error, name, NULL);
if(NULL == conf->param_container)
{
- AXIS2_ERROR_SET((*env)->error,
+ AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_INVALID_STATE_PARAM_CONTAINER, AXIS2_FAILURE);
return NULL;
}
@@ -1213,7 +1213,7 @@
axis2_array_list_t * AXIS2_CALL
axis2_conf_get_params (axis2_conf_t *conf,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_PARAM_CONTAINER_GET_PARAMS(conf->param_container, env);
@@ -1222,13 +1222,13 @@
axis2_bool_t AXIS2_CALL
axis2_conf_is_param_locked (axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *param_name)
{
axis2_param_t *param = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
- AXIS2_PARAM_CHECK((*env)->error, param_name, AXIS2_FALSE);
+ AXIS2_PARAM_CHECK(env->error, param_name, AXIS2_FALSE);
param = axis2_conf_get_param(conf, env, param_name);
return (NULL != param && AXIS2_PARAM_IS_LOCKED(param, env));
@@ -1236,12 +1236,12 @@
axis2_transport_in_desc_t * AXIS2_CALL
axis2_conf_get_transport_in(axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname)
{
axis2_conf_impl_t *config_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, qname, NULL);
+ AXIS2_PARAM_CHECK(env->error, qname, NULL);
config_impl = AXIS2_INTF_TO_IMPL(conf);
@@ -1255,14 +1255,14 @@
*/
axis2_status_t AXIS2_CALL
axis2_conf_add_transport_in(axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_transport_in_desc_t *transport)
{
axis2_conf_impl_t *config_impl = NULL;
axis2_qname_t *qname = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, transport, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, transport, AXIS2_FAILURE);
config_impl = AXIS2_INTF_TO_IMPL(conf);
@@ -1286,12 +1286,12 @@
axis2_transport_out_desc_t * AXIS2_CALL
axis2_conf_get_transport_out(axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname)
{
axis2_conf_impl_t *config_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, qname, NULL);
+ AXIS2_PARAM_CHECK(env->error, qname, NULL);
config_impl = AXIS2_INTF_TO_IMPL(conf);
@@ -1305,14 +1305,14 @@
*/
axis2_status_t AXIS2_CALL
axis2_conf_add_transport_out(axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_transport_out_desc_t *transport)
{
axis2_conf_impl_t *config_impl = NULL;
axis2_qname_t *qname = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, transport, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, transport, AXIS2_FAILURE);
config_impl = AXIS2_INTF_TO_IMPL(conf);
@@ -1335,7 +1335,7 @@
axis2_hash_t * AXIS2_CALL
axis2_conf_get_transports_in(axis2_conf_t *conf,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(conf)->transports_in;
@@ -1348,7 +1348,7 @@
*/
axis2_module_desc_t *AXIS2_CALL
axis2_conf_get_module(axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname)
{
axis2_conf_impl_t *conf_impl = NULL;
@@ -1359,7 +1359,7 @@
axis2_char_t *def_mod_ver = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, qname, NULL);
+ AXIS2_PARAM_CHECK(env->error, qname, NULL);
conf_impl = AXIS2_INTF_TO_IMPL(conf);
name = AXIS2_QNAME_TO_STRING(qname, env);
@@ -1395,7 +1395,7 @@
*/
axis2_array_list_t * AXIS2_CALL
axis2_conf_get_engaged_modules(axis2_conf_t *conf,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(conf)->engaged_modules;
@@ -1404,7 +1404,7 @@
axis2_array_list_t * AXIS2_CALL
axis2_conf_get_in_phases_upto_and_including_post_dispatch(
axis2_conf_t *conf,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(conf)->
@@ -1413,7 +1413,7 @@
axis2_array_list_t * AXIS2_CALL
axis2_conf_get_outflow(axis2_conf_t *conf,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(conf)->out_phases;
@@ -1426,7 +1426,7 @@
*/
axis2_array_list_t * AXIS2_CALL
axis2_conf_get_in_faultflow(axis2_conf_t *conf,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(conf)->in_faultphases;
@@ -1437,7 +1437,7 @@
*/
axis2_array_list_t * AXIS2_CALL
axis2_conf_get_out_faultflow(axis2_conf_t *conf,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(conf)->out_faultphases;
@@ -1445,14 +1445,14 @@
axis2_hash_t * AXIS2_CALL
axis2_conf_get_transports_out(axis2_conf_t *conf,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(conf)->transports_out;
}
/*static axis2_status_t
-split_svc_name (axis2_env_t **env,
+split_svc_name (const axis2_env_t *env,
axis2_char_t *svc_name,
axis2_char_t **svc_name_st)
{
@@ -1467,7 +1467,7 @@
return AXIS2_SUCCESS;
}
svc_name_l[0] = AXIS2_EOLN;
- grp_name = AXIS2_MALLOC((*env)->allocator, strlen(svc_name));
+ grp_name = AXIS2_MALLOC(env->allocator, strlen(svc_name));
sscanf(svc_name, "%s", grp_name);
svc_name_l = svc_name_l + 1;
*(svc_name_st + 1) = AXIS2_STRDUP(svc_name_l, env);
@@ -1479,7 +1479,7 @@
axis2_hash_t *AXIS2_CALL
axis2_conf_get_faulty_svcs(axis2_conf_t *conf,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -1488,7 +1488,7 @@
axis2_hash_t *AXIS2_CALL
axis2_conf_get_faulty_modules(axis2_conf_t *conf,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(conf)->faulty_modules;
@@ -1497,7 +1497,7 @@
/*to get all the services in the system */
axis2_hash_t *AXIS2_CALL
axis2_conf_get_svcs(axis2_conf_t *conf,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_conf_impl_t *config_impl = NULL;
axis2_hash_t *sgs = NULL;
@@ -1539,7 +1539,7 @@
axis2_bool_t AXIS2_CALL
axis2_conf_is_engaged(axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *module_name)
{
axis2_conf_impl_t *config_impl = NULL;
@@ -1548,7 +1548,7 @@
int i = 0;
int size = 0;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
- AXIS2_PARAM_CHECK((*env)->error, module_name, AXIS2_FALSE);
+ AXIS2_PARAM_CHECK(env->error, module_name, AXIS2_FALSE);
config_impl = AXIS2_INTF_TO_IMPL(conf);
def_mod = AXIS2_CONF_GET_DEFAULT_MODULE(conf, env,
@@ -1578,7 +1578,7 @@
axis2_phases_info_t *AXIS2_CALL
axis2_conf_get_phases_info(axis2_conf_t *conf,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -1587,13 +1587,13 @@
axis2_status_t AXIS2_CALL
axis2_conf_set_phases_info(axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_phases_info_t *phases_info)
{
axis2_conf_impl_t *config_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, phases_info, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, phases_info, AXIS2_FAILURE);
config_impl = AXIS2_INTF_TO_IMPL(conf);
if(config_impl->phases_info)
@@ -1608,15 +1608,15 @@
axis2_status_t AXIS2_CALL
axis2_conf_add_msg_recv(axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *key,
axis2_msg_recv_t *msg_recv)
{
axis2_conf_impl_t *config_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, key, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, msg_recv, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, key, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, msg_recv, AXIS2_FAILURE);
config_impl = AXIS2_INTF_TO_IMPL(conf);
@@ -1632,7 +1632,7 @@
axis2_msg_recv_t *AXIS2_CALL
axis2_conf_get_msg_recv(axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *key)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -1643,13 +1643,13 @@
axis2_status_t AXIS2_CALL
axis2_conf_set_out_phases(axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_array_list_t *out_phases)
{
axis2_conf_impl_t *config_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, out_phases, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, out_phases, AXIS2_FAILURE);
config_impl = AXIS2_INTF_TO_IMPL(conf);
if(config_impl->out_phases)
@@ -1663,7 +1663,7 @@
axis2_array_list_t* AXIS2_CALL
axis2_conf_get_out_phases(axis2_conf_t *conf,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(conf)->out_phases;
@@ -1674,13 +1674,13 @@
*/
axis2_status_t AXIS2_CALL
axis2_conf_set_in_faultphases(axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_array_list_t *list)
{
axis2_conf_impl_t *config_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, list, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, list, AXIS2_FAILURE);
config_impl = AXIS2_INTF_TO_IMPL(conf);
if(config_impl->in_faultphases)
@@ -1697,13 +1697,13 @@
*/
axis2_status_t AXIS2_CALL
axis2_conf_set_out_faultphases(axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_array_list_t *list)
{
axis2_conf_impl_t *config_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, list, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, list, AXIS2_FAILURE);
config_impl = AXIS2_INTF_TO_IMPL(conf);
if(config_impl->out_faultphases)
@@ -1720,7 +1720,7 @@
*/
axis2_hash_t *AXIS2_CALL
axis2_conf_get_modules(axis2_conf_t *conf,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -1733,7 +1733,7 @@
*/
axis2_status_t AXIS2_CALL
axis2_conf_add_module(axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_module_desc_t *module)
{
axis2_conf_impl_t *config_impl = NULL;
@@ -1741,7 +1741,7 @@
axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, module, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, module, AXIS2_FAILURE);
config_impl = AXIS2_INTF_TO_IMPL(conf);
@@ -1778,7 +1778,7 @@
axis2_status_t AXIS2_CALL
axis2_conf_set_default_dispatchers(axis2_conf_t *conf,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_conf_impl_t *config_impl = NULL;
axis2_phase_t *dispatch = NULL;
@@ -1887,7 +1887,7 @@
axis2_status_t AXIS2_CALL
axis2_conf_set_dispatch_phase(axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_phase_t *dispatch)
{
axis2_conf_impl_t *config_impl = NULL;
@@ -1897,7 +1897,7 @@
axis2_disp_checker_t *disp_checker = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, dispatch, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, dispatch, AXIS2_FAILURE);
config_impl = AXIS2_INTF_TO_IMPL(conf);
status = AXIS2_ARRAY_LIST_ADD(config_impl->
@@ -1940,7 +1940,7 @@
axis2_status_t AXIS2_CALL
axis2_conf_engage_module(axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *module_ref)
{
axis2_conf_impl_t *config_impl = NULL;
@@ -1951,7 +1951,7 @@
axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, module_ref, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, module_ref, AXIS2_FAILURE);
config_impl = AXIS2_INTF_TO_IMPL(conf);
module_desc = axis2_conf_get_module(conf, env, module_ref);
@@ -1980,9 +1980,9 @@
temp_path2 = AXIS2_STRACAT(temp_path1, AXIS2_MODULE_FOLDER, env);
temp_path3 = AXIS2_STRACAT(temp_path2, AXIS2_PATH_SEP_STR, env);
path = AXIS2_STRACAT(temp_path3, file_name, env);
- AXIS2_FREE((*env)->allocator, temp_path1);
- AXIS2_FREE((*env)->allocator, temp_path2);
- AXIS2_FREE((*env)->allocator, temp_path3);
+ AXIS2_FREE(env->allocator, temp_path1);
+ AXIS2_FREE(env->allocator, temp_path2);
+ AXIS2_FREE(env->allocator, temp_path3);
AXIS2_FILE_SET_PATH(file, env, path);
file_data = axis2_arch_file_data_create_with_type_and_file(env,
AXIS2_MODULE, file);
@@ -2016,7 +2016,7 @@
}
else
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_MODULE, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_MODULE, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
if (to_be_engaged)
@@ -2052,7 +2052,7 @@
axis2_char_t *AXIS2_CALL
axis2_conf_get_repos(axis2_conf_t *conf,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_conf_impl_t *conf_impl = NULL;
@@ -2065,7 +2065,7 @@
axis2_status_t AXIS2_CALL
axis2_conf_set_repos(axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *repos_path)
{
axis2_conf_impl_t *conf_impl = NULL;
@@ -2075,7 +2075,7 @@
if(conf_impl->axis2_repos)
{
- AXIS2_FREE((*env)->allocator, conf_impl->axis2_repos);
+ AXIS2_FREE(env->allocator, conf_impl->axis2_repos);
conf_impl->axis2_repos = NULL;
}
conf_impl->axis2_repos = AXIS2_STRDUP(repos_path, env);
@@ -2085,7 +2085,7 @@
axis2_status_t AXIS2_CALL
axis2_conf_set_dep_engine(axis2_conf_t *conf,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_dep_engine_t *dep_engine)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -2094,12 +2094,12 @@
}
axis2_char_t * AXIS2_CALL
-axis2_conf_get_default_module_version(axis2_conf_t *conf, axis2_env_t **env,
+axis2_conf_get_default_module_version(axis2_conf_t *conf, const axis2_env_t *env,
axis2_char_t* module_name)
{
axis2_hash_t *def_ver_map = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, module_name, NULL);
+ AXIS2_PARAM_CHECK(env->error, module_name, NULL);
def_ver_map = AXIS2_INTF_TO_IMPL(conf)->name_to_version_map;
if(NULL == def_ver_map)
@@ -2110,7 +2110,7 @@
}
axis2_module_desc_t* AXIS2_CALL
-axis2_conf_get_default_module(axis2_conf_t *conf,axis2_env_t **env,
+axis2_conf_get_default_module(axis2_conf_t *conf,const axis2_env_t *env,
axis2_char_t *module_name)
{
axis2_module_desc_t *ret_mod = NULL;
@@ -2120,7 +2120,7 @@
axis2_qname_t *mod_qname = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, module_name, NULL);
+ AXIS2_PARAM_CHECK(env->error, module_name, NULL);
all_modules = AXIS2_INTF_TO_IMPL(conf)->all_modules;
mod_ver = AXIS2_CONF_GET_DEFAULT_MODULE_VERSION(conf, env, module_name);
@@ -2134,10 +2134,10 @@
axis2_char_t *tmp_name = NULL;
tmp_name = AXIS2_STRACAT(module_name, "-", env);
mod_name = AXIS2_STRACAT(tmp_name, mod_ver, env);
- AXIS2_FREE((*env)->allocator, tmp_name);
+ AXIS2_FREE(env->allocator, tmp_name);
}
mod_qname = axis2_qname_create(env, mod_name, NULL, NULL);
- AXIS2_FREE((*env)->allocator, mod_name);
+ AXIS2_FREE(env->allocator, mod_name);
mod_name = NULL;
if(NULL == mod_qname)
@@ -2162,15 +2162,15 @@
* @param module_version
*/
axis2_status_t AXIS2_CALL
-axis2_conf_add_default_module_version(axis2_conf_t *conf, axis2_env_t **env,
+axis2_conf_add_default_module_version(axis2_conf_t *conf, const axis2_env_t *env,
axis2_char_t *module_name,
axis2_char_t *module_version)
{
axis2_hash_t *name_to_ver_map = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, module_name, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, module_version, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, module_name, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, module_version, AXIS2_FAILURE);
/*
* If we already have a default module version we don't put
* it again
@@ -2199,7 +2199,7 @@
* @param version_id
*/
axis2_status_t AXIS2_CALL
-axis2_conf_engage_module_with_version(axis2_conf_t *conf, axis2_env_t **env,
+axis2_conf_engage_module_with_version(axis2_conf_t *conf, const axis2_env_t *env,
axis2_char_t *module_name,
axis2_char_t *version_id)
{
@@ -2207,7 +2207,7 @@
axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, module_name, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, module_name, AXIS2_FAILURE);
module_qname = axis2_core_utils_get_module_qname(env, module_name,
version_id);
Modified: webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c Wed May 31 08:54:07 2006
@@ -27,11 +27,11 @@
axis2_status_t AXIS2_CALL
axis2_ctx_handler_invoke(struct axis2_handler *handler,
- axis2_env_t **env,
+ const axis2_env_t *env,
struct axis2_msg_ctx *msg_ctx);
axis2_handler_t* AXIS2_CALL
-axis2_ctx_handler_create(axis2_env_t **env,
+axis2_ctx_handler_create(const axis2_env_t *env,
axis2_qname_t *qname)
{
axis2_handler_t *handler = NULL;
@@ -45,7 +45,7 @@
handler_qname = AXIS2_QNAME_CLONE(qname, env);
if (!(handler_qname))
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
}
@@ -88,7 +88,7 @@
axis2_status_t AXIS2_CALL
axis2_ctx_handler_invoke(struct axis2_handler *handler,
- axis2_env_t **env,
+ const axis2_env_t *env,
struct axis2_msg_ctx *msg_ctx)
{
axis2_op_t *op = NULL;
@@ -97,7 +97,7 @@
axis2_svc_grp_ctx_t *svc_grp_ctx = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, msg_ctx, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
svc_ctx = AXIS2_MSG_CTX_GET_SVC_CTX(msg_ctx, env);
Modified: webservices/axis2/trunk/c/modules/core/engine/disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/disp.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/disp.c Wed May 31 08:54:07 2006
@@ -40,35 +40,35 @@
axis2_handler_t* AXIS2_CALL
axis2_disp_get_base(struct axis2_disp *disp,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_qname_t* AXIS2_CALL
axis2_disp_get_qname(struct axis2_disp *disp,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_disp_set_qname(struct axis2_disp *disp,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname);
axis2_status_t AXIS2_CALL
axis2_disp_free (struct axis2_disp * disp,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_svc_t* AXIS2_CALL
axis2_disp_find_svc(axis2_msg_ctx_t * msg_ctx,
- axis2_env_t **env);
+ const axis2_env_t *env);
struct axis2_op* AXIS2_CALL
axis2_disp_find_op(axis2_msg_ctx_t * msg_ctx,
- axis2_env_t **env,
+ const axis2_env_t *env,
struct axis2_svc *svc);
axis2_disp_t* AXIS2_CALL
-axis2_disp_create(axis2_env_t **env,
+axis2_disp_create(const axis2_env_t *env,
axis2_qname_t *qname)
{
axis2_disp_impl_t *disp_impl = NULL;
@@ -76,10 +76,10 @@
AXIS2_ENV_CHECK(env, NULL);
- disp_impl = AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_disp_impl_t) );
+ disp_impl = AXIS2_MALLOC( env->allocator, sizeof(axis2_disp_impl_t) );
if (!disp_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,7 +91,7 @@
disp_impl->qname = AXIS2_QNAME_CLONE(qname, env);
if (!(disp_impl->qname))
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
axis2_disp_free(&(disp_impl->disp), env);
return NULL;
}
@@ -132,10 +132,10 @@
/* initialize ops */
disp_impl->disp.ops = NULL;
- disp_impl->disp.ops = AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_disp_ops_t) );
+ disp_impl->disp.ops = AXIS2_MALLOC( env->allocator, sizeof(axis2_disp_ops_t) );
if (!disp_impl->disp.ops)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
axis2_disp_free(&(disp_impl->disp), env);
return NULL;
}
@@ -152,7 +152,7 @@
axis2_handler_t* AXIS2_CALL
axis2_disp_get_base(struct axis2_disp *disp,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(disp)->base;
@@ -160,7 +160,7 @@
axis2_qname_t* AXIS2_CALL
axis2_disp_get_qname(struct axis2_disp *disp,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(disp)->qname;
@@ -168,7 +168,7 @@
axis2_status_t AXIS2_CALL
axis2_disp_set_qname(struct axis2_disp *disp,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname)
{
axis2_disp_impl_t *disp_impl = NULL;
@@ -195,14 +195,14 @@
axis2_status_t AXIS2_CALL
axis2_disp_invoke(struct axis2_handler *handler,
- axis2_env_t **env,
+ const axis2_env_t *env,
struct axis2_msg_ctx *msg_ctx)
{
axis2_svc_t *axis_service = NULL;
axis2_op_t *op = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, msg_ctx, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
axis_service = AXIS2_MSG_CTX_GET_SVC(msg_ctx, env);
@@ -236,7 +236,7 @@
axis2_status_t AXIS2_CALL
axis2_disp_free (struct axis2_disp * disp,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_disp_impl_t *disp_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -258,11 +258,11 @@
if (disp_impl->disp.ops)
{
- AXIS2_FREE((*env)->allocator, disp_impl->disp.ops);
+ AXIS2_FREE(env->allocator, disp_impl->disp.ops);
disp_impl->disp.ops = NULL;
}
- AXIS2_FREE((*env)->allocator, disp_impl);
+ AXIS2_FREE(env->allocator, disp_impl);
disp_impl = NULL;
return AXIS2_SUCCESS;
@@ -283,7 +283,7 @@
*/
axis2_svc_t* AXIS2_CALL
axis2_disp_find_svc(axis2_msg_ctx_t * msg_ctx,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return NULL;
}
@@ -297,7 +297,7 @@
*/
struct axis2_op* AXIS2_CALL
axis2_disp_find_op(axis2_msg_ctx_t * msg_ctx,
- axis2_env_t **env,
+ const axis2_env_t *env,
struct axis2_svc *svc)
{
return NULL;
Modified: webservices/axis2/trunk/c/modules/core/engine/disp_checker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/disp_checker.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/disp_checker.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/disp_checker.c Wed May 31 08:54:07 2006
@@ -39,28 +39,28 @@
#define AXIS2_INTF_TO_IMPL(disp_checker) ((axis2_disp_checker_impl_t *)disp_checker)
axis2_status_t AXIS2_CALL axis2_disp_checker_invoke (struct axis2_handler * handler,
- axis2_env_t **env,
+ const axis2_env_t *env,
struct axis2_msg_ctx *msg_ctx);
axis2_handler_t* AXIS2_CALL axis2_disp_checker_get_base(struct axis2_disp_checker *disp_checker,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_qname_t* AXIS2_CALL axis2_disp_checker_get_qname(struct axis2_disp_checker *disp_checker,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL axis2_disp_checker_set_qname(struct axis2_disp_checker *disp_checker,
- axis2_env_t **env, axis2_qname_t *qname);
+ const axis2_env_t *env, axis2_qname_t *qname);
axis2_status_t AXIS2_CALL axis2_disp_checker_free (struct axis2_disp_checker * disp_checker,
- axis2_env_t **env);
+ const axis2_env_t *env);
-axis2_disp_checker_t* AXIS2_CALL axis2_disp_checker_create(axis2_env_t **env, axis2_qname_t *qname)
+axis2_disp_checker_t* AXIS2_CALL axis2_disp_checker_create(const axis2_env_t *env, axis2_qname_t *qname)
{
axis2_disp_checker_impl_t *disp_checker_impl = NULL;
axis2_handler_desc_t *handler_desc = NULL;
AXIS2_ENV_CHECK(env, NULL);
- disp_checker_impl = AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_disp_checker_impl_t) );
+ disp_checker_impl = AXIS2_MALLOC( env->allocator, sizeof(axis2_disp_checker_impl_t) );
if (!disp_checker_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;
}
@@ -100,10 +100,10 @@
disp_checker_impl->base->ops->invoke = axis2_disp_checker_invoke;
/* initialize ops */
- disp_checker_impl->disp_checker.ops = AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_disp_checker_ops_t) );
+ disp_checker_impl->disp_checker.ops = AXIS2_MALLOC( env->allocator, sizeof(axis2_disp_checker_ops_t) );
if (!disp_checker_impl->disp_checker.ops)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
axis2_disp_checker_free(&(disp_checker_impl->disp_checker), env);
return NULL;
}
@@ -117,21 +117,21 @@
}
axis2_handler_t* AXIS2_CALL axis2_disp_checker_get_base(struct axis2_disp_checker *disp_checker,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(disp_checker)->base;
}
axis2_qname_t* AXIS2_CALL axis2_disp_checker_get_qname(struct axis2_disp_checker *disp_checker,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(disp_checker)->qname;
}
axis2_status_t AXIS2_CALL axis2_disp_checker_set_qname(struct axis2_disp_checker *disp_checker,
- axis2_env_t **env, axis2_qname_t *qname)
+ const axis2_env_t *env, axis2_qname_t *qname)
{
axis2_disp_checker_impl_t *disp_checker_impl = NULL;
@@ -157,7 +157,7 @@
axis2_status_t AXIS2_CALL
axis2_disp_checker_free(struct axis2_disp_checker * disp_checker,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_disp_checker_impl_t *disp_checker_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -180,11 +180,11 @@
if (disp_checker_impl->disp_checker.ops)
{
- AXIS2_FREE((*env)->allocator, disp_checker_impl->disp_checker.ops);
+ AXIS2_FREE(env->allocator, disp_checker_impl->disp_checker.ops);
disp_checker_impl->disp_checker.ops = NULL;
}
- AXIS2_FREE((*env)->allocator, disp_checker_impl);
+ AXIS2_FREE(env->allocator, disp_checker_impl);
disp_checker_impl = NULL;
return AXIS2_SUCCESS;
@@ -197,7 +197,7 @@
* @param msgctx
* @throws AxisFault
*/
-axis2_status_t AXIS2_CALL axis2_disp_checker_invoke(axis2_handler_t* handler, axis2_env_t **env, axis2_msg_ctx_t *msg_ctx)
+axis2_status_t AXIS2_CALL axis2_disp_checker_invoke(axis2_handler_t* handler, const axis2_env_t *env, axis2_msg_ctx_t *msg_ctx)
{
axis2_op_t *op = NULL;
axis2_op_ctx_t *op_ctx = NULL;
@@ -208,7 +208,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, msg_ctx, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
if (!(AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env))) /*if is client side, no point in proceeding*/
return AXIS2_FAILURE;
@@ -246,14 +246,14 @@
svc = AXIS2_MSG_CTX_GET_SVC(msg_ctx, env);
if (!svc)
{
- AXIS2_LOG_INFO((*env)->log, "Service Not found. Endpoint reference is : %s", (address)?address:"NULL");
+ AXIS2_LOG_INFO(env->log, "Service Not found. Endpoint reference is : %s", (address)?address:"NULL");
return AXIS2_FAILURE;
}
op = AXIS2_MSG_CTX_GET_OP(msg_ctx, env);
if (!op)
{
- AXIS2_LOG_INFO((*env)->log, "Operation Not found. Endpoint reference is : %s", (address)?address:"NULL");
+ AXIS2_LOG_INFO(env->log, "Operation Not found. Endpoint reference is : %s", (address)?address:"NULL");
return AXIS2_FAILURE;
}
return AXIS2_SUCCESS;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org