You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by na...@apache.org on 2006/02/02 05:32:42 UTC
svn commit: r374247 - in /webservices/axis2/trunk/c: include/
modules/core/addr/ modules/core/context/ modules/core/description/
modules/core/engine/ modules/core/phaseresolver/
Author: nandika
Date: Wed Feb 1 20:32:23 2006
New Revision: 374247
URL: http://svn.apache.org/viewcvs?rev=374247&view=rev
Log:
variable declarations were moved to the start of blocks to compile code on windows
Modified:
webservices/axis2/trunk/c/include/axis2_any_content_type.h
webservices/axis2/trunk/c/include/axis2_msg_info_headers.h
webservices/axis2/trunk/c/include/axis2_transport_in_desc.h
webservices/axis2/trunk/c/modules/core/addr/any_content_type.c
webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
webservices/axis2/trunk/c/modules/core/description/module_desc.c
webservices/axis2/trunk/c/modules/core/description/op.c
webservices/axis2/trunk/c/modules/core/description/svc.c
webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c
webservices/axis2/trunk/c/modules/core/engine/addr_disp.c
webservices/axis2/trunk/c/modules/core/engine/engine.c
webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
Modified: webservices/axis2/trunk/c/include/axis2_any_content_type.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_any_content_type.h?rev=374247&r1=374246&r2=374247&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_any_content_type.h (original)
+++ webservices/axis2/trunk/c/include/axis2_any_content_type.h Wed Feb 1 20:32:23 2006
@@ -54,7 +54,11 @@
* @param value value to be added.
* @return AXIS2_SUCCESS on success else AXIS2_FAILURE
*/
- axis2_status_t (AXIS2_CALL *add_value)(struct axis2_any_content_type *any_content_type, axis2_env_t **env, axis2_qname_t *qname, axis2_char_t *value);
+ axis2_status_t (AXIS2_CALL *
+ add_value)(struct axis2_any_content_type *any_content_type,
+ axis2_env_t **env,
+ axis2_qname_t *qname,
+ axis2_char_t *value);
/**
* Gets the value from the content value map.
@@ -98,7 +102,8 @@
* @param env Environment. MUST NOT be NULL.
* @return Pointer to the newly created any_content_type instance. Returns NULL on error.
*/
-AXIS2_DECLARE(axis2_any_content_type_t*) axis2_any_content_type_create(axis2_env_t **env);
+AXIS2_DECLARE(axis2_any_content_type_t*)
+axis2_any_content_type_create(axis2_env_t **env);
/**************************** Start of function macros ************************/
Modified: webservices/axis2/trunk/c/include/axis2_msg_info_headers.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_msg_info_headers.h?rev=374247&r1=374246&r2=374247&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_msg_info_headers.h (original)
+++ webservices/axis2/trunk/c/include/axis2_msg_info_headers.h Wed Feb 1 20:32:23 2006
@@ -177,23 +177,56 @@
axis2_char_t *action);
-#define AXIS2_MSG_INFO_HEADERS_GET_TO(msg_info_headers, env) ((msg_info_headers)->ops->get_to(msg_info_headers, env))
-#define AXIS2_MSG_INFO_HEADERS_SET_TO(msg_info_headers, env, to) ((msg_info_headers)->ops->set_to(msg_info_headers, env, to))
-#define AXIS2_MSG_INFO_HEADERS_GET_FROM(msg_info_headers, env) ((msg_info_headers)->ops->get_from(msg_info_headers, env))
-#define AXIS2_MSG_INFO_HEADERS_SET_FROM(msg_info_headers, env, from) ((msg_info_headers)->ops->set_from(msg_info_headers, env, from))
-#define AXIS2_MSG_INFO_HEADERS_GET_REPLY_TO(msg_info_headers, env) ((msg_info_headers)->ops->get_reply_to(msg_info_headers, env))
-#define AXIS2_MSG_INFO_HEADERS_SET_REPLY_TO(msg_info_headers, env, reply_to) ((msg_info_headers)->ops->set_reply_to(msg_info_headers, env, reply_to))
-#define AXIS2_MSG_INFO_HEADERS_GET_FAULT_TO(msg_info_headers, env) ((msg_info_headers)->ops->get_fault_to(msg_info_headers, env))
-#define AXIS2_MSG_INFO_HEADERS_SET_FAULT_TO(msg_info_headers, env, fault_to) ((msg_info_headers)->ops->set_fault_to(msg_info_headers, env, fault_to))
-#define AXIS2_MSG_INFO_HEADERS_GET_ACTION(msg_info_headers, env) ((msg_info_headers)->ops->get_action(msg_info_headers, env))
-#define AXIS2_MSG_INFO_HEADERS_SET_ACTION(msg_info_headers, env, action) ((msg_info_headers)->ops->set_action(msg_info_headers, env, action))
-#define AXIS2_MSG_INFO_HEADERS_GET_MESSAGE_ID(msg_info_headers, env) ((msg_info_headers)->ops->get_message_id(msg_info_headers, env))
-#define AXIS2_MSG_INFO_HEADERS_SET_MESSAGE_ID(msg_info_headers, env, message_id) ((msg_info_headers)->ops->set_message_id(msg_info_headers, env, message_id))
-#define AXIS2_MSG_INFO_HEADERS_GET_RELATES_TO(msg_info_headers, env) ((msg_info_headers)->ops->get_relates_to(msg_info_headers, env))
-#define AXIS2_MSG_INFO_HEADERS_SET_RELATES_TO(msg_info_headers, env, relates_to) ((msg_info_headers)->ops->set_relates_to(msg_info_headers, env, relates_to))
-#define AXIS2_MSG_INFO_HEADERS_GET_REF_PARAMS(msg_info_headers, env) ((msg_info_headers)->ops->get_ref_params(msg_info_headers, env))
-#define AXIS2_MSG_INFO_HEADERS_ADD_REF_PARAM(msg_info_headers, env, ref_param) ((msg_info_headers)->ops->add_ref_param(msg_info_headers, env, ref_param))
-#define AXIS2_MSG_INFO_HEADERS_FREE(msg_info_headers, env) ((msg_info_headers)->ops->free(msg_info_headers, env))
+#define AXIS2_MSG_INFO_HEADERS_GET_TO(msg_info_headers, env) \
+ ((msg_info_headers)->ops->get_to(msg_info_headers, env))
+
+#define AXIS2_MSG_INFO_HEADERS_SET_TO(msg_info_headers, env, to) \
+ ((msg_info_headers)->ops->set_to(msg_info_headers, env, to))
+
+#define AXIS2_MSG_INFO_HEADERS_GET_FROM(msg_info_headers, env) \
+ ((msg_info_headers)->ops->get_from(msg_info_headers, env))
+
+#define AXIS2_MSG_INFO_HEADERS_SET_FROM(msg_info_headers, env, from) \
+ ((msg_info_headers)->ops->set_from(msg_info_headers, env, from))
+
+#define AXIS2_MSG_INFO_HEADERS_GET_REPLY_TO(msg_info_headers, env) \
+ ((msg_info_headers)->ops->get_reply_to(msg_info_headers, env))
+
+#define AXIS2_MSG_INFO_HEADERS_SET_REPLY_TO(msg_info_headers, env, reply_to) \
+ ((msg_info_headers)->ops->set_reply_to(msg_info_headers, env, reply_to))
+
+#define AXIS2_MSG_INFO_HEADERS_GET_FAULT_TO(msg_info_headers, env) \
+ ((msg_info_headers)->ops->get_fault_to(msg_info_headers, env))
+
+#define AXIS2_MSG_INFO_HEADERS_SET_FAULT_TO(msg_info_headers, env, fault_to) \
+ ((msg_info_headers)->ops->set_fault_to(msg_info_headers, env, fault_to))
+
+#define AXIS2_MSG_INFO_HEADERS_GET_ACTION(msg_info_headers, env) \
+ ((msg_info_headers)->ops->get_action(msg_info_headers, env))
+
+#define AXIS2_MSG_INFO_HEADERS_SET_ACTION(msg_info_headers, env, action) \
+ ((msg_info_headers)->ops->set_action(msg_info_headers, env, action))
+
+#define AXIS2_MSG_INFO_HEADERS_GET_MESSAGE_ID(msg_info_headers, env) \
+ ((msg_info_headers)->ops->get_message_id(msg_info_headers, env))
+
+#define AXIS2_MSG_INFO_HEADERS_SET_MESSAGE_ID(msg_info_headers, env, message_id) \
+ ((msg_info_headers)->ops->set_message_id(msg_info_headers, env, message_id))
+
+#define AXIS2_MSG_INFO_HEADERS_GET_RELATES_TO(msg_info_headers, env) \
+ ((msg_info_headers)->ops->get_relates_to(msg_info_headers, env))
+
+#define AXIS2_MSG_INFO_HEADERS_SET_RELATES_TO(msg_info_headers, env, relates_to) \
+ ((msg_info_headers)->ops->set_relates_to(msg_info_headers, env, relates_to))
+
+#define AXIS2_MSG_INFO_HEADERS_GET_REF_PARAMS(msg_info_headers, env) \
+ ((msg_info_headers)->ops->get_ref_params(msg_info_headers, env))
+
+#define AXIS2_MSG_INFO_HEADERS_ADD_REF_PARAM(msg_info_headers, env, ref_param) \
+ ((msg_info_headers)->ops->add_ref_param(msg_info_headers, env, ref_param))
+
+#define AXIS2_MSG_INFO_HEADERS_FREE(msg_info_headers, env) \
+ ((msg_info_headers)->ops->free(msg_info_headers, env))
/** @} */
Modified: webservices/axis2/trunk/c/include/axis2_transport_in_desc.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_transport_in_desc.h?rev=374247&r1=374246&r2=374247&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_transport_in_desc.h (original)
+++ webservices/axis2/trunk/c/include/axis2_transport_in_desc.h Wed Feb 1 20:32:23 2006
@@ -146,7 +146,8 @@
* @return pointer to newly created phase holder
*/
AXIS2_DECLARE(axis2_transport_in_desc_t *)
-axis2_transport_in_desc_create_with_qname (axis2_env_t **env, axis2_qname_t *qname);
+axis2_transport_in_desc_create_with_qname (axis2_env_t **env,
+ axis2_qname_t *qname);
/*************************** Function macros **********************************/
Modified: webservices/axis2/trunk/c/modules/core/addr/any_content_type.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/addr/any_content_type.c?rev=374247&r1=374246&r2=374247&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/addr/any_content_type.c (original)
+++ webservices/axis2/trunk/c/modules/core/addr/any_content_type.c Wed Feb 1 20:32:23 2006
@@ -25,22 +25,39 @@
} axis2_any_content_type_impl_t;
/** Interface to implementation conversion macro */
-#define AXIS2_INTF_TO_IMPL(any_content_type) ((axis2_any_content_type_impl_t *)any_content_type)
+#define AXIS2_INTF_TO_IMPL(any_content_type) \
+ ((axis2_any_content_type_impl_t *)any_content_type)
-axis2_status_t AXIS2_CALL axis2_any_content_type_add_value(struct axis2_any_content_type *any_content_type, axis2_env_t **env, axis2_qname_t *qname, axis2_char_t *value);
-axis2_char_t* AXIS2_CALL axis2_any_content_type_get_value(struct axis2_any_content_type *any_content_type, axis2_env_t **env, axis2_qname_t *qname);
-axis2_hash_t* AXIS2_CALL axis2_any_content_type_get_value_map(struct axis2_any_content_type *any_content_type, axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_any_content_type_free (struct axis2_any_content_type *any_content_type,
- axis2_env_t **env);
+axis2_status_t AXIS2_CALL
+axis2_any_content_type_add_value(axis2_any_content_type_t *any_content_type,
+ axis2_env_t **env,
+ axis2_qname_t *qname,
+ axis2_char_t *value);
+
+
+axis2_char_t* AXIS2_CALL
+axis2_any_content_type_get_value(axis2_any_content_type_t *any_content_type,
+ axis2_env_t **env,
+ axis2_qname_t *qname);
+
+axis2_hash_t* AXIS2_CALL
+axis2_any_content_type_get_value_map(axis2_any_content_type_t *any_content_type,
+ axis2_env_t **env);
+
+axis2_status_t AXIS2_CALL
+axis2_any_content_type_free (axis2_any_content_type_t *any_content_type,
+ axis2_env_t **env);
-axis2_any_content_type_t* AXIS2_CALL axis2_any_content_type_create(axis2_env_t **env)
+AXIS2_DECLARE(axis2_any_content_type_t*)
+axis2_any_content_type_create(axis2_env_t **env)
{
axis2_any_content_type_impl_t *any_content_type_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- any_content_type_impl = AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_any_content_type_impl_t) );
+ any_content_type_impl = AXIS2_MALLOC((*env)->allocator,
+ sizeof(axis2_any_content_type_impl_t) );
if (!any_content_type_impl)
{
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -60,7 +77,8 @@
}
/* initialize ops */
- any_content_type_impl->any_content_type.ops = AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_any_content_type_ops_t) );
+ any_content_type_impl->any_content_type.ops = AXIS2_MALLOC((*env)->allocator,
+ sizeof(axis2_any_content_type_ops_t) );
if (!any_content_type_impl->any_content_type.ops)
{
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -68,15 +86,23 @@
return NULL;
}
- any_content_type_impl->any_content_type.ops->add_value = axis2_any_content_type_add_value;
- any_content_type_impl->any_content_type.ops->get_value = axis2_any_content_type_get_value;
- any_content_type_impl->any_content_type.ops->get_value_map = axis2_any_content_type_get_value_map;
- any_content_type_impl->any_content_type.ops->free = axis2_any_content_type_free;
+ any_content_type_impl->any_content_type.ops->add_value =
+ axis2_any_content_type_add_value;
+ any_content_type_impl->any_content_type.ops->get_value =
+ axis2_any_content_type_get_value;
+ any_content_type_impl->any_content_type.ops->get_value_map =
+ axis2_any_content_type_get_value_map;
+ any_content_type_impl->any_content_type.ops->free =
+ axis2_any_content_type_free;
return &(any_content_type_impl->any_content_type);
}
-axis2_status_t AXIS2_CALL axis2_any_content_type_add_value(struct axis2_any_content_type *any_content_type, axis2_env_t **env, axis2_qname_t *qname, axis2_char_t *value)
+axis2_status_t AXIS2_CALL
+axis2_any_content_type_add_value(axis2_any_content_type_t *any_content_type,
+ axis2_env_t **env,
+ axis2_qname_t *qname,
+ axis2_char_t *value)
{
axis2_any_content_type_impl_t *any_content_type_impl = NULL;
@@ -86,12 +112,16 @@
if (any_content_type_impl->value_map)
{
- axis2_hash_set(any_content_type_impl->value_map, qname, sizeof(axis2_qname_t), value);
+ axis2_hash_set(any_content_type_impl->value_map, qname,
+ sizeof(axis2_qname_t), value);
}
return AXIS2_SUCCESS;
}
-axis2_char_t* AXIS2_CALL axis2_any_content_type_get_value(struct axis2_any_content_type *any_content_type, axis2_env_t **env, axis2_qname_t *qname)
+axis2_char_t* AXIS2_CALL
+axis2_any_content_type_get_value(axis2_any_content_type_t *any_content_type,
+ axis2_env_t **env,
+ axis2_qname_t *qname)
{
axis2_any_content_type_impl_t *any_content_type_impl = NULL;
@@ -101,19 +131,23 @@
if (any_content_type_impl->value_map)
{
- return axis2_hash_get(any_content_type_impl->value_map, qname, sizeof(axis2_qname_t));
+ return axis2_hash_get(any_content_type_impl->value_map, qname,
+ sizeof(axis2_qname_t));
}
return NULL;
}
-axis2_hash_t* AXIS2_CALL axis2_any_content_type_get_value_map(struct axis2_any_content_type *any_content_type, axis2_env_t **env)
+axis2_hash_t* AXIS2_CALL
+axis2_any_content_type_get_value_map(axis2_any_content_type_t *any_content_type,
+ axis2_env_t **env)
{
AXIS2_FUNC_PARAM_CHECK(any_content_type, env, NULL);
return AXIS2_INTF_TO_IMPL(any_content_type)->value_map;
}
-axis2_status_t AXIS2_CALL axis2_any_content_type_free (struct axis2_any_content_type *any_content_type,
- axis2_env_t **env)
+axis2_status_t AXIS2_CALL
+axis2_any_content_type_free (axis2_any_content_type_t *any_content_type,
+ axis2_env_t **env)
{
axis2_any_content_type_impl_t *any_content_type_impl = NULL;
Modified: webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/context/msg_ctx.c?rev=374247&r1=374246&r2=374247&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/msg_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/msg_ctx.c Wed Feb 1 20:32:23 2006
@@ -101,7 +101,7 @@
/** qname of transport in */
axis2_qname_t *transport_in_desc_qname;
/** qname of transport out */
- axis2_qname_t *transport_out_desc_qname;;
+ axis2_qname_t *transport_out_desc_qname;
/** service group id */
axis2_char_t *svc_grp_id;
/** service description qname */
Modified: webservices/axis2/trunk/c/modules/core/description/module_desc.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/module_desc.c?rev=374247&r1=374246&r2=374247&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/module_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/module_desc.c Wed Feb 1 20:32:23 2006
@@ -239,11 +239,11 @@
axis2_module_desc_t * AXIS2_CALL
axis2_module_desc_create_with_qname (axis2_env_t **env, axis2_qname_t *qname)
{
+ axis2_module_desc_impl_t *module_desc_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK((*env)->error, qname, NULL);
- axis2_module_desc_impl_t *module_desc_impl =
- AXIS2_INTF_TO_IMPL(axis2_module_desc_create(env));
+ module_desc_impl = AXIS2_INTF_TO_IMPL(axis2_module_desc_create(env));
if(NULL == module_desc_impl)
{
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
Modified: webservices/axis2/trunk/c/modules/core/description/op.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/op.c?rev=374247&r1=374246&r2=374247&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/op.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/op.c Wed Feb 1 20:32:23 2006
@@ -334,10 +334,11 @@
{
struct axis2_param_container *param_container_l = NULL;
axis2_array_list_t *array_list_l = NULL;
+ axis2_op_impl_t *op_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- axis2_op_impl_t *op_impl =
- (axis2_op_impl_t *) AXIS2_MALLOC ((*env)->allocator,
+
+ op_impl = (axis2_op_impl_t *) AXIS2_MALLOC ((*env)->allocator,
sizeof (axis2_op_impl_t));
if(NULL == op_impl)
Modified: webservices/axis2/trunk/c/modules/core/description/svc.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/svc.c?rev=374247&r1=374246&r2=374247&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/svc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/svc.c Wed Feb 1 20:32:23 2006
@@ -472,11 +472,11 @@
axis2_svc_create_with_wsdl_svc (axis2_env_t **env,
axis2_wsdl_svc_t *wsdl_svc)
{
+ axis2_svc_impl_t *svc_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK((*env)->error, wsdl_svc, NULL);
- axis2_svc_impl_t *svc_impl =
- AXIS2_INTF_TO_IMPL(axis2_svc_create(env));
+ svc_impl = AXIS2_INTF_TO_IMPL(axis2_svc_create(env));
if(NULL == svc_impl)
{
Modified: webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c?rev=374247&r1=374246&r2=374247&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c Wed Feb 1 20:32:23 2006
@@ -124,7 +124,8 @@
/************************** End of function prototypes ************************/
axis2_transport_in_desc_t * AXIS2_CALL
-axis2_transport_in_desc_create_with_qname (axis2_env_t **env, axis2_qname_t *qname)
+axis2_transport_in_desc_create_with_qname (axis2_env_t **env,
+ axis2_qname_t *qname)
{
axis2_transport_in_desc_impl_t *transport_in_impl = NULL;
Modified: webservices/axis2/trunk/c/modules/core/engine/addr_disp.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/addr_disp.c?rev=374247&r1=374246&r2=374247&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/addr_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/addr_disp.c Wed Feb 1 20:32:23 2006
@@ -74,7 +74,7 @@
Here we have only the dummy implementation to gauard against erros due to
the failure to provide an impl version by mistake.
*/
-
+
/**
* finds the service
*
Modified: webservices/axis2/trunk/c/modules/core/engine/engine.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/engine.c?rev=374247&r1=374246&r2=374247&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/engine.c Wed Feb 1 20:32:23 2006
@@ -141,6 +141,8 @@
axis2_status_t status = AXIS2_SUCCESS;
axis2_op_ctx_t *op_ctx = NULL;
axis2_array_list_t *phases = NULL;
+ axis2_conf_ctx_t *conf_ctx = NULL;
+ axis2_conf_t *conf = NULL;
AXIS2_FUNC_PARAM_CHECK(engine, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, msg_ctx, AXIS2_FAILURE);
@@ -162,8 +164,7 @@
}
}
- axis2_conf_ctx_t *conf_ctx = NULL;
- axis2_conf_t *conf = NULL;
+
/*axis2_array_list_t *global_out_phase = NULL;*/
if (AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env))
@@ -650,11 +651,12 @@
axis2_status_t AXIS2_CALL axis2_engine_invoke_phases(struct axis2_engine *engine, axis2_env_t **env, axis2_array_list_t *phases, axis2_msg_ctx_t *msg_ctx)
{
int i = 0;
+ int count = 0;
AXIS2_FUNC_PARAM_CHECK(engine, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, phases, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, msg_ctx, AXIS2_FAILURE);
- int count = AXIS2_ARRAY_LIST_SIZE(phases, env);
+ count = AXIS2_ARRAY_LIST_SIZE(phases, env);
for (i = 0; (i < count && !(AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env))); i++)
{
axis2_phase_t *phase = (axis2_phase_t *) AXIS2_ARRAY_LIST_GET(phases, env, i);
@@ -666,15 +668,17 @@
axis2_status_t AXIS2_CALL axis2_engine_resume_invocation_phases(struct axis2_engine *engine, axis2_env_t **env, axis2_array_list_t *phases, axis2_msg_ctx_t *msg_ctx)
{
int i = 0;
+ int count = 0;
+ axis2_bool_t found_match = AXIS2_FALSE;
+
AXIS2_FUNC_PARAM_CHECK(engine, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, phases, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, msg_ctx, AXIS2_FAILURE);
AXIS2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_FALSE);
- int count = AXIS2_ARRAY_LIST_SIZE(phases, env);
- axis2_bool_t found_match = AXIS2_FALSE;
-
+ count = AXIS2_ARRAY_LIST_SIZE(phases, env);
+
for (i = 0; i < count && !(AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env)); i++)
{
axis2_phase_t *phase = (axis2_phase_t *) AXIS2_ARRAY_LIST_GET(phases, env, i);
Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c?rev=374247&r1=374246&r2=374247&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c Wed Feb 1 20:32:23 2006
@@ -136,7 +136,7 @@
/************************** End of function prototypes ************************/
-axis2_phase_resolver_t * AXIS2_CALL
+AXIS2_DECLARE(axis2_phase_resolver_t *)
axis2_phase_resolver_create (axis2_env_t **env)
{
axis2_phase_resolver_impl_t *phase_resolver_impl = NULL;
@@ -313,10 +313,12 @@
axis2_env_t **env,
struct axis2_op *op)
{
- AXIS2_FUNC_PARAM_CHECK(phase_resolver, env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, op, AXIS2_FAILURE);
int i = 0;
axis2_status_t status = AXIS2_FAILURE;
+ AXIS2_FUNC_PARAM_CHECK(phase_resolver, env, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK((*env)->error, op, AXIS2_FAILURE);
+
+
for (i = 1; i < 5; i++)
{
status = axis2_phase_resolver_build_execution_chains(phase_resolver, env,
@@ -797,14 +799,14 @@
{
struct axis2_phase_holder *phase_holder = NULL;
int hndlr_count = 0;
-
+ int j = 0;
hndlr_count = AXIS2_FLOW_GET_HANDLER_COUNT(flow, env);
if(AXIS2_TRUE != AXIS2_ERROR_GET_STATUS_CODE((*env)->error))
{
return AXIS2_FAILURE;
}
handlers = axis2_array_list_create(env, 20);
- int j = 0;
+
for (j = 0; j < hndlr_count; j++)
{
struct axis2_handler_desc *metadata = NULL;
@@ -949,6 +951,7 @@
for (index_i = axis2_hash_first (ops, env); index_i; index_i = axis2_hash_next (env, index_i))
{
void *v = NULL;
+ int j = 0;
struct axis2_op *op_desc = NULL;
axis2_array_list_t *modules = NULL;
struct axis2_flow *flow = NULL;
@@ -956,7 +959,7 @@
axis2_hash_this (index_i, NULL, NULL, &v);
op_desc = (struct axis2_op *) v;
modules = AXIS2_OP_GET_MODULES(op_desc, env);
- int j = 0;
+
for(j = 0; j < AXIS2_ARRAY_LIST_SIZE(modules, env); j++)
{
struct axis2_module_desc *module_desc_l = NULL;