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 [31/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/wsdl/wsdl_op.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/wsdl/wsdl_op.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_op.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_op.c Wed May 31 08:54:07 2006
@@ -68,108 +68,108 @@
axis2_status_t AXIS2_CALL
axis2_wsdl_op_free (axis2_wsdl_op_t *wsdl_op,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_wsdl_op_set_msg_exchange_pattern (axis2_wsdl_op_t *wsdl_op,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *msg_exchange_pattern);
axis2_char_t * AXIS2_CALL
axis2_wsdl_op_get_msg_exchange_pattern (axis2_wsdl_op_t *wsdl_op,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_wsdl_op_set_qname (axis2_wsdl_op_t *wsdl_op,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *name);
axis2_qname_t * AXIS2_CALL
axis2_wsdl_op_get_qname (void *wsdl_op,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_wsdl_op_set_style (axis2_wsdl_op_t *wsdl_op,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *style);
axis2_char_t * AXIS2_CALL
axis2_wsdl_op_get_style (axis2_wsdl_op_t *wsdl_op,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_linked_list_t * AXIS2_CALL
axis2_wsdl_op_get_in_faults(axis2_wsdl_op_t *wsdl_op,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_wsdl_op_set_in_faults(axis2_wsdl_op_t *wsdl_op,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_linked_list_t *in_faults);
axis2_wsdl_msg_ref_t *AXIS2_CALL
axis2_wsdl_op_get_input_msg(axis2_wsdl_op_t *wsdl_op,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_wsdl_op_set_input_msg(axis2_wsdl_op_t *wsdl_op,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_wsdl_msg_ref_t *input_msg);
axis2_linked_list_t *AXIS2_CALL
axis2_wsdl_op_get_out_faults(axis2_wsdl_op_t *wsdl_op,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_wsdl_op_set_out_faults(axis2_wsdl_op_t *wsdl_op,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_linked_list_t *out_faults);
axis2_wsdl_msg_ref_t *AXIS2_CALL
axis2_wsdl_op_get_output_msg(axis2_wsdl_op_t *wsdl_op,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_wsdl_op_set_output_msg(axis2_wsdl_op_t *wsdl_op,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_wsdl_msg_ref_t *output_msg);
axis2_bool_t AXIS2_CALL
axis2_wsdl_op_is_safe(axis2_wsdl_op_t *wsdl_op,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_wsdl_op_set_safety(axis2_wsdl_op_t *wsdl_op,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_bool_t safe);
axis2_char_t *AXIS2_CALL
axis2_wsdl_op_get_target_namespace(axis2_wsdl_op_t *wsdl_op,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_wsdl_op_add_in_fault(axis2_wsdl_op_t *wsdl_op,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_wsdl_fault_ref_t *in_fault);
axis2_status_t AXIS2_CALL
axis2_wsdl_op_add_out_fault(axis2_wsdl_op_t *wsdl_op,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_wsdl_fault_ref_t *out_fault);
/***************************** End of function headers ************************/
axis2_wsdl_op_t * AXIS2_CALL
-axis2_wsdl_op_create (axis2_env_t **env)
+axis2_wsdl_op_create (const axis2_env_t *env)
{
axis2_wsdl_op_impl_t *wsdl_op_impl = NULL;
- wsdl_op_impl = (axis2_wsdl_op_impl_t *) AXIS2_MALLOC ((*env)->
+ wsdl_op_impl = (axis2_wsdl_op_impl_t *) AXIS2_MALLOC (env->
allocator, sizeof(axis2_wsdl_op_impl_t));
if(!wsdl_op_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;
}
@@ -189,14 +189,14 @@
if(NULL == wsdl_op_impl->in_faults)
{
axis2_wsdl_op_free(&(wsdl_op_impl->wsdl_op), 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;
}
wsdl_op_impl->out_faults = axis2_linked_list_create(env);
if(NULL == wsdl_op_impl->out_faults)
{
axis2_wsdl_op_free(&(wsdl_op_impl->wsdl_op), 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;
}
@@ -204,17 +204,17 @@
if(NULL == wsdl_op_impl->wsdl_op.extensible_component)
{
axis2_wsdl_op_free(&(wsdl_op_impl->wsdl_op), 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;
}
wsdl_op_impl->wsdl_op.ops = (axis2_wsdl_op_ops_t *)
- AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_wsdl_op_ops_t));
+ AXIS2_MALLOC (env->allocator, sizeof(axis2_wsdl_op_ops_t));
if(NULL == wsdl_op_impl->wsdl_op.ops)
{
axis2_wsdl_op_free(&(wsdl_op_impl->wsdl_op), 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;
}
@@ -252,7 +252,7 @@
axis2_status_t AXIS2_CALL
axis2_wsdl_op_free (axis2_wsdl_op_t *wsdl_op,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_wsdl_op_impl_t *wsdl_op_impl = NULL;
@@ -320,25 +320,25 @@
if(wsdl_op_impl->msg_exchange_pattern)
{
- AXIS2_FREE((*env)->allocator, wsdl_op_impl->msg_exchange_pattern);
+ AXIS2_FREE(env->allocator, wsdl_op_impl->msg_exchange_pattern);
wsdl_op_impl->msg_exchange_pattern = NULL;
}
if(NULL != wsdl_op_impl->style)
{
- AXIS2_FREE((*env)->allocator, wsdl_op_impl->style);
+ AXIS2_FREE(env->allocator, wsdl_op_impl->style);
wsdl_op_impl->style = NULL;
}
if(NULL != wsdl_op->ops)
{
- AXIS2_FREE((*env)->allocator, wsdl_op->ops);
+ AXIS2_FREE(env->allocator, wsdl_op->ops);
wsdl_op->ops = NULL;
}
if(wsdl_op_impl)
{
- AXIS2_FREE((*env)->allocator, wsdl_op_impl);
+ AXIS2_FREE(env->allocator, wsdl_op_impl);
wsdl_op_impl = NULL;
}
@@ -347,7 +347,7 @@
axis2_status_t AXIS2_CALL
axis2_wsdl_op_free_void_arg(void *wsdl_op,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_wsdl_op_t *wsdl_op_l = NULL;
@@ -359,26 +359,26 @@
axis2_status_t AXIS2_CALL
axis2_wsdl_op_set_msg_exchange_pattern (axis2_wsdl_op_t *wsdl_op,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *msg_exchange_pattern)
{
axis2_wsdl_op_impl_t *wsdl_op_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, msg_exchange_pattern, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, msg_exchange_pattern, AXIS2_FAILURE);
wsdl_op_impl = AXIS2_INTF_TO_IMPL(wsdl_op);
if(wsdl_op_impl->msg_exchange_pattern)
{
- AXIS2_FREE((*env)->allocator, wsdl_op_impl->msg_exchange_pattern);
+ AXIS2_FREE(env->allocator, wsdl_op_impl->msg_exchange_pattern);
wsdl_op_impl->msg_exchange_pattern = NULL;
}
wsdl_op_impl->msg_exchange_pattern = AXIS2_STRDUP(msg_exchange_pattern, env);
if(NULL == wsdl_op_impl->msg_exchange_pattern)
{
- 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;
}
@@ -387,7 +387,7 @@
axis2_char_t * AXIS2_CALL
axis2_wsdl_op_get_msg_exchange_pattern (axis2_wsdl_op_t *wsdl_op,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -396,13 +396,13 @@
axis2_status_t AXIS2_CALL
axis2_wsdl_op_set_qname (axis2_wsdl_op_t *wsdl_op,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *name)
{
axis2_wsdl_op_impl_t *wsdl_op_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, name, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, name, AXIS2_FAILURE);
wsdl_op_impl = AXIS2_INTF_TO_IMPL(wsdl_op);
@@ -422,7 +422,7 @@
axis2_qname_t * AXIS2_CALL
axis2_wsdl_op_get_qname (void *wsdl_op,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_wsdl_op_impl_t *op_impl = NULL;
axis2_wsdl_op_t *wsdl_op_l = NULL;
@@ -436,25 +436,25 @@
axis2_status_t AXIS2_CALL
axis2_wsdl_op_set_style (axis2_wsdl_op_t *wsdl_op,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *style)
{
axis2_wsdl_op_impl_t *wsdl_op_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, style, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, style, AXIS2_FAILURE);
wsdl_op_impl = AXIS2_INTF_TO_IMPL(wsdl_op);
if(wsdl_op_impl->style)
{
- AXIS2_FREE((*env)->allocator, wsdl_op_impl->style);
+ AXIS2_FREE(env->allocator, wsdl_op_impl->style);
wsdl_op_impl->style = NULL;
}
wsdl_op_impl->style = AXIS2_STRDUP(style, env);
if(!wsdl_op_impl->style)
{
- 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;
}
@@ -463,7 +463,7 @@
axis2_char_t * AXIS2_CALL
axis2_wsdl_op_get_style (axis2_wsdl_op_t *wsdl_op,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -472,20 +472,20 @@
axis2_linked_list_t * AXIS2_CALL
axis2_wsdl_op_get_in_faults(axis2_wsdl_op_t *wsdl_op,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(wsdl_op)->in_faults;
}
axis2_status_t AXIS2_CALL
axis2_wsdl_op_set_in_faults(axis2_wsdl_op_t *wsdl_op,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_linked_list_t *in_faults)
{
axis2_wsdl_op_impl_t *wsdl_op_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, in_faults, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, in_faults, AXIS2_FAILURE);
wsdl_op_impl = AXIS2_INTF_TO_IMPL(wsdl_op);
@@ -513,20 +513,20 @@
axis2_wsdl_msg_ref_t *AXIS2_CALL
axis2_wsdl_op_get_input_msg(axis2_wsdl_op_t *wsdl_op,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(wsdl_op)->input_msg;
}
axis2_status_t AXIS2_CALL
axis2_wsdl_op_set_input_msg(axis2_wsdl_op_t *wsdl_op,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_wsdl_msg_ref_t *input_msg)
{
axis2_wsdl_op_impl_t *wsdl_op_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, env, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, env, AXIS2_FAILURE);
wsdl_op_impl = AXIS2_INTF_TO_IMPL(wsdl_op);
@@ -542,7 +542,7 @@
axis2_linked_list_t *AXIS2_CALL
axis2_wsdl_op_get_out_faults(axis2_wsdl_op_t *wsdl_op,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -551,13 +551,13 @@
axis2_status_t AXIS2_CALL
axis2_wsdl_op_set_out_faults(axis2_wsdl_op_t *wsdl_op,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_linked_list_t *out_faults)
{
axis2_wsdl_op_impl_t *wsdl_op_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, out_faults, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, out_faults, AXIS2_FAILURE);
wsdl_op_impl = AXIS2_INTF_TO_IMPL(wsdl_op);
@@ -585,20 +585,20 @@
axis2_wsdl_msg_ref_t *AXIS2_CALL
axis2_wsdl_op_get_output_msg(axis2_wsdl_op_t *wsdl_op,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(wsdl_op)->output_msg;
}
axis2_status_t AXIS2_CALL
axis2_wsdl_op_set_output_msg(axis2_wsdl_op_t *wsdl_op,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_wsdl_msg_ref_t *output_msg)
{
axis2_wsdl_op_impl_t *wsdl_op_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, output_msg, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, output_msg, AXIS2_FAILURE);
wsdl_op_impl = AXIS2_INTF_TO_IMPL(wsdl_op);
@@ -613,14 +613,14 @@
axis2_bool_t AXIS2_CALL
axis2_wsdl_op_is_safe(axis2_wsdl_op_t *wsdl_op,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(wsdl_op)->safety;
}
axis2_status_t AXIS2_CALL
axis2_wsdl_op_set_safety(axis2_wsdl_op_t *wsdl_op,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_bool_t safe)
{
AXIS2_INTF_TO_IMPL(wsdl_op)->safety = safe;
@@ -629,7 +629,7 @@
axis2_char_t *AXIS2_CALL
axis2_wsdl_op_get_target_namespace(axis2_wsdl_op_t *wsdl_op,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
return AXIS2_QNAME_GET_URI(AXIS2_INTF_TO_IMPL(wsdl_op)->name, env);
@@ -638,22 +638,22 @@
axis2_status_t AXIS2_CALL
axis2_wsdl_op_add_in_fault(axis2_wsdl_op_t *wsdl_op,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_wsdl_fault_ref_t *in_fault)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, in_fault, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, in_fault, AXIS2_FAILURE);
return AXIS2_LINKED_LIST_ADD(AXIS2_INTF_TO_IMPL(wsdl_op)->in_faults, env, in_fault);
}
axis2_status_t AXIS2_CALL
axis2_wsdl_op_add_out_fault(axis2_wsdl_op_t *wsdl_op,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_wsdl_fault_ref_t *out_fault)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, out_fault, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, out_fault, AXIS2_FAILURE);
return AXIS2_LINKED_LIST_ADD(AXIS2_INTF_TO_IMPL(wsdl_op)->out_faults, env, out_fault);
}
Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_property.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/wsdl/wsdl_property.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_property.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_property.c Wed May 31 08:54:07 2006
@@ -36,50 +36,50 @@
axis2_status_t AXIS2_CALL
axis2_wsdl_property_free (axis2_wsdl_property_t *wsdl_property,
- axis2_env_t **env);
+ const axis2_env_t *env);
void * AXIS2_CALL
axis2_wsdl_property_get_constraint(axis2_wsdl_property_t *wsdl_property,
- axis2_env_t **env) ;
+ const axis2_env_t *env) ;
axis2_status_t AXIS2_CALL
axis2_wsdl_property_set_constraint(axis2_wsdl_property_t *wsdl_property,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *constraint);
axis2_char_t *AXIS2_CALL
axis2_wsdl_property_get_name(axis2_wsdl_property_t *wsdl_property,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_wsdl_property_set_name(axis2_wsdl_property_t *wsdl_property,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *name);
void *AXIS2_CALL
axis2_wsdl_property_get_value(axis2_wsdl_property_t *wsdl_property,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_wsdl_property_set_value(axis2_wsdl_property_t *wsdl_property,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *value);
/************************** End of function prototypes ************************/
axis2_wsdl_property_t * AXIS2_CALL
-axis2_wsdl_property_create (axis2_env_t **env)
+axis2_wsdl_property_create (const axis2_env_t *env)
{
axis2_wsdl_property_impl_t *wsdl_property_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- wsdl_property_impl = (axis2_wsdl_property_impl_t *) AXIS2_MALLOC((*env)->
+ wsdl_property_impl = (axis2_wsdl_property_impl_t *) AXIS2_MALLOC(env->
allocator, sizeof(axis2_wsdl_property_impl_t));
if(NULL == wsdl_property_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;
}
@@ -92,16 +92,16 @@
if(NULL == wsdl_property_impl->wsdl_property.wsdl_component)
{
axis2_wsdl_property_free(&(wsdl_property_impl->wsdl_property), 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;
}
- wsdl_property_impl->wsdl_property.ops = AXIS2_MALLOC ((*env)->allocator,
+ wsdl_property_impl->wsdl_property.ops = AXIS2_MALLOC (env->allocator,
sizeof(axis2_wsdl_property_ops_t));
if(NULL == wsdl_property_impl->wsdl_property.ops)
{
axis2_wsdl_property_free(&(wsdl_property_impl->wsdl_property), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -126,19 +126,19 @@
axis2_status_t AXIS2_CALL
axis2_wsdl_property_free (axis2_wsdl_property_t *wsdl_property,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_wsdl_property_impl_t *property_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if(NULL != wsdl_property->ops)
- AXIS2_FREE((*env)->allocator, wsdl_property->ops);
+ AXIS2_FREE(env->allocator, wsdl_property->ops);
property_impl = AXIS2_INTF_TO_IMPL(wsdl_property);
if(NULL != property_impl->name)
{
- AXIS2_FREE((*env)->allocator, property_impl->name);
+ AXIS2_FREE(env->allocator, property_impl->name);
property_impl->name = NULL;
}
@@ -152,14 +152,14 @@
wsdl_property->wsdl_component = NULL;
}
- AXIS2_FREE((*env)->allocator, property_impl);
+ AXIS2_FREE(env->allocator, property_impl);
return AXIS2_SUCCESS;
}
void * AXIS2_CALL
axis2_wsdl_property_get_constraint(axis2_wsdl_property_t *wsdl_property,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(wsdl_property)->constraint;
@@ -167,11 +167,11 @@
axis2_status_t AXIS2_CALL
axis2_wsdl_property_set_constraint(axis2_wsdl_property_t *wsdl_property,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *constraint)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, constraint, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, constraint, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(wsdl_property)->constraint = constraint;
return AXIS2_SUCCESS;
@@ -179,7 +179,7 @@
axis2_char_t *AXIS2_CALL
axis2_wsdl_property_get_name(axis2_wsdl_property_t *wsdl_property,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(wsdl_property)->name;
@@ -187,19 +187,19 @@
axis2_status_t AXIS2_CALL
axis2_wsdl_property_set_name(axis2_wsdl_property_t *wsdl_property,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *name)
{
axis2_wsdl_property_impl_t *property_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, name, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, name, AXIS2_FAILURE);
property_impl = AXIS2_INTF_TO_IMPL(wsdl_property);
if(property_impl->name)
{
- AXIS2_FREE((*env)->allocator, property_impl->name);
+ AXIS2_FREE(env->allocator, property_impl->name);
property_impl->name = NULL;
}
property_impl->name = name;
@@ -208,7 +208,7 @@
void *AXIS2_CALL
axis2_wsdl_property_get_value(axis2_wsdl_property_t *wsdl_property,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(wsdl_property)->value;
@@ -216,13 +216,13 @@
axis2_status_t AXIS2_CALL
axis2_wsdl_property_set_value(axis2_wsdl_property_t *wsdl_property,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *value)
{
axis2_wsdl_property_impl_t *property_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, value, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, value, AXIS2_FAILURE);
property_impl = AXIS2_INTF_TO_IMPL(wsdl_property);
Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_soap_op.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/wsdl/wsdl_soap_op.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_soap_op.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_soap_op.c Wed May 31 08:54:07 2006
@@ -35,41 +35,41 @@
axis2_status_t AXIS2_CALL
axis2_wsdl_soap_op_free (axis2_wsdl_soap_op_t *soap_op,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_char_t *AXIS2_CALL
axis2_wsdl_soap_op_get_style(axis2_wsdl_soap_op_t *soap_op,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_wsdl_soap_op_set_style(axis2_wsdl_soap_op_t *soap_op,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *style);
axis2_char_t * AXIS2_CALL
axis2_wsdl_soap_op_get_soap_action(axis2_wsdl_soap_op_t *soap_op,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_wsdl_soap_op_set_soap_action(axis2_wsdl_soap_op_t *soap_op,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *soap_action);
/************************** End of function prototypes ************************/
AXIS2_DECLARE(axis2_wsdl_soap_op_t *)
-axis2_wsdl_soap_op_create (axis2_env_t **env)
+axis2_wsdl_soap_op_create (const axis2_env_t *env)
{
axis2_wsdl_soap_op_impl_t *soap_op_impl = NULL;
axis2_qname_t *type_l = NULL;
AXIS2_ENV_CHECK(env, NULL);
soap_op_impl = (axis2_wsdl_soap_op_impl_t *)
- AXIS2_MALLOC((*env)->allocator, sizeof(axis2_wsdl_soap_op_impl_t));
+ AXIS2_MALLOC(env->allocator, sizeof(axis2_wsdl_soap_op_impl_t));
if(NULL == soap_op_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;
}
@@ -84,12 +84,12 @@
extensible_element, env, type_l);
soap_op_impl->soap_op.ops =
- AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_wsdl_soap_op_ops_t));
+ AXIS2_MALLOC (env->allocator, sizeof(axis2_wsdl_soap_op_ops_t));
if(NULL == soap_op_impl->soap_op.ops)
{
axis2_wsdl_soap_op_free(&(soap_op_impl->
soap_op), 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;
}
@@ -109,12 +109,12 @@
}
axis2_wsdl_soap_op_t * AXIS2_CALL
-axis2_wsdl_soap_op_create_with_type (axis2_env_t **env, axis2_qname_t *type)
+axis2_wsdl_soap_op_create_with_type (const axis2_env_t *env, axis2_qname_t *type)
{
axis2_wsdl_soap_op_t *soap_op = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, type, NULL);
+ AXIS2_PARAM_CHECK(env->error, type, NULL);
soap_op = axis2_wsdl_soap_op_create(env);
@@ -133,7 +133,7 @@
axis2_status_t AXIS2_CALL
axis2_wsdl_soap_op_free (
axis2_wsdl_soap_op_t *soap_op,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_wsdl_soap_op_impl_t *soap_op_impl = NULL;
@@ -143,24 +143,24 @@
if(NULL != soap_op->ops)
{
- AXIS2_FREE((*env)->allocator, soap_op->ops);
+ AXIS2_FREE(env->allocator, soap_op->ops);
soap_op->ops = NULL;
}
if(NULL != soap_op_impl->style)
{
- AXIS2_FREE((*env)->allocator, soap_op_impl->style);
+ AXIS2_FREE(env->allocator, soap_op_impl->style);
soap_op_impl->style = NULL;
}
if(NULL != soap_op_impl->soap_action)
{
- AXIS2_FREE((*env)->allocator, soap_op_impl->soap_action);
+ AXIS2_FREE(env->allocator, soap_op_impl->soap_action);
soap_op_impl->soap_action = NULL;
}
if(soap_op_impl)
- AXIS2_FREE((*env)->allocator, soap_op_impl);
+ AXIS2_FREE(env->allocator, soap_op_impl);
soap_op_impl = NULL;
return AXIS2_SUCCESS;
@@ -168,7 +168,7 @@
axis2_char_t *AXIS2_CALL
axis2_wsdl_soap_op_get_style(axis2_wsdl_soap_op_t *soap_op,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -177,18 +177,18 @@
axis2_status_t AXIS2_CALL
axis2_wsdl_soap_op_set_style(axis2_wsdl_soap_op_t *soap_op,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *style)
{
axis2_wsdl_soap_op_impl_t *soap_op_impl = AXIS2_INTF_TO_IMPL(
soap_op);
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, style, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, style, AXIS2_FAILURE);
if(soap_op_impl->style)
{
- AXIS2_FREE((*env)->allocator, style);
+ AXIS2_FREE(env->allocator, style);
soap_op_impl->style = NULL;
}
@@ -198,7 +198,7 @@
axis2_char_t * AXIS2_CALL
axis2_wsdl_soap_op_get_soap_action(axis2_wsdl_soap_op_t *soap_op,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -207,18 +207,18 @@
axis2_status_t AXIS2_CALL
axis2_wsdl_soap_op_set_soap_action(axis2_wsdl_soap_op_t *soap_op,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *soap_action)
{
axis2_wsdl_soap_op_impl_t *soap_op_impl = AXIS2_INTF_TO_IMPL(
soap_op);
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, soap_action, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, soap_action, AXIS2_FAILURE);
if(soap_op_impl->soap_action)
{
- AXIS2_FREE((*env)->allocator, soap_action);
+ AXIS2_FREE(env->allocator, soap_action);
soap_op_impl->soap_action = NULL;
}
Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_svc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/wsdl/wsdl_svc.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_svc.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_svc.c Wed May 31 08:54:07 2006
@@ -46,63 +46,63 @@
axis2_status_t AXIS2_CALL
axis2_wsdl_svc_free(axis2_wsdl_svc_t *wsdl_svc,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_qname_t * AXIS2_CALL
axis2_wsdl_svc_get_qname(axis2_wsdl_svc_t *wsdl_svc,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_wsdl_svc_set_qname(axis2_wsdl_svc_t *wsdl_svc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname);
axis2_hash_t *AXIS2_CALL
axis2_wsdl_svc_get_endpoints(axis2_wsdl_svc_t *wsdl_svc,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_wsdl_svc_set_endpoints(axis2_wsdl_svc_t *wsdl_svc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_hash_t *endpoints);
axis2_status_t AXIS2_CALL
axis2_wsdl_svc_set_endpoint(axis2_wsdl_svc_t *wsdl_svc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_wsdl_endpoint_t *endpoint);
axis2_wsdl_endpoint_t * AXIS2_CALL
axis2_wsdl_svc_get_endpoint(axis2_wsdl_svc_t *wsdl_svc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname);
axis2_char_t *AXIS2_CALL
axis2_wsdl_svc_get_namespace(axis2_wsdl_svc_t *wsdl_svc,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_wsdl_interface_t * AXIS2_CALL
axis2_wsdl_svc_get_svc_interface(axis2_wsdl_svc_t *wsdl_svc,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_wsdl_svc_set_svc_interface(axis2_wsdl_svc_t *wsdl_svc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_wsdl_interface_t *svc_interface);
/***************************** End of function headers ************************/
axis2_wsdl_svc_t *AXIS2_CALL
-axis2_wsdl_svc_create (axis2_env_t **env)
+axis2_wsdl_svc_create (const axis2_env_t *env)
{
axis2_wsdl_svc_impl_t *wsdl_svc_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- wsdl_svc_impl = (axis2_wsdl_svc_impl_t *) AXIS2_MALLOC ((*env)->allocator,
+ wsdl_svc_impl = (axis2_wsdl_svc_impl_t *) AXIS2_MALLOC (env->allocator,
sizeof(axis2_wsdl_svc_impl_t));
if(NULL == wsdl_svc_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;
}
@@ -116,7 +116,7 @@
if(NULL == wsdl_svc_impl->wsdl_svc.wsdl_component)
{
axis2_wsdl_svc_free(&(wsdl_svc_impl->wsdl_svc), 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;
}
@@ -124,17 +124,17 @@
if(NULL == wsdl_svc_impl->endpoints)
{
axis2_wsdl_svc_free(&(wsdl_svc_impl->wsdl_svc), 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;
}
- wsdl_svc_impl->wsdl_svc.ops = (axis2_wsdl_svc_ops_t *) AXIS2_MALLOC ((*env)->
+ wsdl_svc_impl->wsdl_svc.ops = (axis2_wsdl_svc_ops_t *) AXIS2_MALLOC (env->
allocator, sizeof(axis2_wsdl_svc_ops_t));
if(NULL == wsdl_svc_impl->wsdl_svc.ops)
{
axis2_wsdl_svc_free(&(wsdl_svc_impl->wsdl_svc), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -156,7 +156,7 @@
axis2_status_t AXIS2_CALL
axis2_wsdl_svc_free (axis2_wsdl_svc_t *wsdl_svc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_wsdl_svc_impl_t *wsdl_svc_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -204,12 +204,12 @@
if(wsdl_svc->ops)
{
- AXIS2_FREE((*env)->allocator, wsdl_svc->ops);
+ AXIS2_FREE(env->allocator, wsdl_svc->ops);
wsdl_svc->ops = NULL;
}
if(wsdl_svc_impl)
- AXIS2_FREE((*env)->allocator, wsdl_svc_impl);
+ AXIS2_FREE(env->allocator, wsdl_svc_impl);
wsdl_svc_impl = NULL;
return AXIS2_SUCCESS;
@@ -217,7 +217,7 @@
axis2_qname_t * AXIS2_CALL
axis2_wsdl_svc_get_qname(axis2_wsdl_svc_t *wsdl_svc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(wsdl_svc)->qname;
@@ -225,12 +225,12 @@
axis2_status_t AXIS2_CALL
axis2_wsdl_svc_set_qname(axis2_wsdl_svc_t *wsdl_svc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname)
{
axis2_wsdl_svc_impl_t *wsdl_svc_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, qname, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, qname, AXIS2_FAILURE);
wsdl_svc_impl = AXIS2_INTF_TO_IMPL(wsdl_svc);
if(wsdl_svc_impl->qname)
@@ -248,7 +248,7 @@
axis2_hash_t *AXIS2_CALL
axis2_wsdl_svc_get_endpoints(axis2_wsdl_svc_t *wsdl_svc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(wsdl_svc)->endpoints;
@@ -256,18 +256,18 @@
axis2_status_t AXIS2_CALL
axis2_wsdl_svc_set_endpoints(axis2_wsdl_svc_t *wsdl_svc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_hash_t *endpoints)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, endpoints, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, endpoints, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(wsdl_svc)->endpoints = endpoints;
return AXIS2_SUCCESS;
}
axis2_status_t AXIS2_CALL
axis2_wsdl_svc_set_endpoint(axis2_wsdl_svc_t *wsdl_svc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_wsdl_endpoint_t *endpoint)
{
axis2_wsdl_svc_impl_t *wsdl_svc_impl = NULL;
@@ -275,7 +275,7 @@
axis2_char_t *endpoint_name = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, endpoint, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, endpoint, AXIS2_FAILURE);
wsdl_svc_impl = AXIS2_INTF_TO_IMPL(wsdl_svc);
endpoint_qname = AXIS2_WSDL_ENDPOINT_GET_NAME(endpoint, env);
@@ -288,14 +288,14 @@
axis2_wsdl_endpoint_t * AXIS2_CALL
axis2_wsdl_svc_get_endpoint(axis2_wsdl_svc_t *wsdl_svc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname)
{
axis2_wsdl_svc_impl_t *wsdl_svc_impl = NULL;
axis2_char_t *name = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, qname, NULL);
+ AXIS2_PARAM_CHECK(env->error, qname, NULL);
wsdl_svc_impl = AXIS2_INTF_TO_IMPL(wsdl_svc);
name = AXIS2_QNAME_TO_STRING(qname, env);
@@ -305,14 +305,14 @@
axis2_char_t *AXIS2_CALL
axis2_wsdl_svc_get_namespace(axis2_wsdl_svc_t *wsdl_svc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
if (NULL == AXIS2_INTF_TO_IMPL(wsdl_svc)->qname)
{
/* Target Namespace not set and the Service Name is null */
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_STATE_WSDL_SVC,
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_STATE_WSDL_SVC,
AXIS2_FAILURE);
return NULL;
}
@@ -322,7 +322,7 @@
axis2_wsdl_interface_t * AXIS2_CALL
axis2_wsdl_svc_get_svc_interface(axis2_wsdl_svc_t *wsdl_svc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(wsdl_svc)->svc_interface;
@@ -330,11 +330,11 @@
axis2_status_t AXIS2_CALL
axis2_wsdl_svc_set_svc_interface(axis2_wsdl_svc_t *wsdl_svc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_wsdl_interface_t *svc_interface)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, svc_interface, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, svc_interface, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(wsdl_svc)->svc_interface = svc_interface;
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_types.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/wsdl/wsdl_types.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_types.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_types.c Wed May 31 08:54:07 2006
@@ -34,7 +34,7 @@
axis2_status_t AXIS2_CALL
axis2_wsdl_types_free (axis2_wsdl_types_t *wsdl_types,
- axis2_env_t **env);
+ const axis2_env_t *env);
/**
* Adds the <code>ExtensionElement</code> to the map keyed with the
@@ -44,7 +44,7 @@
*/
axis2_status_t AXIS2_CALL
axis2_wsdl_types_add_element(axis2_wsdl_types_t *wsdl_types,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_wsdl_extensible_element_t *element);
@@ -57,24 +57,24 @@
*/
axis2_wsdl_extensible_element_t *AXIS2_CALL
axis2_wsdl_types_get_first_element(axis2_wsdl_types_t *wsdl_types,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname);
/************************* End of function headers ****************************/
axis2_wsdl_types_t * AXIS2_CALL
-axis2_wsdl_types_create (axis2_env_t **env)
+axis2_wsdl_types_create (const axis2_env_t *env)
{
axis2_wsdl_types_impl_t *wsdl_types_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- wsdl_types_impl = (axis2_wsdl_types_impl_t *) AXIS2_MALLOC ((*env)->
+ wsdl_types_impl = (axis2_wsdl_types_impl_t *) AXIS2_MALLOC (env->
allocator, sizeof (axis2_wsdl_types_impl_t));
if(NULL == wsdl_types_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;
}
@@ -86,16 +86,16 @@
if(NULL == wsdl_types_impl->wsdl_types.ext_component)
{
axis2_wsdl_types_free(&(wsdl_types_impl->wsdl_types), 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;
}
- wsdl_types_impl->wsdl_types.ops = AXIS2_MALLOC((*env)->allocator,
+ wsdl_types_impl->wsdl_types.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_wsdl_types_ops_t));
if(NULL == wsdl_types_impl->wsdl_types.ops)
{
axis2_wsdl_types_free(&(wsdl_types_impl->wsdl_types), 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;
}
@@ -111,7 +111,7 @@
axis2_status_t AXIS2_CALL
axis2_wsdl_types_free (
axis2_wsdl_types_t *wsdl_types,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_wsdl_types_impl_t *wsdl_types_impl = NULL;
@@ -120,7 +120,7 @@
if(wsdl_types->ops)
{
- AXIS2_FREE((*env)->allocator, wsdl_types->ops);
+ AXIS2_FREE(env->allocator, wsdl_types->ops);
wsdl_types->ops = NULL;
}
@@ -131,7 +131,7 @@
}
if(wsdl_types_impl)
- AXIS2_FREE((*env)->allocator, wsdl_types_impl);
+ AXIS2_FREE(env->allocator, wsdl_types_impl);
wsdl_types_impl = NULL;
return AXIS2_SUCCESS;
@@ -146,11 +146,11 @@
*/
axis2_status_t AXIS2_CALL
axis2_wsdl_types_add_element(axis2_wsdl_types_t *wsdl_types,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_wsdl_extensible_element_t *element)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, element, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, element, AXIS2_FAILURE);
return AXIS2_WSDL_COMPONENT_ADD_EXTENSIBILITY_ELEMENT(wsdl_types->
ext_component->wsdl_component, env, element);
@@ -165,7 +165,7 @@
*/
axis2_wsdl_extensible_element_t *AXIS2_CALL
axis2_wsdl_types_get_first_element(axis2_wsdl_types_t *wsdl_types,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *qname)
{
axis2_linked_list_t *ext_elements = NULL;
@@ -173,7 +173,7 @@
int size = 0;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, qname, NULL);
+ AXIS2_PARAM_CHECK(env->error, qname, NULL);
ext_elements = AXIS2_WSDL_COMPONENT_GET_EXTENSIBILITY_ELEMENTS(wsdl_types->
ext_component->wsdl_component, env);
Modified: webservices/axis2/trunk/c/samples/client/echo/echo.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/echo/echo.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/client/echo/echo.c (original)
+++ webservices/axis2/trunk/c/samples/client/echo/echo.c Wed May 31 08:54:07 2006
@@ -21,12 +21,12 @@
#include <axis2_client.h>
axis2_om_node_t *
-build_om_payload_for_echo_svc(axis2_env_t **env);
+build_om_payload_for_echo_svc(const axis2_env_t *env);
int main(int argc, char** argv)
{
- axis2_env_t *env = NULL;
+ const axis2_env_t *env = NULL;
axis2_char_t *address = NULL;
axis2_endpoint_ref_t* endpoint_ref = NULL;
axis2_options_t *options = NULL;
@@ -51,12 +51,12 @@
printf ("Using endpoint : %s\n", address);
/* Create EPR with given address */
- endpoint_ref = axis2_endpoint_ref_create(&env, address);
+ endpoint_ref = axis2_endpoint_ref_create(env, address);
/* Setup options */
- options = axis2_options_create(&env);
- AXIS2_OPTIONS_SET_TO(options, &env, endpoint_ref);
- AXIS2_OPTIONS_SET_ACTION(options, &env,
+ options = axis2_options_create(env);
+ AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
+ AXIS2_OPTIONS_SET_ACTION(options, env,
"http://ws.apache.org/axis2/c/samples/echoString");
/* Set up deploy folder. It is from the deploy folder, the configuration is picked up
@@ -71,7 +71,7 @@
client_home = "../../deploy";
/* Create service client */
- svc_client = axis2_svc_client_create(&env, client_home);
+ svc_client = axis2_svc_client_create(env, client_home);
if (!svc_client)
{
printf("Error creating service client\n");
@@ -81,21 +81,21 @@
}
/* Set service client options */
- AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, &env, options);
+ AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, env, options);
/* Engage addressing module */
- AXIS2_SVC_CLIENT_ENGAGE_MODULE(svc_client, &env, AXIS2_MODULE_ADDRESSING);
+ AXIS2_SVC_CLIENT_ENGAGE_MODULE(svc_client, env, AXIS2_MODULE_ADDRESSING);
/* Build the SOAP request message payload using OM API.*/
- payload = build_om_payload_for_echo_svc(&env);
+ payload = build_om_payload_for_echo_svc(env);
/* Send request */
- ret_node = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, &env, payload);
+ ret_node = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, env, payload);
if(ret_node)
{
axis2_char_t *om_str = NULL;
- om_str = AXIS2_OM_NODE_TO_STRING(ret_node, &env);
+ om_str = AXIS2_OM_NODE_TO_STRING(ret_node, env);
if (om_str)
printf("\nReceived OM : %s\n", om_str);
printf("\necho client invoke SUCCESSFUL!\n");
@@ -110,12 +110,12 @@
if (svc_client)
{
- AXIS2_SVC_CLIENT_FREE(svc_client, &env);
+ AXIS2_SVC_CLIENT_FREE(svc_client, env);
svc_client = NULL;
}
if (endpoint_ref)
{
- AXIS2_ENDPOINT_REF_FREE(endpoint_ref, &env);
+ AXIS2_ENDPOINT_REF_FREE(endpoint_ref, env);
endpoint_ref = NULL;
}
return 0;
@@ -123,7 +123,7 @@
/* build SOAP request message content using OM */
axis2_om_node_t *
-build_om_payload_for_echo_svc(axis2_env_t **env)
+build_om_payload_for_echo_svc(const axis2_env_t *env)
{
axis2_om_node_t *echo_om_node = NULL;
axis2_om_element_t* echo_om_ele = NULL;
Modified: webservices/axis2/trunk/c/samples/client/google/google_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/google/google_client.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/client/google/google_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/google/google_client.c Wed May 31 08:54:07 2006
@@ -21,14 +21,14 @@
#include <axis2_client.h>
axis2_om_node_t *
-build_soap_body_content(axis2_env_t **env, axis2_char_t *operation, axis2_char_t *google_key,
+build_soap_body_content(const axis2_env_t *env, axis2_char_t *operation, axis2_char_t *google_key,
axis2_char_t *word_to_spell);
-void print_invalid_om(axis2_env_t **env, axis2_om_node_t *ret_node);
+void print_invalid_om(const axis2_env_t *env, axis2_om_node_t *ret_node);
int main(int argc, char** argv)
{
- axis2_env_t *env = NULL;
+ const axis2_env_t *env = NULL;
axis2_char_t *address = NULL;
axis2_endpoint_ref_t* endpoint_ref = NULL;
axis2_options_t *options = NULL;
@@ -70,12 +70,12 @@
printf ("\nInvoking operation %s with params %s and %s\n", operation, google_key, word_to_spell);
/* Create EPR with given address */
- endpoint_ref = axis2_endpoint_ref_create(&env, address);
+ endpoint_ref = axis2_endpoint_ref_create(env, address);
/* Setup options */
- options = axis2_options_create(&env);
- AXIS2_OPTIONS_SET_TO(options, &env, endpoint_ref);
- AXIS2_OPTIONS_SET_SOAP_VERSION(options, &env, AXIS2_SOAP11);
+ options = axis2_options_create(env);
+ AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
+ AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIS2_SOAP11);
/* Set up deploy folder.*/
client_home = AXIS2_GETENV("AXIS2C_HOME");
@@ -83,7 +83,7 @@
client_home = "../../deploy";
/* Create service client */
- svc_client = axis2_svc_client_create(&env, client_home);
+ svc_client = axis2_svc_client_create(env, client_home);
if (!svc_client)
{
printf("Error creating service client\n");
@@ -93,42 +93,42 @@
}
/* Set service client options */
- AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, &env, options);
+ AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, env, options);
/* Build the SOAP request message payload using OM API.*/
- payload = build_soap_body_content(&env, operation, google_key, word_to_spell);
+ payload = build_soap_body_content(env, operation, google_key, word_to_spell);
/* Send request */
- ret_node = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, &env, payload);
+ ret_node = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, env, payload);
if(ret_node)
{
- if (AXIS2_OM_NODE_GET_NODE_TYPE(ret_node, &env) == AXIS2_OM_ELEMENT)
+ if (AXIS2_OM_NODE_GET_NODE_TYPE(ret_node, env) == AXIS2_OM_ELEMENT)
{
axis2_char_t *result = NULL;
axis2_om_element_t *result_ele = NULL;
axis2_om_node_t *ret_node1 = NULL;
- result_ele = (axis2_om_element_t*)AXIS2_OM_NODE_GET_DATA_ELEMENT(ret_node, &env);
- if (AXIS2_STRCMP(AXIS2_OM_ELEMENT_GET_LOCALNAME(result_ele, &env), "doSpellingSuggestionResponse") != 0 )
+ result_ele = (axis2_om_element_t*)AXIS2_OM_NODE_GET_DATA_ELEMENT(ret_node, env);
+ if (AXIS2_STRCMP(AXIS2_OM_ELEMENT_GET_LOCALNAME(result_ele, env), "doSpellingSuggestionResponse") != 0 )
{
- print_invalid_om(&env, ret_node);
+ print_invalid_om(env, ret_node);
return AXIS2_FAILURE;
}
- ret_node1 = AXIS2_OM_NODE_GET_FIRST_CHILD(ret_node, &env); /*return*/
+ ret_node1 = AXIS2_OM_NODE_GET_FIRST_CHILD(ret_node, env); /*return*/
if (!ret_node1)
{
- print_invalid_om(&env, ret_node);
+ print_invalid_om(env, ret_node);
return AXIS2_FAILURE;
}
- result_ele = (axis2_om_element_t*)AXIS2_OM_NODE_GET_DATA_ELEMENT(ret_node1, &env);
- result = AXIS2_OM_ELEMENT_GET_TEXT(result_ele, &env, ret_node1);
+ result_ele = (axis2_om_element_t*)AXIS2_OM_NODE_GET_DATA_ELEMENT(ret_node1, env);
+ result = AXIS2_OM_ELEMENT_GET_TEXT(result_ele, env, ret_node1);
printf( "\nResult = %s\n", result);
}
else
{
- print_invalid_om(&env, ret_node);
+ print_invalid_om(env, ret_node);
return AXIS2_FAILURE;
}
}
@@ -142,7 +142,7 @@
if (svc_client)
{
- AXIS2_SVC_CLIENT_FREE(svc_client, &env);
+ AXIS2_SVC_CLIENT_FREE(svc_client, env);
svc_client = NULL;
}
@@ -150,7 +150,7 @@
}
axis2_om_node_t *
-build_soap_body_content(axis2_env_t **env, axis2_char_t *operation, axis2_char_t *google_key,
+build_soap_body_content(const axis2_env_t *env, axis2_char_t *operation, axis2_char_t *google_key,
axis2_char_t *word_to_spell)
{
axis2_om_node_t *google_om_node = NULL;
@@ -188,7 +188,7 @@
return google_om_node;
}
-void print_invalid_om(axis2_env_t **env, axis2_om_node_t *ret_node)
+void print_invalid_om(const axis2_env_t *env, axis2_om_node_t *ret_node)
{
axis2_char_t *buffer = NULL;
buffer = AXIS2_OM_NODE_TO_STRING(ret_node, env);
Modified: webservices/axis2/trunk/c/samples/client/math/axis2_math_stub.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/math/axis2_math_stub.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/client/math/axis2_math_stub.c (original)
+++ webservices/axis2/trunk/c/samples/client/math/axis2_math_stub.c Wed May 31 08:54:07 2006
@@ -18,7 +18,7 @@
axis2_stub_t *
-axis2_math_stub_create_with_endpoint_ref_and_client_home(axis2_env_t **env,
+axis2_math_stub_create_with_endpoint_ref_and_client_home(const axis2_env_t *env,
axis2_endpoint_ref_t *endpoint_ref,
axis2_char_t *client_home)
{
@@ -31,14 +31,14 @@
client_home);
if(NULL == stub)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
axis2_populate_axis_service( stub, env);
return stub;
}
-void axis2_populate_axis_service( axis2_stub_t* stub, axis2_env_t** env)
+void axis2_populate_axis_service( axis2_stub_t* stub, const axis2_env_t *env)
{
axis2_svc_client_t* svc_client = NULL;
axis2_qname_t *svc_qname = NULL;
@@ -74,7 +74,7 @@
}
axis2_stub_t *
-axis2_math_stub_create_with_endpoint_uri_and_client_home(axis2_env_t **env,
+axis2_math_stub_create_with_endpoint_uri_and_client_home(const axis2_env_t *env,
axis2_char_t *endpoint_uri,
axis2_char_t *client_home)
{
@@ -87,7 +87,7 @@
client_home);
if(NULL == stub)
{
- 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 @@
axis2_om_node_t *
axis2_math_stub_add(axis2_stub_t *stub,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *node)
{
axis2_svc_client_t *svc_client = NULL;
@@ -118,7 +118,7 @@
axis2_om_node_t *
axis2_math_stub_sub(axis2_stub_t *stub,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *node)
{
axis2_svc_client_t *svc_client = NULL;
@@ -136,7 +136,7 @@
axis2_om_node_t *
axis2_math_stub_mul(axis2_stub_t *stub,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *node)
{
axis2_svc_client_t *svc_client = NULL;
@@ -154,7 +154,7 @@
axis2_om_node_t *
axis2_math_stub_div(axis2_stub_t *stub,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *node)
{
axis2_svc_client_t *svc_client = NULL;
Modified: webservices/axis2/trunk/c/samples/client/math/axis2_math_stub.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/math/axis2_math_stub.h?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/client/math/axis2_math_stub.h (original)
+++ webservices/axis2/trunk/c/samples/client/math/axis2_math_stub.h Wed May 31 08:54:07 2006
@@ -31,27 +31,27 @@
axis2_om_node_t *
axis2_math_stub_add(axis2_stub_t *stub,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *node);
axis2_om_node_t *
axis2_math_stub_sub(axis2_stub_t *stub,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *node);
axis2_om_node_t *
axis2_math_stub_mul(axis2_stub_t *stub,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *node);
axis2_om_node_t *
axis2_math_stub_div(axis2_stub_t *stub,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *node);
/**
* populate services
*/
-void axis2_populate_axis_service( axis2_stub_t* stub, axis2_env_t** env);
+void axis2_populate_axis_service( axis2_stub_t* stub, const axis2_env_t *env);
/**
* Creates axis2_stub struct
@@ -59,7 +59,7 @@
* @return pointer to newly created axis2_stub struct
*/
axis2_stub_t *
-axis2_math_stub_create_with_endpoint_ref_and_client_home(axis2_env_t **env,
+axis2_math_stub_create_with_endpoint_ref_and_client_home(const axis2_env_t *env,
axis2_endpoint_ref_t *endpoint_ref,
axis2_char_t *client_home);
@@ -69,7 +69,7 @@
* @return pointer to newly created axis2_stub struct
*/
axis2_stub_t *
-axis2_math_stub_create_with_endpoint_uri_and_client_home(axis2_env_t **env,
+axis2_math_stub_create_with_endpoint_uri_and_client_home(const axis2_env_t *env,
axis2_char_t *endpoint_uri,
axis2_char_t *client_home);
/** @} */
Modified: webservices/axis2/trunk/c/samples/client/math/math_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/math/math_client.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/client/math/math_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/math/math_client.c Wed May 31 08:54:07 2006
@@ -22,14 +22,14 @@
#include <axis2_client.h>
axis2_om_node_t *
-build_om_programatically(axis2_env_t **env, axis2_char_t *operation, axis2_char_t *param1, axis2_char_t *param2);
+build_om_programatically(const axis2_env_t *env, axis2_char_t *operation, axis2_char_t *param1, axis2_char_t *param2);
int main(int argc, char** argv)
{
axis2_stub_t *stub = NULL;
axis2_om_node_t *node = NULL;
axis2_status_t status = AXIS2_FAILURE;
- axis2_env_t *env = NULL;
+ const axis2_env_t *env = NULL;
axis2_char_t *address = NULL;
axis2_char_t *client_home = NULL;
axis2_om_node_t *ret_node = NULL;
@@ -68,19 +68,19 @@
printf ("Using endpoint : %s\n", address);
printf ("\nInvoking operation %s with params %s and %s\n", operation, param1, param2);
- node = build_om_programatically(&env, operation, param1, param2);
+ node = build_om_programatically(env, operation, param1, param2);
stub =
- axis2_math_stub_create_with_endpoint_uri_and_client_home(&env, address, client_home);
+ axis2_math_stub_create_with_endpoint_uri_and_client_home(env, address, client_home);
/* create node and invoke math */
- ret_node = axis2_math_stub_add(stub, &env, node);
+ ret_node = axis2_math_stub_add(stub, env, node);
if(ret_node)
{
- if (AXIS2_OM_NODE_GET_NODE_TYPE(ret_node, &env) == AXIS2_OM_ELEMENT)
+ if (AXIS2_OM_NODE_GET_NODE_TYPE(ret_node, env) == AXIS2_OM_ELEMENT)
{
axis2_char_t *result = NULL;
- axis2_om_element_t *result_ele = (axis2_om_element_t*)AXIS2_OM_NODE_GET_DATA_ELEMENT(ret_node, &env);
+ axis2_om_element_t *result_ele = (axis2_om_element_t*)AXIS2_OM_NODE_GET_DATA_ELEMENT(ret_node, env);
- result = AXIS2_OM_ELEMENT_GET_TEXT(result_ele, &env, ret_node);
+ result = AXIS2_OM_ELEMENT_GET_TEXT(result_ele, env, ret_node);
printf( "\nResult = %s\n", result);
}
else
@@ -88,12 +88,12 @@
axis2_xml_writer_t *writer = NULL;
axis2_om_output_t *om_output = NULL;
axis2_char_t *buffer = NULL;
- writer = axis2_xml_writer_create_for_memory(&env, NULL, AXIS2_TRUE, 0,
+ writer = axis2_xml_writer_create_for_memory(env, NULL, AXIS2_TRUE, 0,
AXIS2_XML_PARSER_TYPE_BUFFER);
- om_output = axis2_om_output_create (&env, writer);
+ om_output = axis2_om_output_create (env, writer);
- AXIS2_OM_NODE_SERIALIZE (ret_node, &env, om_output);
- buffer = (axis2_char_t*)AXIS2_XML_WRITER_GET_XML(writer, &env);
+ AXIS2_OM_NODE_SERIALIZE (ret_node, env, om_output);
+ buffer = (axis2_char_t*)AXIS2_XML_WRITER_GET_XML(writer, env);
printf ("\nReceived invalid OM as result : %s\n", buffer);
if(NULL != buffer)
{
@@ -102,7 +102,7 @@
}
if(NULL != om_output)
{
- AXIS2_OM_OUTPUT_FREE(om_output, &env);
+ AXIS2_OM_OUTPUT_FREE(om_output, env);
om_output = NULL;
}
}
@@ -117,13 +117,13 @@
if (stub)
{
- AXIS2_STUB_FREE(stub, &env);
+ AXIS2_STUB_FREE(stub, env);
}
return status;
}
axis2_om_node_t *
-build_om_programatically(axis2_env_t **env, axis2_char_t *operation, axis2_char_t *param1, axis2_char_t *param2)
+build_om_programatically(const axis2_env_t *env, axis2_char_t *operation, axis2_char_t *param1, axis2_char_t *param2)
{
axis2_om_node_t *math_om_node = NULL;
axis2_om_element_t* math_om_ele = NULL;
@@ -152,10 +152,10 @@
AXIS2_OM_NODE_SERIALIZE(math_om_node, env, om_output);
buffer = (axis2_char_t*)AXIS2_XML_WRITER_GET_XML(xml_writer, env);
- AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI, "\nSending OM node in XML : %s \n", buffer);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "\nSending OM node in XML : %s \n", buffer);
if(NULL != buffer)
{
- AXIS2_FREE((*env)->allocator, buffer);
+ AXIS2_FREE(env->allocator, buffer);
buffer = NULL;
}
if(NULL != om_output)
Modified: webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c Wed May 31 08:54:07 2006
@@ -21,11 +21,11 @@
#include <axis2_client.h>
axis2_om_node_t *
-build_om_programatically(axis2_env_t **env, axis2_char_t *image_name, axis2_char_t *to_save_name);
+build_om_programatically(const axis2_env_t *env, axis2_char_t *image_name, axis2_char_t *to_save_name);
int main(int argc, char** argv)
{
- axis2_env_t *env = NULL;
+ const axis2_env_t *env = NULL;
axis2_char_t *address = NULL;
axis2_endpoint_ref_t* endpoint_ref = NULL;
axis2_options_t *options = NULL;
@@ -58,13 +58,13 @@
printf ("Using endpoint : %s\n", address);
/* Create EPR with given address */
- endpoint_ref = axis2_endpoint_ref_create(&env, address);
+ endpoint_ref = axis2_endpoint_ref_create(env, address);
/* Setup options */
- options = axis2_options_create(&env);
- AXIS2_OPTIONS_SET_TO(options, &env, endpoint_ref);
- AXIS2_OPTIONS_SET_SOAP_VERSION(options, &env, AXIS2_SOAP11);
- AXIS2_OPTIONS_SET_ENABLE_MTOM(options, &env, AXIS2_TRUE);
+ options = axis2_options_create(env);
+ AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
+ AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIS2_SOAP11);
+ AXIS2_OPTIONS_SET_ENABLE_MTOM(options, env, AXIS2_TRUE);
/* Set up deploy folder. It is from the deploy folder, the configuration is picked up
* using the axis2.xml file.
@@ -78,7 +78,7 @@
client_home = "../../deploy";
/* Create service client */
- svc_client = axis2_svc_client_create(&env, client_home);
+ svc_client = axis2_svc_client_create(env, client_home);
if (!svc_client)
{
printf("Error creating service client\n");
@@ -88,21 +88,21 @@
}
/* Set service client options */
- AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, &env, options);
+ AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, env, options);
/* Engage addressing module */
- AXIS2_SVC_CLIENT_ENGAGE_MODULE(svc_client, &env, AXIS2_MODULE_ADDRESSING);
+ AXIS2_SVC_CLIENT_ENGAGE_MODULE(svc_client, env, AXIS2_MODULE_ADDRESSING);
/* Build the SOAP request message payload using OM API.*/
- payload = build_om_programatically(&env, image_name, to_save_name);
+ payload = build_om_programatically(env, image_name, to_save_name);
/* Send request */
- ret_node = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, &env, payload);
+ ret_node = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, env, payload);
if(ret_node)
{
axis2_char_t *om_str = NULL;
- om_str = AXIS2_OM_NODE_TO_STRING(ret_node, &env);
+ om_str = AXIS2_OM_NODE_TO_STRING(ret_node, env);
if (om_str)
printf("\nReceived OM : %s\n", om_str);
printf("\nmtom client invoke SUCCESSFUL!\n");
@@ -117,12 +117,12 @@
if (svc_client)
{
- AXIS2_SVC_CLIENT_FREE(svc_client, &env);
+ AXIS2_SVC_CLIENT_FREE(svc_client, env);
svc_client = NULL;
}
if (endpoint_ref)
{
- AXIS2_ENDPOINT_REF_FREE(endpoint_ref, &env);
+ AXIS2_ENDPOINT_REF_FREE(endpoint_ref, env);
endpoint_ref = NULL;
}
@@ -132,7 +132,7 @@
/* build SOAP request message content using OM */
axis2_om_node_t *
-build_om_programatically(axis2_env_t **env, axis2_char_t *image_name, axis2_char_t *to_save_name)
+build_om_programatically(const axis2_env_t *env, axis2_char_t *image_name, axis2_char_t *to_save_name)
{
axis2_om_node_t *mtom_om_node = NULL;
axis2_om_element_t* mtom_om_ele = NULL;
Modified: webservices/axis2/trunk/c/samples/client/notify/notify_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/notify/notify_client.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/client/notify/notify_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/notify/notify_client.c Wed May 31 08:54:07 2006
@@ -21,11 +21,11 @@
#include <axis2_client.h>
axis2_om_node_t *
-build_om_programatically(axis2_env_t **env);
+build_om_programatically(const axis2_env_t *env);
int main(int argc, char** argv)
{
- axis2_env_t *env = NULL;
+ const axis2_env_t *env = NULL;
axis2_char_t *address = NULL;
axis2_endpoint_ref_t* endpoint_ref = NULL;
axis2_options_t *options = NULL;
@@ -50,12 +50,12 @@
printf ("Using endpoint : %s\n", address);
/* Create EPR with given address */
- endpoint_ref = axis2_endpoint_ref_create(&env, address);
+ endpoint_ref = axis2_endpoint_ref_create(env, address);
/* Setup options */
- options = axis2_options_create(&env);
- AXIS2_OPTIONS_SET_TO(options, &env, endpoint_ref);
- AXIS2_OPTIONS_SET_ACTION(options, &env,
+ options = axis2_options_create(env);
+ AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
+ AXIS2_OPTIONS_SET_ACTION(options, env,
"http://example.org/action/notify");
/* Set up deploy folder. It is from the deploy folder, the configuration is picked up
@@ -70,7 +70,7 @@
client_home = "../../deploy";
/* Create service client */
- svc_client = axis2_svc_client_create(&env, client_home);
+ svc_client = axis2_svc_client_create(env, client_home);
if (!svc_client)
{
printf("Error creating service client\n");
@@ -80,16 +80,16 @@
}
/* Set service client options */
- AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, &env, options);
+ AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, env, options);
/* Engage addressing module */
- AXIS2_SVC_CLIENT_ENGAGE_MODULE(svc_client, &env, AXIS2_MODULE_ADDRESSING);
+ AXIS2_SVC_CLIENT_ENGAGE_MODULE(svc_client, env, AXIS2_MODULE_ADDRESSING);
/* Build the SOAP request message payload using OM API.*/
- payload = build_om_programatically(&env);
+ payload = build_om_programatically(env);
/* Send request */
- status = AXIS2_SVC_CLIENT_SEND_ROBUST(svc_client, &env, payload);
+ status = AXIS2_SVC_CLIENT_SEND_ROBUST(svc_client, env, payload);
if(status == AXIS2_SUCCESS)
{
@@ -105,12 +105,12 @@
if (svc_client)
{
- AXIS2_SVC_CLIENT_FREE(svc_client, &env);
+ AXIS2_SVC_CLIENT_FREE(svc_client, env);
svc_client = NULL;
}
if (endpoint_ref)
{
- AXIS2_ENDPOINT_REF_FREE(endpoint_ref, &env);
+ AXIS2_ENDPOINT_REF_FREE(endpoint_ref, env);
endpoint_ref = NULL;
}
return 0;
@@ -118,7 +118,7 @@
/* build SOAP request message content using OM */
axis2_om_node_t *
-build_om_programatically(axis2_env_t **env)
+build_om_programatically(const axis2_env_t *env)
{
axis2_om_node_t *notify_om_node = NULL;
axis2_om_element_t* notify_om_ele = NULL;
Modified: webservices/axis2/trunk/c/samples/server/echo/echo.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/echo/echo.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/echo/echo.c (original)
+++ webservices/axis2/trunk/c/samples/server/echo/echo.c Wed May 31 08:54:07 2006
@@ -18,10 +18,10 @@
#include <stdio.h>
axis2_om_node_t *
-build_om_programatically(axis2_env_t **env, axis2_char_t *text);
+build_om_programatically(const axis2_env_t *env, axis2_char_t *text);
axis2_om_node_t *
-axis2_echo_echo (axis2_env_t **env, axis2_om_node_t *node)
+axis2_echo_echo (const axis2_env_t *env, axis2_om_node_t *node)
{
axis2_om_node_t *text_parent_node = NULL;
axis2_om_node_t *text_node = NULL;
@@ -36,7 +36,7 @@
*/
if (!node) /* 'echoString' node */
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INPUT_OM_NODE_NULL, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INPUT_OM_NODE_NULL, AXIS2_FAILURE);
printf("Echo client ERROR: input parameter NULL\n");
return NULL;
}
@@ -58,7 +58,7 @@
text_parent_node = AXIS2_OM_NODE_GET_FIRST_CHILD(node, env);
if (!text_parent_node) /* 'text' node */
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Echo client ERROR: invalid XML in request\n");
return NULL;
}
@@ -66,7 +66,7 @@
text_node = AXIS2_OM_NODE_GET_FIRST_CHILD(text_parent_node, env);
if (!text_node) /* actual text to echo */
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Echo client ERROR: invalid XML in request\n");
return NULL;
}
@@ -83,7 +83,7 @@
}
else
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
printf("Echo client ERROR: invalid XML in request\n");
return NULL;
}
@@ -93,7 +93,7 @@
/* Builds the response content */
axis2_om_node_t *
-build_om_programatically(axis2_env_t **env, axis2_char_t *text)
+build_om_programatically(const axis2_env_t *env, axis2_char_t *text)
{
axis2_om_node_t *echo_om_node = NULL;
axis2_om_element_t* echo_om_ele = NULL;
Modified: webservices/axis2/trunk/c/samples/server/echo/echo.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/echo/echo.h?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/echo/echo.h (original)
+++ webservices/axis2/trunk/c/samples/server/echo/echo.h Wed May 31 08:54:07 2006
@@ -24,6 +24,6 @@
#include <axis2_om_node.h>
#include <axis2_om_element.h>
-axis2_om_node_t *axis2_echo_echo(axis2_env_t **env, axis2_om_node_t *node);
+axis2_om_node_t *axis2_echo_echo(const axis2_env_t *env, axis2_om_node_t *node);
#endif /* CALC_H*/
Modified: webservices/axis2/trunk/c/samples/server/echo/echo_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/echo/echo_skeleton.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/echo/echo_skeleton.c (original)
+++ webservices/axis2/trunk/c/samples/server/echo/echo_skeleton.c Wed May 31 08:54:07 2006
@@ -19,41 +19,41 @@
int AXIS2_CALL
echo_free(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
echo_free_void_arg(void *svc_skeleton,
- axis2_env_t **env);
+ const axis2_env_t *env);
/*
* This method invokes the right service method
*/
axis2_om_node_t* AXIS2_CALL
echo_invoke(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *node,
axis2_msg_ctx_t *msg_ctx);
int AXIS2_CALL
echo_init(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_om_node_t* AXIS2_CALL
echo_on_fault(axis2_svc_skeleton_t *svc_skeli,
- axis2_env_t **env, axis2_om_node_t *node);
+ const axis2_env_t *env, axis2_om_node_t *node);
/*Create function */
axis2_svc_skeleton_t *
-axis2_echo_create(axis2_env_t **env)
+axis2_echo_create(const axis2_env_t *env)
{
axis2_svc_skeleton_t *svc_skeleton = NULL;
/* Allocate memory for the structs */
- svc_skeleton = AXIS2_MALLOC((*env)->allocator,
+ svc_skeleton = AXIS2_MALLOC(env->allocator,
sizeof(axis2_svc_skeleton_t));
svc_skeleton->ops = AXIS2_MALLOC(
- (*env)->allocator, sizeof(axis2_svc_skeleton_ops_t));
+ env->allocator, sizeof(axis2_svc_skeleton_ops_t));
svc_skeleton->func_array = NULL;
/* Assign function pointers */
@@ -68,7 +68,7 @@
/* Initialize the service */
int AXIS2_CALL
echo_init(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
svc_skeleton->func_array = axis2_array_list_create(env, 0);
/* Add the implemented operation names of the service to
@@ -84,7 +84,7 @@
*/
axis2_om_node_t* AXIS2_CALL
echo_invoke(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *node,
axis2_msg_ctx_t *msg_ctx)
{
@@ -100,7 +100,7 @@
/* On fault, handle the fault */
axis2_om_node_t* AXIS2_CALL
echo_on_fault(axis2_svc_skeleton_t *svc_skeli,
- axis2_env_t **env, axis2_om_node_t *node)
+ const axis2_env_t *env, axis2_om_node_t *node)
{
/* Here we are just setting a simple error message inside an element
* called 'EchoServiceError'
@@ -118,7 +118,7 @@
/* Free the resources used */
int AXIS2_CALL
echo_free(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
/* Free the function array */
if(svc_skeleton->func_array)
@@ -130,14 +130,14 @@
/* Free the function array */
if(svc_skeleton->ops)
{
- AXIS2_FREE((*env)->allocator, svc_skeleton->ops);
+ AXIS2_FREE(env->allocator, svc_skeleton->ops);
svc_skeleton->ops = NULL;
}
/* Free the service skeleton */
if(svc_skeleton)
{
- AXIS2_FREE((*env)->allocator, svc_skeleton);
+ AXIS2_FREE(env->allocator, svc_skeleton);
svc_skeleton = NULL;
}
@@ -150,7 +150,7 @@
*/
AXIS2_EXPORT int
axis2_get_instance(axis2_svc_skeleton_t **inst,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
*inst = axis2_echo_create(env);
if(!(*inst))
@@ -163,7 +163,7 @@
AXIS2_EXPORT int
axis2_remove_instance(axis2_svc_skeleton_t *inst,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_status_t status = AXIS2_FAILURE;
if (inst)
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org