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/06 03:42:01 UTC
svn commit: r375163 [1/2] - in /webservices/axis2/trunk/c: include/
modules/core/context/ modules/core/deployment/ modules/core/description/
modules/core/engine/ modules/core/phaseresolver/ modules/core/receivers/
modules/core/transport/http/ modules/c...
Author: nandika
Date: Sun Feb 5 18:41:57 2006
New Revision: 375163
URL: http://svn.apache.org/viewcvs?rev=375163&view=rev
Log:
modified for compiling on vc7
Modified:
webservices/axis2/trunk/c/include/axis2_class_loader.h
webservices/axis2/trunk/c/include/axis2_conf.h
webservices/axis2/trunk/c/include/axis2_engine.h
webservices/axis2/trunk/c/include/axis2_op_ctx.h
webservices/axis2/trunk/c/include/axis2_svc.h
webservices/axis2/trunk/c/include/axis2_svc_grp.h
webservices/axis2/trunk/c/include/axis2_svc_grp_ctx.h
webservices/axis2/trunk/c/modules/core/context/conf_ctx.c
webservices/axis2/trunk/c/modules/core/context/ctx.c
webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
webservices/axis2/trunk/c/modules/core/context/op_ctx.c
webservices/axis2/trunk/c/modules/core/context/svc_ctx.c
webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c
webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c
webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c
webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
webservices/axis2/trunk/c/modules/core/deployment/conf_init.c
webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
webservices/axis2/trunk/c/modules/core/deployment/phases_info.c
webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c
webservices/axis2/trunk/c/modules/core/description/dll_desc.c
webservices/axis2/trunk/c/modules/core/description/flow.c
webservices/axis2/trunk/c/modules/core/description/flow_container.c
webservices/axis2/trunk/c/modules/core/description/handler_desc.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/param.c
webservices/axis2/trunk/c/modules/core/description/param_container.c
webservices/axis2/trunk/c/modules/core/description/phase_rule.c
webservices/axis2/trunk/c/modules/core/description/svc.c
webservices/axis2/trunk/c/modules/core/description/svc_grp.c
webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c
webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c
webservices/axis2/trunk/c/modules/core/engine/engine.c
webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c
webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c
webservices/axis2/trunk/c/modules/core/transport/http/http_header.c
webservices/axis2/trunk/c/modules/core/transport/http/http_out_transport_info.c
webservices/axis2/trunk/c/modules/core/transport/http/http_request_line.c
webservices/axis2/trunk/c/modules/core/transport/http/http_simple_request.c
webservices/axis2/trunk/c/modules/core/transport/http/http_simple_response.c
webservices/axis2/trunk/c/modules/core/transport/http/http_status_line.c
webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c
webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c
webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_response_writer.c
webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_server.c
webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c
webservices/axis2/trunk/c/modules/core/transport/http/receiver/simple_http_svr_conn.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.c
webservices/axis2/trunk/c/modules/core/transport/http/url.c
webservices/axis2/trunk/c/modules/core/util/core_utils.c
webservices/axis2/trunk/c/modules/platforms/windows/axis2_windows.h
webservices/axis2/trunk/c/modules/util/axis2_hash.h
webservices/axis2/trunk/c/modules/util/class_loader.c
webservices/axis2/trunk/c/modules/util/hash.c
webservices/axis2/trunk/c/modules/wsdl/wsdl_msg_ref.c
webservices/axis2/trunk/c/modules/wsdl/wsdl_soap_op.c
Modified: webservices/axis2/trunk/c/include/axis2_class_loader.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_class_loader.h?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_class_loader.h (original)
+++ webservices/axis2/trunk/c/include/axis2_class_loader.h Sun Feb 5 18:41:57 2006
@@ -40,14 +40,14 @@
* @{
*/
-axis2_status_t AXIS2_CALL
+AXIS2_DECLARE(axis2_status_t)
axis2_class_loader_init(axis2_env_t **env);
-axis2_status_t AXIS2_CALL
+AXIS2_DECLARE(axis2_status_t)
axis2_class_loader_delete_dll (axis2_env_t **env,
axis2_param_t *impl_info_param);
-void *AXIS2_CALL
+AXIS2_DECLARE(void *)
axis2_class_loader_create_dll (axis2_env_t **env,
axis2_param_t *impl_info_param);
Modified: webservices/axis2/trunk/c/include/axis2_conf.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_conf.h?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_conf.h (original)
+++ webservices/axis2/trunk/c/include/axis2_conf.h Sun Feb 5 18:41:57 2006
@@ -318,7 +318,7 @@
/** create Engine configuration struct
* @return pointer to newly created engine configuration
*/
-axis2_conf_t * AXIS2_CALL
+AXIS2_DECLARE(axis2_conf_t *)
axis2_conf_create(axis2_env_t **env);
/************************* Start of function macros ***************************/
Modified: webservices/axis2/trunk/c/include/axis2_engine.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_engine.h?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_engine.h (original)
+++ webservices/axis2/trunk/c/include/axis2_engine.h Sun Feb 5 18:41:57 2006
@@ -148,7 +148,9 @@
axis2_engine_ops_t *ops;
};
-AXIS2_DECLARE(axis2_engine_t*) axis2_engine_create(axis2_env_t **env, axis2_conf_ctx_t *conf_ctx);
+AXIS2_DECLARE(axis2_engine_t*)
+axis2_engine_create(axis2_env_t **env,
+ axis2_conf_ctx_t *conf_ctx);
/************************** Start of function macros **************************/
Modified: webservices/axis2/trunk/c/include/axis2_op_ctx.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_op_ctx.h?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_op_ctx.h (original)
+++ webservices/axis2/trunk/c/include/axis2_op_ctx.h Sun Feb 5 18:41:57 2006
@@ -145,9 +145,10 @@
axis2_op_ctx_ops_t *ops;
};
-axis2_op_ctx_t* AXIS2_CALL axis2_op_ctx_create(axis2_env_t **env,
- struct axis2_op *op,
- struct axis2_svc_ctx * svc_ctx);
+AXIS2_DECLARE(axis2_op_ctx_t*)
+axis2_op_ctx_create(axis2_env_t **env,
+ struct axis2_op *op,
+ struct axis2_svc_ctx * svc_ctx);
/************************** Start of function macros **************************/
#define AXIS2_OP_CTX_GET_BASE(op_ctx, env) ((op_ctx)->ops->get_base(op_ctx, env))
Modified: webservices/axis2/trunk/c/include/axis2_svc.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_svc.h?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_svc.h (original)
+++ webservices/axis2/trunk/c/include/axis2_svc.h Sun Feb 5 18:41:57 2006
@@ -439,7 +439,7 @@
* @param wsdl_svc wsdl service
* @return pointer to newly created service
*/
-axis2_svc_t * AXIS2_CALL
+AXIS2_DECLARE(axis2_svc_t *)
axis2_svc_create_with_wsdl_svc (axis2_env_t **env,
struct axis2_wsdl_svc *wsdl_svc);
Modified: webservices/axis2/trunk/c/include/axis2_svc_grp.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_svc_grp.h?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_svc_grp.h (original)
+++ webservices/axis2/trunk/c/include/axis2_svc_grp.h Sun Feb 5 18:41:57 2006
@@ -191,7 +191,7 @@
* @param conf
* @return pointer to newly created service group
*/
-axis2_svc_grp_t * AXIS2_CALL
+AXIS2_DECLARE(axis2_svc_grp_t *)
axis2_svc_grp_create_with_conf (axis2_env_t **env,
struct axis2_conf *conf);
Modified: webservices/axis2/trunk/c/include/axis2_svc_grp_ctx.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_svc_grp_ctx.h?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_svc_grp_ctx.h (original)
+++ webservices/axis2/trunk/c/include/axis2_svc_grp_ctx.h Sun Feb 5 18:41:57 2006
@@ -91,9 +91,11 @@
axis2_svc_grp_ctx_ops_t *ops;
};
-AXIS2_DECLARE(axis2_svc_grp_ctx_t*) axis2_svc_grp_ctx_create(axis2_env_t **env,
- struct axis2_svc_grp *svc_grp,
- struct axis2_conf_ctx *conf_ctx);
+
+AXIS2_DECLARE(axis2_svc_grp_ctx_t*)
+axis2_svc_grp_ctx_create(axis2_env_t **env,
+ struct axis2_svc_grp *svc_grp,
+ struct axis2_conf_ctx *conf_ctx);
/****************** Start of function macros **************************/
Modified: webservices/axis2/trunk/c/modules/core/context/conf_ctx.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/context/conf_ctx.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/conf_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/conf_ctx.c Sun Feb 5 18:41:57 2006
@@ -92,7 +92,8 @@
axis2_msg_ctx_t *msg_ctx);
-axis2_conf_ctx_t* AXIS2_CALL axis2_conf_ctx_create(axis2_env_t **env, axis2_conf_t *conf)
+AXIS2_DECLARE(axis2_conf_ctx_t*)
+ axis2_conf_ctx_create(axis2_env_t **env, axis2_conf_t *conf)
{
axis2_conf_ctx_impl_t *conf_ctx_impl = NULL;
Modified: webservices/axis2/trunk/c/modules/core/context/ctx.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/context/ctx.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/ctx.c Sun Feb 5 18:41:57 2006
@@ -40,7 +40,8 @@
axis2_status_t AXIS2_CALL axis2_ctx_free (struct axis2_ctx *ctx,
axis2_env_t **env);
-axis2_ctx_t* AXIS2_CALL axis2_ctx_create(axis2_env_t **env)
+AXIS2_DECLARE(axis2_ctx_t*)
+axis2_ctx_create(axis2_env_t **env)
{
axis2_ctx_impl_t *ctx_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=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/msg_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/msg_ctx.c Sun Feb 5 18:41:57 2006
@@ -399,7 +399,7 @@
/************************* End of function headers ****************************/
-axis2_msg_ctx_t * AXIS2_CALL
+AXIS2_DECLARE(axis2_msg_ctx_t *)
axis2_msg_ctx_create (axis2_env_t **env,
struct axis2_conf_ctx *conf_ctx,
struct axis2_transport_in_desc *transport_in_desc,
Modified: webservices/axis2/trunk/c/modules/core/context/op_ctx.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/context/op_ctx.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/op_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/op_ctx.c Sun Feb 5 18:41:57 2006
@@ -82,7 +82,8 @@
axis2_hash_t* AXIS2_CALL axis2_op_ctx_get_msg_ctx_map(struct axis2_op_ctx *op_ctx,
axis2_env_t **env);
-axis2_op_ctx_t* AXIS2_CALL axis2_op_ctx_create(axis2_env_t **env,
+AXIS2_DECLARE(axis2_op_ctx_t*)
+axis2_op_ctx_create(axis2_env_t **env,
axis2_op_t *op,
struct axis2_svc_ctx* svc_ctx)
{
Modified: webservices/axis2/trunk/c/modules/core/context/svc_ctx.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/context/svc_ctx.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/svc_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/svc_ctx.c Sun Feb 5 18:41:57 2006
@@ -56,7 +56,8 @@
axis2_op_ctx_t* AXIS2_CALL axis2_svc_ctx_create_op_ctx(struct axis2_svc_ctx *svc_ctx,
axis2_env_t **env, axis2_qname_t *qname);
-axis2_svc_ctx_t* AXIS2_CALL axis2_svc_ctx_create(axis2_env_t **env,
+AXIS2_DECLARE(axis2_svc_ctx_t*)
+axis2_svc_ctx_create(axis2_env_t **env,
axis2_svc_t *svc,
struct axis2_svc_grp_ctx *svc_grp_ctx)
{
Modified: webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c Sun Feb 5 18:41:57 2006
@@ -64,9 +64,10 @@
axis2_env_t **env);
-axis2_svc_grp_ctx_t* AXIS2_CALL axis2_svc_grp_ctx_create(axis2_env_t **env,
- axis2_svc_grp_t *svc_grp,
- struct axis2_conf_ctx *conf_ctx)
+AXIS2_DECLARE(axis2_svc_grp_ctx_t*)
+axis2_svc_grp_ctx_create(axis2_env_t **env,
+ axis2_svc_grp_t *svc_grp,
+ struct axis2_conf_ctx *conf_ctx)
{
axis2_svc_grp_ctx_impl_t *svc_grp_ctx_impl = NULL;
Modified: webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c Sun Feb 5 18:41:57 2006
@@ -110,7 +110,7 @@
/************************** End of function prototypes ************************/
-axis2_arch_file_data_t * AXIS2_CALL
+AXIS2_DECLARE(axis2_arch_file_data_t *)
axis2_arch_file_data_create(axis2_env_t **env)
{
axis2_arch_file_data_impl_t *arch_file_data_impl = NULL;
@@ -184,7 +184,7 @@
return &(arch_file_data_impl->arch_file_data);
}
-axis2_arch_file_data_t * AXIS2_CALL
+AXIS2_DECLARE(axis2_arch_file_data_t *)
axis2_arch_file_data_create_with_type_and_file(axis2_env_t **env,
int type,
axis2_file_t *file)
@@ -201,7 +201,7 @@
return &(file_data_impl->arch_file_data);
}
-axis2_arch_file_data_t * AXIS2_CALL
+AXIS2_DECLARE(axis2_arch_file_data_t *)
axis2_arch_file_data_create_with_type_and_name(axis2_env_t **env,
int type,
axis2_char_t *name)
Modified: webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c Sun Feb 5 18:41:57 2006
@@ -69,7 +69,7 @@
/************************** End of function prototypes ************************/
-axis2_arch_reader_t * AXIS2_CALL
+AXIS2_DECLARE(axis2_arch_reader_t *)
axis2_arch_reader_create (axis2_env_t **env)
{
axis2_arch_reader_impl_t *arch_reader_impl = NULL;
Modified: webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c Sun Feb 5 18:41:57 2006
@@ -72,7 +72,7 @@
/************************** End of function prototypes ************************/
-axis2_conf_builder_t * AXIS2_CALL
+AXIS2_DECLARE(axis2_conf_builder_t *)
axis2_conf_builder_create (axis2_env_t **env)
{
axis2_conf_builder_impl_t *conf_builder_impl = NULL;
@@ -110,7 +110,7 @@
return &(conf_builder_impl->conf_builder);
}
-axis2_conf_builder_t * AXIS2_CALL
+AXIS2_DECLARE(axis2_conf_builder_t *)
axis2_conf_builder_create_with_file_and_dep_engine_and_conf (axis2_env_t **env,
axis2_char_t *file,
axis2_dep_engine_t *engine,
Modified: webservices/axis2/trunk/c/modules/core/deployment/conf_init.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/conf_init.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_init.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_init.c Sun Feb 5 18:41:57 2006
@@ -21,7 +21,8 @@
axis2_status_t AXIS2_CALL axis2_init_transports(axis2_env_t **env,
axis2_conf_ctx_t *conf_ctx);
-axis2_conf_ctx_t* AXIS2_CALL build_conf_ctx (axis2_env_t **env,
+AXIS2_DECLARE(axis2_conf_ctx_t*)
+build_conf_ctx (axis2_env_t **env,
axis2_char_t *repo_name)
{
axis2_conf_ctx_t *conf_ctx = NULL;
Modified: webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Sun Feb 5 18:41:57 2006
@@ -24,6 +24,7 @@
#include <axis2_svc_builder.h>
#include <axis2_om_node.h>
#include <axis2_class_loader.h>
+#include <axis2_string.h>
/**
* @brief DLL Description struct impl
@@ -1446,6 +1447,7 @@
file_name_l = AXIS2_STRDUP(file_name, env);
ptr = AXIS2_STRRCHR(file_name_l, AXIS2_PATH_SEP_CHAR);
+
temp_name = ptr + 1;
ptr = AXIS2_STRRCHR(temp_name, name_sep);
ptr[0] = '\0';
Modified: webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c Sun Feb 5 18:41:57 2006
@@ -365,6 +365,9 @@
axis2_status_t status = AXIS2_FAILURE;
axis2_char_t *attrib_value = NULL;
axis2_om_element_t *handler_element = NULL;
+ axis2_om_node_t *order_node = NULL;
+ axis2_om_element_t *order_element = NULL;
+ axis2_qname_t *order_qname = NULL;
AXIS2_FUNC_PARAM_CHECK(desc_builder, env, NULL);
AXIS2_PARAM_CHECK((*env)->error, handler_element, NULL);
@@ -446,9 +449,7 @@
}
/*processing phase Rules (order) */
- axis2_om_node_t *order_node = NULL;
- axis2_om_element_t *order_element = NULL;
- axis2_qname_t *order_qname = NULL;
+
order_qname = axis2_qname_create(env, AXIS2_ORDER, NULL, NULL);
order_element = AXIS2_OM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(handler_element,
Modified: webservices/axis2/trunk/c/modules/core/deployment/phases_info.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/phases_info.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/phases_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/phases_info.c Sun Feb 5 18:41:57 2006
@@ -85,10 +85,10 @@
axis2_phases_info_t * AXIS2_CALL
axis2_phases_info_create (axis2_env_t **env)
{
+ axis2_phases_info_impl_t *phases_info_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- axis2_phases_info_impl_t *phases_info_impl =
- (axis2_phases_info_impl_t *) AXIS2_MALLOC ((*env)->allocator,
+ phases_info_impl = (axis2_phases_info_impl_t *) AXIS2_MALLOC ((*env)->allocator,
sizeof(axis2_phases_info_impl_t));
if(NULL == phases_info_impl)
Modified: webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c Sun Feb 5 18:41:57 2006
@@ -91,7 +91,7 @@
/************************** End of function prototypes ************************/
-axis2_ws_info_list_t * AXIS2_CALL
+AXIS2_DECLARE(axis2_ws_info_list_t *)
axis2_ws_info_list_create_with_dep_engine (axis2_env_t **env,
struct axis2_dep_engine *dep_engine)
{
@@ -349,12 +349,12 @@
{
axis2_ws_info_list_impl_t *info_list_impl = NULL;
int i = 0;
-
+ int size = 0;
AXIS2_FUNC_PARAM_CHECK(info_list, env, NULL);
AXIS2_PARAM_CHECK((*env)->error, file_name, NULL);
info_list_impl = AXIS2_INTF_TO_IMPL(info_list);
- int size = AXIS2_ARRAY_LIST_SIZE(info_list_impl->info_list, env);
+ size = AXIS2_ARRAY_LIST_SIZE(info_list_impl->info_list, env);
for (i = 0; i < size; i++)
{
axis2_ws_info_t *ws_info = NULL;
Modified: webservices/axis2/trunk/c/modules/core/description/dll_desc.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/dll_desc.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/dll_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/dll_desc.c Sun Feb 5 18:41:57 2006
@@ -109,7 +109,7 @@
/************************* End of function headers ****************************/
-axis2_dll_desc_t * AXIS2_CALL
+AXIS2_DECLARE(axis2_dll_desc_t *)
axis2_dll_desc_create (axis2_env_t **env)
{
axis2_dll_desc_impl_t *dll_desc_impl = NULL;
Modified: webservices/axis2/trunk/c/modules/core/description/flow.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/flow.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/flow.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/flow.c Sun Feb 5 18:41:57 2006
@@ -53,7 +53,7 @@
/************************** End of Function headers ************************/
-axis2_flow_t * AXIS2_CALL
+AXIS2_DECLARE(axis2_flow_t *)
axis2_flow_create (axis2_env_t **env)
{
axis2_flow_impl_t *flow_impl = NULL;
Modified: webservices/axis2/trunk/c/modules/core/description/flow_container.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/flow_container.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/flow_container.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/flow_container.c Sun Feb 5 18:41:57 2006
@@ -87,7 +87,7 @@
/************************** End of function prototypes ************************/
-axis2_flow_container_t * AXIS2_CALL
+AXIS2_DECLARE(axis2_flow_container_t *)
axis2_flow_container_create (axis2_env_t **env)
{
axis2_flow_container_impl_t *flow_container_impl = NULL;
Modified: webservices/axis2/trunk/c/modules/core/description/handler_desc.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/handler_desc.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/handler_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/handler_desc.c Sun Feb 5 18:41:57 2006
@@ -96,7 +96,7 @@
axis2_handler_desc_free (struct axis2_handler_desc *handler_desc,
axis2_env_t **env);
-axis2_handler_desc_t* AXIS2_CALL
+AXIS2_DECLARE(axis2_handler_desc_t*)
axis2_handler_desc_create_with_qname(axis2_env_t **env,
axis2_qname_t *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=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/module_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/module_desc.c Sun Feb 5 18:41:57 2006
@@ -236,7 +236,7 @@
return &(module_desc_impl->module_desc);
}
-axis2_module_desc_t * AXIS2_CALL
+AXIS2_DECLARE(axis2_module_desc_t *)
axis2_module_desc_create_with_qname (axis2_env_t **env, axis2_qname_t *qname)
{
axis2_module_desc_impl_t *module_desc_impl = NULL;
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=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/op.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/op.c Sun Feb 5 18:41:57 2006
@@ -329,7 +329,7 @@
/************************* End of function headers ****************************/
-axis2_op_t * AXIS2_CALL
+AXIS2_DECLARE(axis2_op_t *)
axis2_op_create (axis2_env_t **env)
{
struct axis2_param_container *param_container_l = NULL;
Modified: webservices/axis2/trunk/c/modules/core/description/param.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/param.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/param.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/param.c Sun Feb 5 18:41:57 2006
@@ -87,7 +87,7 @@
axis2_env_t **env);
/******************************************************************************/
-axis2_param_t* AXIS2_CALL
+AXIS2_DECLARE(axis2_param_t*)
axis2_param_create(axis2_env_t **env,
axis2_char_t *name, void *value)
{
Modified: webservices/axis2/trunk/c/modules/core/description/param_container.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/param_container.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/param_container.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/param_container.c Sun Feb 5 18:41:57 2006
@@ -56,7 +56,7 @@
/************************** End of function prototypes ************************/
-axis2_param_container_t * AXIS2_CALL
+AXIS2_DECLARE(axis2_param_container_t *)
axis2_param_container_create (axis2_env_t **env)
{
axis2_param_container_impl_t *param_container_impl = NULL;
Modified: webservices/axis2/trunk/c/modules/core/description/phase_rule.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/phase_rule.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/phase_rule.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/phase_rule.c Sun Feb 5 18:41:57 2006
@@ -63,7 +63,9 @@
axis2_phase_rule_t* AXIS2_CALL axis2_phase_rule_clone (struct axis2_phase_rule *phase_rule,
axis2_env_t **env);
-axis2_phase_rule_t* AXIS2_CALL axis2_phase_rule_create(axis2_env_t **env, axis2_char_t *name)
+
+AXIS2_DECLARE(axis2_phase_rule_t*)
+axis2_phase_rule_create(axis2_env_t **env, axis2_char_t *name)
{
axis2_phase_rule_impl_t *phase_rule_impl = NULL;
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=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/svc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/svc.c Sun Feb 5 18:41:57 2006
@@ -468,7 +468,7 @@
return &(svc_impl->svc);
}
-axis2_svc_t * AXIS2_CALL
+AXIS2_DECLARE(axis2_svc_t *)
axis2_svc_create_with_wsdl_svc (axis2_env_t **env,
axis2_wsdl_svc_t *wsdl_svc)
{
Modified: webservices/axis2/trunk/c/modules/core/description/svc_grp.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/svc_grp.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/svc_grp.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/svc_grp.c Sun Feb 5 18:41:57 2006
@@ -138,7 +138,7 @@
/***************************** End of function headers ************************/
-axis2_svc_grp_t * AXIS2_CALL
+AXIS2_DECLARE(axis2_svc_grp_t *)
axis2_svc_grp_create (axis2_env_t **env)
{
axis2_svc_grp_impl_t *svc_grp_impl = NULL;
@@ -226,7 +226,7 @@
return &(svc_grp_impl->svc_grp);
}
-axis2_svc_grp_t * AXIS2_CALL
+AXIS2_DECLARE(axis2_svc_grp_t *)
axis2_svc_grp_create_with_conf (axis2_env_t **env,
axis2_conf_t *conf)
{
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=375163&r1=375162&r2=375163&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 Sun Feb 5 18:41:57 2006
@@ -123,7 +123,7 @@
/************************** End of function prototypes ************************/
-axis2_transport_in_desc_t * AXIS2_CALL
+AXIS2_DECLARE(axis2_transport_in_desc_t *)
axis2_transport_in_desc_create_with_qname (axis2_env_t **env,
axis2_qname_t *qname)
{
Modified: webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c?rev=375163&r1=375162&r2=375163&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 Sun Feb 5 18:41:57 2006
@@ -123,7 +123,7 @@
/************************** End of function prototypes ************************/
-axis2_transport_out_desc_t * AXIS2_CALL
+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_impl_t *transport_out_impl = NULL;
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=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/engine.c Sun Feb 5 18:41:57 2006
@@ -57,7 +57,8 @@
axis2_env_t **env);
-axis2_engine_t* AXIS2_CALL axis2_engine_create(axis2_env_t **env, axis2_conf_ctx_t *conf_ctx)
+AXIS2_DECLARE(axis2_engine_t*)
+axis2_engine_create(axis2_env_t **env, axis2_conf_ctx_t *conf_ctx)
{
axis2_engine_impl_t *engine_impl = NULL;
Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c Sun Feb 5 18:41:57 2006
@@ -60,7 +60,7 @@
/************************** End of function prototypes ************************/
-axis2_phase_holder_t * AXIS2_CALL
+AXIS2_DECLARE(axis2_phase_holder_t *)
axis2_phase_holder_create (axis2_env_t **env)
{
axis2_phase_holder_impl_t *phase_holder_impl = NULL;
@@ -105,7 +105,7 @@
return &(phase_holder_impl->phase_holder);
}
-axis2_phase_holder_t * AXIS2_CALL
+AXIS2_DECLARE(axis2_phase_holder_t *)
axis2_phase_holder_create_with_phases (axis2_env_t **env, axis2_array_list_t *phases)
{
axis2_phase_holder_impl_t *phase_holder_impl = NULL;
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=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c Sun Feb 5 18:41:57 2006
@@ -196,7 +196,7 @@
return &(phase_resolver_impl->phase_resolver);
}
-axis2_phase_resolver_t * AXIS2_CALL
+AXIS2_DECLARE(axis2_phase_resolver_t *)
axis2_phase_resolver_create_with_config (axis2_env_t **env,
axis2_conf_t *axis2_config)
{
@@ -213,7 +213,7 @@
return &(phase_resolver_impl->phase_resolver);
}
-axis2_phase_resolver_t * AXIS2_CALL
+AXIS2_DECLARE(axis2_phase_resolver_t *)
axis2_phase_resolver_create_with_config_and_svc (axis2_env_t **env,
axis2_conf_t *axis2_config,
axis2_svc_t *svc)
Modified: webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c Sun Feb 5 18:41:57 2006
@@ -32,7 +32,7 @@
/************************** End of function prototypes ************************/
-axis2_msg_recv_t *AXIS2_CALL
+AXIS2_DECLARE(axis2_msg_recv_t *)
axis2_raw_xml_in_out_msg_recv_create(axis2_env_t **env)
{
axis2_msg_recv_t *msg_recv = NULL;
Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_header.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/http_header.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/http_header.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/http_header.c Sun Feb 5 18:41:57 2006
@@ -55,12 +55,12 @@
axis2_http_header_create (axis2_env_t **env, axis2_char_t *name,
axis2_char_t *value)
{
+ axis2_http_header_impl_t *http_header_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_FUNC_PARAM_CHECK(name, env, NULL);
AXIS2_FUNC_PARAM_CHECK(value, env, NULL);
- axis2_http_header_impl_t *http_header_impl =
- (axis2_http_header_impl_t *)AXIS2_MALLOC
+ http_header_impl = (axis2_http_header_impl_t *)AXIS2_MALLOC
((*env)->allocator, sizeof(
axis2_http_header_impl_t));
@@ -135,9 +135,10 @@
axis2_status_t AXIS2_CALL
axis2_http_header_free (axis2_http_header_t *header, axis2_env_t **env)
{
+ axis2_http_header_impl_t *http_header_impl = NULL;
AXIS2_FUNC_PARAM_CHECK(header, env, AXIS2_FAILURE);
- axis2_http_header_impl_t *http_header_impl =
- AXIS2_INTF_TO_IMPL(header);
+ http_header_impl = AXIS2_INTF_TO_IMPL(header);
+
if(NULL != http_header_impl->name)
{
AXIS2_FREE((*env)->allocator, http_header_impl->name);
@@ -160,11 +161,14 @@
axis2_http_header_to_external_form (axis2_http_header_t *header,
axis2_env_t **env)
{
+ axis2_http_header_impl_t *http_header_impl = NULL;
+ axis2_ssize_t len = 0;
+ axis2_char_t *external_form = NULL;
AXIS2_FUNC_PARAM_CHECK(header, env, NULL);
- axis2_http_header_impl_t *http_header_impl = AXIS2_INTF_TO_IMPL(header);
- axis2_ssize_t len = AXIS2_STRLEN(http_header_impl->name) +
+ http_header_impl = AXIS2_INTF_TO_IMPL(header);
+ len = AXIS2_STRLEN(http_header_impl->name) +
AXIS2_STRLEN(http_header_impl->value) + 4;
- axis2_char_t *external_form = (axis2_char_t*) AXIS2_MALLOC((*env)->allocator,
+ external_form = (axis2_char_t*) AXIS2_MALLOC((*env)->allocator,
len);
sprintf(external_form, "%s:%s%s", http_header_impl->name,
http_header_impl->value, AXIS2_HTTP_CRLF);
Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_out_transport_info.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/http_out_transport_info.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/http_out_transport_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/http_out_transport_info.c Sun Feb 5 18:41:57 2006
@@ -59,11 +59,11 @@
axis2_http_out_transport_info_create(axis2_env_t **env,
axis2_http_simple_response_t *response)
{
+ axis2_http_out_transport_info_impl_t *info_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_FUNC_PARAM_CHECK(response, env, NULL);
- axis2_http_out_transport_info_impl_t *info_impl =
- (axis2_http_out_transport_info_impl_t *)AXIS2_MALLOC
+ info_impl = (axis2_http_out_transport_info_impl_t *)AXIS2_MALLOC
((*env)->allocator, sizeof(
axis2_http_out_transport_info_impl_t));
@@ -100,9 +100,9 @@
axis2_http_out_transport_info_free (axis2_http_out_transport_info_t *info,
axis2_env_t **env)
{
+ axis2_http_out_transport_info_impl_t *info_impl = NULL;
AXIS2_FUNC_PARAM_CHECK(info, env, AXIS2_FAILURE);
- axis2_http_out_transport_info_impl_t *info_impl =
- AXIS2_INTF_TO_IMPL(info);
+ info_impl = AXIS2_INTF_TO_IMPL(info);
info_impl->response = NULL; /* response doesn't belong to info */
if(NULL != info_impl->encoding)
@@ -125,11 +125,12 @@
{
axis2_char_t *tmp1 = NULL;
axis2_char_t *tmp2 = NULL;
+ axis2_http_out_transport_info_impl_t *info_impl = NULL;
AXIS2_FUNC_PARAM_CHECK(info, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, content_type, AXIS2_FAILURE);
- axis2_http_out_transport_info_impl_t *info_impl = AXIS2_INTF_TO_IMPL(info);
+ info_impl = AXIS2_INTF_TO_IMPL(info);
if(NULL != info_impl->encoding)
{
@@ -157,10 +158,11 @@
(axis2_http_out_transport_info_t *info, axis2_env_t **env,
axis2_char_t *encoding)
{
+ axis2_http_out_transport_info_impl_t *info_impl = NULL;
AXIS2_FUNC_PARAM_CHECK(info, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, encoding, AXIS2_FAILURE);
- axis2_http_out_transport_info_impl_t *info_impl = AXIS2_INTF_TO_IMPL(info);
+ info_impl = AXIS2_INTF_TO_IMPL(info);
if(NULL != info_impl->encoding)
{
Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_request_line.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/http_request_line.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/http_request_line.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/http_request_line.c Sun Feb 5 18:41:57 2006
@@ -71,13 +71,13 @@
axis2_http_request_line_create(axis2_env_t **env, axis2_char_t *method,
axis2_char_t *uri, axis2_char_t *http_version)
{
+ axis2_http_request_line_impl_t *request_line_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK((*env)->error, method, NULL);
AXIS2_PARAM_CHECK((*env)->error, uri, NULL);
AXIS2_PARAM_CHECK((*env)->error, http_version, NULL);
- axis2_http_request_line_impl_t *request_line_impl =
- (axis2_http_request_line_impl_t *)AXIS2_MALLOC
+ request_line_impl = (axis2_http_request_line_impl_t *)AXIS2_MALLOC
((*env)->allocator, sizeof(
axis2_http_request_line_impl_t));
@@ -118,9 +118,10 @@
axis2_http_request_line_free(axis2_http_request_line_t *request_line,
axis2_env_t **env)
{
+ axis2_http_request_line_impl_t *request_line_impl = NULL;
AXIS2_FUNC_PARAM_CHECK(request_line, env, AXIS2_FAILURE);
- axis2_http_request_line_impl_t *request_line_impl =
- AXIS2_INTF_TO_IMPL(request_line);
+ request_line_impl = AXIS2_INTF_TO_IMPL(request_line);
+
if(NULL != request_line_impl->method)
{
AXIS2_FREE((*env)->allocator, request_line_impl->method);
@@ -146,16 +147,19 @@
axis2_http_request_line_t* AXIS2_CALL
axis2_http_request_line_parse_line(axis2_env_t **env, const axis2_char_t *str)
{
- AXIS2_PARAM_CHECK((*env)->error, str, NULL);
- axis2_char_t *tmp = strstr(str, AXIS2_HTTP_CRLF);
axis2_char_t *req_line = NULL;
axis2_char_t *method = NULL;
axis2_char_t *uri = NULL;
axis2_char_t *http_version = NULL;
axis2_http_request_line_t *ret = NULL;
-
+ axis2_char_t *tmp = NULL;
int i = 0;
+ AXIS2_PARAM_CHECK((*env)->error, str, NULL);
+
+ tmp = AXIS2_STRSTR(str, AXIS2_HTTP_CRLF);
+
+
if(NULL == tmp)
{
AXIS2_ERROR_SET((*env)->error,
@@ -236,16 +240,20 @@
axis2_http_request_line_to_string(axis2_http_request_line_t *request_line,
axis2_env_t **env)
{
+ axis2_http_request_line_impl_t *req_line_impl = NULL;
+ int alloc_len = 0;
+ axis2_char_t *ret = NULL;
+
AXIS2_FUNC_PARAM_CHECK(request_line, env, NULL);
- axis2_http_request_line_impl_t *req_line_impl = AXIS2_INTF_TO_IMPL(
+ req_line_impl = AXIS2_INTF_TO_IMPL(
request_line);
- int alloc_len = AXIS2_STRLEN(req_line_impl->method) +
+ alloc_len = AXIS2_STRLEN(req_line_impl->method) +
AXIS2_STRLEN(req_line_impl->uri)+
AXIS2_STRLEN(req_line_impl->http_version) + 5;
/* 5 = 2 * spaces + CR + LF + '\0' */
- axis2_char_t *ret = AXIS2_MALLOC((*env)->allocator,
+ ret = AXIS2_MALLOC((*env)->allocator,
alloc_len * sizeof(axis2_char_t));
if(NULL == ret)
{
Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_simple_request.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/http_simple_request.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/http_simple_request.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/http_simple_request.c Sun Feb 5 18:41:57 2006
@@ -118,13 +118,13 @@
axis2_ssize_t http_hdr_count,
axis2_stream_t *content)
{
+ axis2_http_simple_request_impl_t *simple_request_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_FUNC_PARAM_CHECK(request_line, env, NULL);
- axis2_http_simple_request_impl_t *simple_request_impl =
- (axis2_http_simple_request_impl_t *)AXIS2_MALLOC
- ((*env)->allocator, sizeof(
- axis2_http_simple_request_impl_t));
+ simple_request_impl = (axis2_http_simple_request_impl_t *)AXIS2_MALLOC
+ ((*env)->allocator, sizeof(
+ axis2_http_simple_request_impl_t));
if(NULL == simple_request_impl)
{
@@ -136,9 +136,10 @@
simple_request_impl->header_group = NULL;
if(http_hdr_count > 0 && NULL != http_headers)
{
+ int i = 0;
simple_request_impl->header_group = axis2_array_list_create(env,
http_hdr_count);
- int i = 0;
+
for(i = 0; i < http_hdr_count; i++)
{
AXIS2_ARRAY_LIST_ADD(simple_request_impl->header_group, env,
@@ -194,9 +195,10 @@
axis2_http_simple_request_free(axis2_http_simple_request_t *simple_request,
axis2_env_t **env)
{
+ axis2_http_simple_request_impl_t *simple_request_impl = NULL;
AXIS2_FUNC_PARAM_CHECK(simple_request, env, AXIS2_FAILURE);
- axis2_http_simple_request_impl_t *simple_request_impl =
- AXIS2_INTF_TO_IMPL(simple_request);
+
+ simple_request_impl = AXIS2_INTF_TO_IMPL(simple_request);
/*
Don't free the stream since it belongs to the socket
TODO : if chunked remove the chunked stream.
@@ -259,21 +261,28 @@
(axis2_http_simple_request_t *simple_request,
axis2_env_t **env, axis2_char_t *name)
{
+ int i = 0;
+ axis2_char_t *header_name = NULL;
+ axis2_http_simple_request_impl_t *simple_request_impl = NULL;
+ int count = 0;
+
AXIS2_FUNC_PARAM_CHECK(simple_request, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, name, AXIS2_FAILURE);
- axis2_http_simple_request_impl_t *simple_request_impl = AXIS2_INTF_TO_IMPL(
- simple_request);
+
+ simple_request_impl = AXIS2_INTF_TO_IMPL(simple_request);
+
if(NULL == simple_request_impl->header_group)
{
return AXIS2_FALSE;
}
- int count = AXIS2_ARRAY_LIST_SIZE(simple_request_impl->header_group, env);
+
+ count = AXIS2_ARRAY_LIST_SIZE(simple_request_impl->header_group, env);
+
if(0 == count)
{
return AXIS2_FALSE;
}
- int i = 0;
- axis2_char_t *header_name = NULL;
+
for(i = 0; i < count; i++)
{
header_name = AXIS2_HTTP_HEADER_GET_NAME((axis2_http_header_t *)
@@ -301,13 +310,19 @@
(axis2_http_simple_request_t *simple_request,
axis2_env_t **env, const axis2_char_t *str)
{
+ axis2_http_simple_request_impl_t *simple_request_impl = NULL;
+ axis2_array_list_t *header_group = NULL;
+ int i = 0;
+ int count = 0;
+ axis2_http_header_t *tmp_header = NULL;
+ axis2_char_t *tmp_name = NULL;
+
AXIS2_FUNC_PARAM_CHECK(simple_request, env, NULL);
AXIS2_PARAM_CHECK((*env)->error, str, NULL);
- axis2_http_simple_request_impl_t *simple_request_impl =
- AXIS2_INTF_TO_IMPL(simple_request);
+ simple_request_impl = AXIS2_INTF_TO_IMPL(simple_request);
- axis2_array_list_t *header_group = simple_request_impl->header_group;
+ header_group = simple_request_impl->header_group;
if(NULL == simple_request_impl->header_group)
{
return NULL;
@@ -317,13 +332,13 @@
return NULL;
}
- int i = 0;
- int count = AXIS2_ARRAY_LIST_SIZE(header_group, env);
- axis2_http_header_t *tmp_header = NULL;
- axis2_char_t *tmp_name = NULL;
+
+ count = AXIS2_ARRAY_LIST_SIZE(header_group, env);
+
for(i = 0; i < count; i++)
{
+
tmp_header = (axis2_http_header_t *)AXIS2_ARRAY_LIST_GET(header_group,
env, i);
tmp_name = AXIS2_HTTP_HEADER_GET_NAME(tmp_header, env);
@@ -341,11 +356,17 @@
(axis2_http_simple_request_t *simple_request,
axis2_env_t **env, const axis2_char_t *str)
{
+ axis2_http_header_t *tmp_header = NULL;
+ axis2_char_t *tmp_name = NULL;
+ int i = 0;
+ int count = 0;
+ axis2_array_list_t *header_group = NULL;
+
AXIS2_FUNC_PARAM_CHECK(simple_request, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, str, AXIS2_FAILURE);
- axis2_array_list_t *header_group = AXIS2_INTF_TO_IMPL(simple_request)->
- header_group;
+ header_group = AXIS2_INTF_TO_IMPL(simple_request)->header_group;
+
if(NULL == header_group)
{
/* Even though we couldn't complete the op, we are sure that the
@@ -354,10 +375,8 @@
*/
return AXIS2_SUCCESS;
}
- int i = 0;
- int count = AXIS2_ARRAY_LIST_SIZE(header_group, env);
- axis2_http_header_t *tmp_header = NULL;
- axis2_char_t *tmp_name = NULL;
+
+ count = AXIS2_ARRAY_LIST_SIZE(header_group, env);
for(i = 0; i < count; i++)
{
@@ -380,10 +399,11 @@
(axis2_http_simple_request_t *simple_request,
axis2_env_t **env, axis2_http_header_t *header)
{
+ axis2_http_simple_request_impl_t *simple_request_impl = NULL;
AXIS2_FUNC_PARAM_CHECK(simple_request, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, header, AXIS2_FAILURE);
- axis2_http_simple_request_impl_t *simple_request_impl = AXIS2_INTF_TO_IMPL(
+ simple_request_impl = AXIS2_INTF_TO_IMPL(
simple_request);
if(NULL == simple_request_impl->header_group)
{
@@ -399,8 +419,9 @@
(axis2_http_simple_request_t *simple_request,
axis2_env_t **env)
{
+ axis2_http_header_t *tmp_header = NULL;
AXIS2_FUNC_PARAM_CHECK(simple_request, env, NULL);
- axis2_http_header_t *tmp_header = axis2_http_simple_request_get_first_header
+ tmp_header = axis2_http_simple_request_get_first_header
(simple_request, env, AXIS2_HTTP_HEADER_CONTENT_TYPE);
if(NULL != tmp_header)
return AXIS2_HTTP_HEADER_GET_VALUE(tmp_header, env);
@@ -414,8 +435,9 @@
(axis2_http_simple_request_t *simple_request,
axis2_env_t **env)
{
+ axis2_http_header_t *tmp_header = NULL;
AXIS2_FUNC_PARAM_CHECK(simple_request, env, NULL);
- axis2_http_header_t *tmp_header = axis2_http_simple_request_get_first_header
+ tmp_header = axis2_http_simple_request_get_first_header
(simple_request, env, AXIS2_HTTP_HEADER_CONTENT_TYPE);
if(NULL != tmp_header)
{
@@ -438,8 +460,9 @@
(axis2_http_simple_request_t *simple_request,
axis2_env_t **env)
{
+ axis2_http_header_t *tmp_header = NULL;
AXIS2_FUNC_PARAM_CHECK(simple_request, env, AXIS2_FAILURE);
- axis2_http_header_t *tmp_header = axis2_http_simple_request_get_first_header
+ tmp_header = axis2_http_simple_request_get_first_header
(simple_request, env, AXIS2_HTTP_HEADER_CONTENT_LENGTH);
if(NULL != tmp_header)
{
Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_simple_response.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/http_simple_response.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/http_simple_response.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/http_simple_response.c Sun Feb 5 18:41:57 2006
@@ -23,9 +23,12 @@
* @brief HTTP Simple Response struct impl
* Axis2 HTTP Simple Response impl
*/
+#define READ_SIZE 32
+
+
typedef struct axis2_http_simple_response_impl
axis2_http_simple_response_impl_t;
-
+
struct axis2_http_simple_response_impl
{
axis2_http_simple_response_t simple_response;
@@ -131,24 +134,25 @@
/***************************** End of function headers ************************/
-axis2_http_simple_response_t *AXIS2_CALL
+AXIS2_DECLARE(axis2_http_simple_response_t *)
axis2_http_simple_response_create (axis2_env_t **env,
axis2_http_status_line_t *status_line,
const axis2_http_header_t **http_headers,
const axis2_ssize_t http_hdr_count,
axis2_stream_t *content)
{
+ axis2_http_simple_response_t *ret = NULL;
+ axis2_http_simple_response_impl_t *simple_response_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_FUNC_PARAM_CHECK(status_line, env, NULL);
- axis2_http_simple_response_t *ret =
- axis2_http_simple_response_create_default(env);
+ ret = axis2_http_simple_response_create_default(env);
if(NULL == ret)
{
return NULL;
}
- axis2_http_simple_response_impl_t *simple_response_impl =
- AXIS2_INTF_TO_IMPL(ret);
+ simple_response_impl = AXIS2_INTF_TO_IMPL(ret);
+
if(NULL == simple_response_impl)
{
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -156,10 +160,11 @@
}
simple_response_impl->status_line = status_line;
if(http_hdr_count > 0 && NULL != http_headers)
- {
+ {
+ int i = 0;
simple_response_impl->header_group = axis2_array_list_create(env,
http_hdr_count);
- int i = 0;
+
for(i = 0; i < http_hdr_count; i++)
{
AXIS2_ARRAY_LIST_ADD(simple_response_impl->header_group, env,
@@ -172,15 +177,15 @@
}
-axis2_http_simple_response_t * AXIS2_CALL
+AXIS2_DECLARE(axis2_http_simple_response_t *)
axis2_http_simple_response_create_default(axis2_env_t **env)
{
+ axis2_http_simple_response_impl_t *simple_response_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- axis2_http_simple_response_impl_t *simple_response_impl =
- (axis2_http_simple_response_impl_t *)AXIS2_MALLOC
- ((*env)->allocator, sizeof(
- axis2_http_simple_response_impl_t));
+ simple_response_impl = (axis2_http_simple_response_impl_t *)AXIS2_MALLOC
+ ((*env)->allocator, sizeof(
+ axis2_http_simple_response_impl_t));
simple_response_impl->simple_response.ops = AXIS2_MALLOC((*env)->allocator,
sizeof(axis2_http_simple_response_ops_t));
@@ -239,9 +244,10 @@
axis2_http_simple_response_free (axis2_http_simple_response_t *simple_response,
axis2_env_t **env)
{
+ axis2_http_simple_response_impl_t *simple_response_impl = NULL;
AXIS2_FUNC_PARAM_CHECK(simple_response, env, AXIS2_FAILURE);
- axis2_http_simple_response_impl_t *simple_response_impl =
- AXIS2_INTF_TO_IMPL(simple_response);
+ simple_response_impl = AXIS2_INTF_TO_IMPL(simple_response);
+
if(NULL != simple_response_impl->status_line)
{
AXIS2_HTTP_STATUS_LINE_FREE(simple_response_impl->status_line, env);
@@ -280,17 +286,19 @@
axis2_env_t **env, const axis2_char_t *http_ver,
const int status_code, const axis2_char_t *phrase)
{
+ axis2_char_t *tmp_status_line_str = NULL;
+ axis2_http_simple_response_impl_t *simple_response_impl = NULL;
AXIS2_FUNC_PARAM_CHECK(simple_response, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, http_ver, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, status_code, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, phrase, AXIS2_FAILURE);
- axis2_char_t *tmp_status_line_str = AXIS2_MALLOC((*env)->allocator,
+ tmp_status_line_str = AXIS2_MALLOC((*env)->allocator,
(AXIS2_STRLEN(http_ver) + AXIS2_STRLEN(phrase) + 8) *
sizeof(axis2_char_t *));
sprintf(tmp_status_line_str, "%s %3d %s%s", http_ver, status_code, phrase,
AXIS2_HTTP_CRLF);
- axis2_http_simple_response_impl_t *simple_response_impl = AXIS2_INTF_TO_IMPL
+ simple_response_impl = AXIS2_INTF_TO_IMPL
(simple_response);
if(NULL != simple_response_impl->status_line)
{
@@ -384,13 +392,18 @@
(axis2_http_simple_response_t *simple_response,
axis2_env_t **env, axis2_char_t *str)
{
+ axis2_http_simple_response_impl_t *simple_response_impl = NULL;
+ axis2_http_header_t *tmp_header = NULL;
+ axis2_char_t *tmp_name = NULL;
+ int i = 0;
+ int count = 0;
+ axis2_array_list_t *header_group = NULL;
+
AXIS2_FUNC_PARAM_CHECK(simple_response, env, NULL);
AXIS2_PARAM_CHECK((*env)->error, str, NULL);
- axis2_http_simple_response_impl_t *simple_response_impl =
- AXIS2_INTF_TO_IMPL(simple_response);
-
- axis2_array_list_t *header_group = simple_response_impl->header_group;
+ simple_response_impl = AXIS2_INTF_TO_IMPL(simple_response);
+ header_group = simple_response_impl->header_group;
if(NULL == simple_response_impl->header_group)
{
return NULL;
@@ -400,10 +413,7 @@
return NULL;
}
- int i = 0;
- int count = AXIS2_ARRAY_LIST_SIZE(header_group, env);
- axis2_http_header_t *tmp_header = NULL;
- axis2_char_t *tmp_name = NULL;
+ count = AXIS2_ARRAY_LIST_SIZE(header_group, env);
for(i = 0; i < count; i++)
{
@@ -425,10 +435,16 @@
(axis2_http_simple_response_t *simple_response,
axis2_env_t **env, const axis2_char_t *str)
{
+ axis2_array_list_t *header_group = NULL;
+ axis2_http_header_t *tmp_header = NULL;
+ axis2_char_t *tmp_name = NULL;
+ int i = 0;
+ int count = 0;
+
AXIS2_FUNC_PARAM_CHECK(simple_response, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, str, AXIS2_FAILURE);
- axis2_array_list_t *header_group = AXIS2_INTF_TO_IMPL(simple_response)->
+ header_group = AXIS2_INTF_TO_IMPL(simple_response)->
header_group;
if(NULL == header_group)
{
@@ -438,10 +454,9 @@
*/
return AXIS2_SUCCESS;
}
- int i = 0;
- int count = AXIS2_ARRAY_LIST_SIZE(header_group, env);
- axis2_http_header_t *tmp_header = NULL;
- axis2_char_t *tmp_name = NULL;
+
+ count = AXIS2_ARRAY_LIST_SIZE(header_group, env);
+
for(i = 0; i < count; i++)
{
@@ -468,11 +483,12 @@
axis2_http_header_t *tmp_header = NULL;
axis2_char_t *tmp_name = NULL;
axis2_array_list_t *header_group = NULL;
+ axis2_http_simple_response_impl_t *simple_response_impl = NULL;
AXIS2_FUNC_PARAM_CHECK(simple_response, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, header, AXIS2_FAILURE);
- axis2_http_simple_response_impl_t *simple_response_impl = AXIS2_INTF_TO_IMPL
+ simple_response_impl = AXIS2_INTF_TO_IMPL
(simple_response);
if(NULL == simple_response_impl->header_group)
@@ -512,8 +528,9 @@
(axis2_http_simple_response_t *simple_response,
axis2_env_t **env)
{
+ axis2_http_header_t *tmp_header = NULL;
AXIS2_FUNC_PARAM_CHECK(simple_response, env, NULL);
- axis2_http_header_t *tmp_header = axis2_http_simple_response_get_first_header
+ tmp_header = axis2_http_simple_response_get_first_header
(simple_response, env, AXIS2_HTTP_HEADER_CONTENT_TYPE);
if(NULL != tmp_header)
{
@@ -536,9 +553,9 @@
(axis2_http_simple_response_t *simple_response,
axis2_env_t **env)
{
+ axis2_http_header_t *tmp_header = NULL;
AXIS2_FUNC_PARAM_CHECK(simple_response, env, AXIS2_FAILURE);
- axis2_http_header_t *tmp_header =
- axis2_http_simple_response_get_first_header
+ tmp_header = axis2_http_simple_response_get_first_header
(simple_response, env, AXIS2_HTTP_HEADER_CONTENT_LENGTH);
if(NULL != tmp_header)
{
@@ -553,9 +570,9 @@
(axis2_http_simple_response_t *simple_response,
axis2_env_t **env)
{
+ axis2_http_header_t *tmp_header = NULL;
AXIS2_FUNC_PARAM_CHECK(simple_response, env, NULL);
- axis2_http_header_t *tmp_header =
- axis2_http_simple_response_get_first_header
+ tmp_header = axis2_http_simple_response_get_first_header
(simple_response, env, AXIS2_HTTP_HEADER_CONTENT_TYPE);
if(NULL != tmp_header)
return AXIS2_HTTP_HEADER_GET_VALUE(tmp_header, env);
@@ -621,9 +638,11 @@
{
axis2_http_simple_response_impl_t *response_impl = NULL;
axis2_stream_t *tmp_stream = NULL;
- AXIS2_FUNC_PARAM_CHECK(simple_response, env, AXIS2_FAILURE);
int return_size = -1;
+ AXIS2_FUNC_PARAM_CHECK(simple_response, env, AXIS2_FAILURE);
+
+
response_impl = AXIS2_INTF_TO_IMPL(simple_response);
if(NULL == response_impl->stream)
{
@@ -635,7 +654,7 @@
{
int read = 0;
int write = 0;
- int READ_SIZE = 32;
+ /* int READ_SIZE = 32; */
char buf[READ_SIZE];
read = AXIS2_STREAM_READ(response_impl->stream, env, buf, READ_SIZE);
if(read < 0)
Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_status_line.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/http_status_line.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/http_status_line.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/http_status_line.c Sun Feb 5 18:41:57 2006
@@ -66,17 +66,19 @@
axis2_http_status_line_t * AXIS2_CALL
axis2_http_status_line_create(axis2_env_t **env, axis2_char_t *str)
{
- AXIS2_ENV_CHECK(env, NULL);
- AXIS2_FUNC_PARAM_CHECK(str, env, NULL);
axis2_char_t *tmp_status_line = NULL;
axis2_char_t *reason_phrase = NULL;
axis2_char_t *status_code= NULL;
axis2_char_t *http_version = NULL;
int i = 0;
axis2_char_t *tmp = NULL;
+ axis2_http_status_line_impl_t *status_line_impl = NULL;
+
+ AXIS2_ENV_CHECK(env, NULL);
+ AXIS2_FUNC_PARAM_CHECK(str, env, NULL);
+
- axis2_http_status_line_impl_t *status_line_impl =
- (axis2_http_status_line_impl_t *)AXIS2_MALLOC
+ status_line_impl = (axis2_http_status_line_impl_t *)AXIS2_MALLOC
((*env)->allocator, sizeof(
axis2_http_status_line_impl_t));
@@ -188,9 +190,10 @@
axis2_http_status_line_free (axis2_http_status_line_t *status_line,
axis2_env_t **env)
{
+ axis2_http_status_line_impl_t *status_line_impl = NULL;
AXIS2_FUNC_PARAM_CHECK(status_line, env, AXIS2_FAILURE);
- axis2_http_status_line_impl_t *status_line_impl =
- AXIS2_INTF_TO_IMPL(status_line);
+ status_line_impl = AXIS2_INTF_TO_IMPL(status_line);
+
if(NULL != status_line_impl->line)
{
AXIS2_FREE((*env)->allocator, status_line_impl->line);
Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c Sun Feb 5 18:41:57 2006
@@ -116,6 +116,8 @@
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_callback_info_t callback_ctx;
axis2_hash_t *headers = NULL;
+ axis2_engine_t *engine = NULL;
+ axis2_soap_body_t *soap_body = NULL;
AXIS2_PARAM_CHECK((*env)->error, msg_ctx, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, in_stream, AXIS2_FAILURE);
@@ -283,13 +285,13 @@
*/
AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(msg_ctx, env, soap_envelope);
- axis2_engine_t *engine = NULL;
+
engine = axis2_engine_create(env, conf_ctx);
if (!soap_envelope)
return AXIS2_FAILURE;
- axis2_soap_body_t *soap_body = AXIS2_SOAP_ENVELOPE_GET_BODY(soap_envelope,
+ soap_body = AXIS2_SOAP_ENVELOPE_GET_BODY(soap_envelope,
env);
if (!soap_body)
Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c Sun Feb 5 18:41:57 2006
@@ -78,8 +78,9 @@
axis2_http_worker_t * AXIS2_CALL
axis2_http_worker_create (axis2_env_t **env, axis2_conf_ctx_t *conf_ctx)
{
+ axis2_http_worker_impl_t *http_worker_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- axis2_http_worker_impl_t *http_worker_impl = (axis2_http_worker_impl_t *)
+ http_worker_impl = (axis2_http_worker_impl_t *)
AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_http_worker_impl_t));
if(NULL == http_worker_impl)
@@ -142,6 +143,7 @@
int content_length = -1;
axis2_http_header_t *encoding_header = NULL;
axis2_char_t *encoding_header_value = NULL;
+ axis2_op_ctx_t *op_ctx = NULL;
AXIS2_FUNC_PARAM_CHECK(http_worker, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, svr_conn, AXIS2_FAILURE);
@@ -328,7 +330,7 @@
}
}
- axis2_op_ctx_t *op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
+ op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
if(NULL != op_ctx)
{
axis2_ctx_t *ctx = AXIS2_OP_CTX_GET_BASE(AXIS2_MSG_CTX_GET_OP_CTX(
Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_response_writer.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_response_writer.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_response_writer.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_response_writer.c Sun Feb 5 18:41:57 2006
@@ -100,11 +100,11 @@
axis2_http_response_writer_create_with_encoding(axis2_env_t **env,
axis2_stream_t *stream, const axis2_char_t *encoding)
{
+ axis2_http_response_writer_impl_t *response_writer_impl = NULL;
AXIS2_FUNC_PARAM_CHECK(stream, env, NULL);
AXIS2_PARAM_CHECK((*env)->error, encoding, NULL);
- axis2_http_response_writer_impl_t *response_writer_impl =
- (axis2_http_response_writer_impl_t *)AXIS2_MALLOC
+ response_writer_impl = (axis2_http_response_writer_impl_t *)AXIS2_MALLOC
((*env)->allocator, sizeof(
axis2_http_response_writer_impl_t));
@@ -281,8 +281,8 @@
(axis2_http_response_writer_t *response_writer,
axis2_env_t **env, int i)
{
+ axis2_char_t int_str[10];
AXIS2_FUNC_PARAM_CHECK(response_writer, env, AXIS2_FAILURE);
- axis2_char_t int_str[10];
sprintf(int_str, "%10d", i);
return axis2_http_response_writer_print_str(response_writer, env, int_str);
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_server.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_server.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_server.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_server.c Sun Feb 5 18:41:57 2006
@@ -71,10 +71,10 @@
AXIS2_DECLARE(axis2_transport_receiver_t *)
axis2_http_server_create (axis2_env_t **env, axis2_char_t *repo, int port)
{
+ axis2_http_server_impl_t *server_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- axis2_http_server_impl_t *server_impl =
- (axis2_http_server_impl_t *)AXIS2_MALLOC
+ server_impl = (axis2_http_server_impl_t *)AXIS2_MALLOC
((*env)->allocator, sizeof(axis2_http_server_impl_t));
if(NULL == server_impl)
Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c Sun Feb 5 18:41:57 2006
@@ -13,7 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
+#include <axis2_platform_auto_sense.h>
#include <axis2_http_svr_thread.h>
#include <axis2_http_transport.h>
#include <axis2_string.h>
@@ -23,6 +24,7 @@
#include <axis2_url.h>
+
/**
* @brief HTTP Server Thread struct impl
* Axis2 HTTP Server Thread impl
@@ -67,10 +69,10 @@
axis2_http_svr_thread_t* AXIS2_CALL
axis2_http_svr_thread_create (axis2_env_t **env, int port)
{
+ axis2_http_svr_thread_impl_t *svr_thread_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- axis2_http_svr_thread_impl_t *svr_thread_impl =
- (axis2_http_svr_thread_impl_t *)AXIS2_MALLOC
+ svr_thread_impl = (axis2_http_svr_thread_impl_t *)AXIS2_MALLOC
((*env)->allocator, sizeof(
axis2_http_svr_thread_impl_t));
@@ -155,7 +157,7 @@
while(AXIS2_FALSE == svr_thread_impl->stopped)
{
int socket = -1;
- struct AXIS2_PLATFORM_TIMEB t1, t2;
+ struct AXIS2_PLATFORM_TIMEB t1, t2;
axis2_simple_http_svr_conn_t *svr_conn = NULL;
axis2_http_simple_request_t *request = NULL;
int millisecs = 0;
Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/simple_http_svr_conn.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/receiver/simple_http_svr_conn.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/simple_http_svr_conn.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/simple_http_svr_conn.c Sun Feb 5 18:41:57 2006
@@ -99,11 +99,11 @@
axis2_simple_http_svr_conn_t* AXIS2_CALL
axis2_simple_http_svr_conn_create (axis2_env_t **env, int sockfd)
{
+ axis2_simple_http_svr_conn_impl_t *svr_conn_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- axis2_simple_http_svr_conn_impl_t *svr_conn_impl =
- (axis2_simple_http_svr_conn_impl_t *)
- AXIS2_MALLOC ((*env)->allocator,
- sizeof(axis2_simple_http_svr_conn_impl_t));
+ svr_conn_impl = (axis2_simple_http_svr_conn_impl_t *)
+ AXIS2_MALLOC ((*env)->allocator,
+ sizeof(axis2_simple_http_svr_conn_impl_t));
if(NULL == svr_conn_impl)
{
@@ -182,9 +182,9 @@
axis2_simple_http_svr_conn_close(axis2_simple_http_svr_conn_t *svr_conn,
axis2_env_t **env)
{
+ axis2_simple_http_svr_conn_impl_t *svr_conn_impl = NULL;
AXIS2_FUNC_PARAM_CHECK(svr_conn, env, AXIS2_FAILURE);
- axis2_simple_http_svr_conn_impl_t *svr_conn_impl =
- AXIS2_INTF_TO_IMPL(svr_conn);
+ svr_conn_impl = AXIS2_INTF_TO_IMPL(svr_conn);
AXIS2_STREAM_FREE(svr_conn_impl->stream, env);
if(-1 != svr_conn_impl->socket)
@@ -200,9 +200,9 @@
axis2_simple_http_svr_conn_is_open(axis2_simple_http_svr_conn_t *svr_conn,
axis2_env_t **env)
{
+ axis2_simple_http_svr_conn_impl_t *svr_conn_impl = NULL;
AXIS2_FUNC_PARAM_CHECK(svr_conn, env, AXIS2_FAILURE);
- axis2_simple_http_svr_conn_impl_t *svr_conn_impl =
- AXIS2_INTF_TO_IMPL(svr_conn);
+ svr_conn_impl = AXIS2_INTF_TO_IMPL(svr_conn);
if(-1 != svr_conn_impl->socket)
{
return AXIS2_TRUE;
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c Sun Feb 5 18:41:57 2006
@@ -73,10 +73,10 @@
AXIS2_DECLARE(axis2_http_client_t *)
axis2_http_client_create (axis2_env_t **env, axis2_url_t *url)
{
+ axis2_http_client_impl_t *http_client_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- axis2_http_client_impl_t *http_client_impl =
- (axis2_http_client_impl_t *)AXIS2_MALLOC
+ http_client_impl = (axis2_http_client_impl_t *)AXIS2_MALLOC
((*env)->allocator, sizeof(axis2_http_client_impl_t));
if(NULL == http_client_impl)
@@ -121,8 +121,10 @@
axis2_status_t AXIS2_CALL
axis2_http_client_free (axis2_http_client_t *client, axis2_env_t **env)
{
+ axis2_http_client_impl_t *http_client_impl = NULL;
AXIS2_FUNC_PARAM_CHECK(client, env, AXIS2_FAILURE);
- axis2_http_client_impl_t *http_client_impl = AXIS2_INTF_TO_IMPL(client);
+ http_client_impl = AXIS2_INTF_TO_IMPL(client);
+
if(NULL != http_client_impl->url)
{
AXIS2_URL_FREE(http_client_impl->url, env);
@@ -164,9 +166,10 @@
int body_size = 0;
int written = 0;
axis2_status_t status = AXIS2_FAILURE;
+ axis2_bool_t chunking_enabled = AXIS2_FALSE;
+
AXIS2_FUNC_PARAM_CHECK(client, env, AXIS2_FAILURE);
client_impl = AXIS2_INTF_TO_IMPL(client);
- axis2_bool_t chunking_enabled = AXIS2_FALSE;
if(NULL == client_impl->url)
{
@@ -210,6 +213,7 @@
char *str_header2 = NULL;
for(i = 0; i < header_count; i++)
{
+ axis2_char_t *header_ext_form = NULL;
axis2_http_header_t *tmp_header = (axis2_http_header_t*)
AXIS2_ARRAY_LIST_GET(headers, env, i);
if(NULL == tmp_header)
@@ -225,7 +229,7 @@
{
chunking_enabled = AXIS2_TRUE;
}
- axis2_char_t *header_ext_form = AXIS2_HTTP_HEADER_TO_EXTERNAL_FORM(
+ header_ext_form = AXIS2_HTTP_HEADER_TO_EXTERNAL_FORM(
tmp_header, env);
str_header2 = AXIS2_STRACAT(str_header, header_ext_form, env);
AXIS2_FREE((*env)->allocator, str_header);
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c Sun Feb 5 18:41:57 2006
@@ -81,12 +81,12 @@
axis2_transport_sender_t* AXIS2_CALL
axis2_http_transport_sender_create(axis2_env_t **env)
{
+ axis2_http_transport_sender_impl_t *transport_sender_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- axis2_http_transport_sender_impl_t *transport_sender_impl =
- (axis2_http_transport_sender_impl_t *)AXIS2_MALLOC
- ((*env)->allocator, sizeof(
- axis2_http_transport_sender_impl_t));
+ transport_sender_impl = (axis2_http_transport_sender_impl_t *)AXIS2_MALLOC
+ ((*env)->allocator, sizeof(
+ axis2_http_transport_sender_impl_t));
if(NULL == transport_sender_impl)
{
@@ -127,9 +127,9 @@
(axis2_transport_sender_t *transport_sender,
axis2_env_t **env)
{
+ axis2_http_transport_sender_impl_t *transport_sender_impl = NULL;
AXIS2_FUNC_PARAM_CHECK(transport_sender, env, AXIS2_FAILURE);
- axis2_http_transport_sender_impl_t *transport_sender_impl =
- AXIS2_INTF_TO_IMPL(transport_sender);
+ transport_sender_impl = AXIS2_INTF_TO_IMPL(transport_sender);
if(NULL != transport_sender->ops)
AXIS2_FREE((*env)->allocator, transport_sender->ops);
@@ -151,6 +151,7 @@
axis2_om_output_t *om_output = NULL;
axis2_char_t *buffer = NULL;
axis2_soap_envelope_t *soap_data_out = NULL;
+ axis2_bool_t do_mtom;
AXIS2_FUNC_PARAM_CHECK(transport_sender, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, msg_ctx, AXIS2_FAILURE);
@@ -180,7 +181,7 @@
char_set_enc = AXIS2_DEFAULT_CHAR_SET_ENCODING;
}
- axis2_bool_t do_mtom = axis2_http_transport_utils_do_write_mtom(env,
+ do_mtom = axis2_http_transport_utils_do_write_mtom(env,
msg_ctx);
AXIS2_MSG_CTX_SET_DOING_MTOM(msg_ctx, env, do_mtom);
AXIS2_MSG_CTX_SET_DOING_REST(msg_ctx,
@@ -417,7 +418,7 @@
{
axis2_char_t *soap_action = NULL;
axis2_char_t *url = NULL;
-
+ axis2_soap_over_http_sender_t *sender = NULL;
AXIS2_FUNC_PARAM_CHECK(transport_sender, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, msg_ctx, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, epr, AXIS2_FAILURE);
@@ -444,8 +445,8 @@
* soap_action);
* }
*/
- axis2_soap_over_http_sender_t *sender = axis2_soap_over_http_sender_create
- (env);
+ sender = axis2_soap_over_http_sender_create(env);
+
if(NULL == sender)
{
return AXIS2_FAILURE;
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.c Sun Feb 5 18:41:57 2006
@@ -89,10 +89,10 @@
axis2_soap_over_http_sender_t * AXIS2_CALL
axis2_soap_over_http_sender_create(axis2_env_t **env)
{
+ axis2_soap_over_http_sender_impl_t *sender_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- axis2_soap_over_http_sender_impl_t *sender_impl =
- (axis2_soap_over_http_sender_impl_t *)AXIS2_MALLOC
+ sender_impl = (axis2_soap_over_http_sender_impl_t *)AXIS2_MALLOC
((*env)->allocator, sizeof(
axis2_soap_over_http_sender_impl_t));
@@ -137,9 +137,10 @@
axis2_soap_over_http_sender_free (axis2_soap_over_http_sender_t *sender,
axis2_env_t **env)
{
+ axis2_soap_over_http_sender_impl_t *sender_impl = NULL;
AXIS2_FUNC_PARAM_CHECK(sender, env, AXIS2_FAILURE);
- axis2_soap_over_http_sender_impl_t *sender_impl =
- AXIS2_INTF_TO_IMPL(sender);
+
+ sender_impl = AXIS2_INTF_TO_IMPL(sender);
if(NULL != sender_impl->http_version)
{
AXIS2_FREE((*env)->allocator, sender_impl->http_version);
Modified: webservices/axis2/trunk/c/modules/core/transport/http/url.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/url.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/url.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/url.c Sun Feb 5 18:41:57 2006
@@ -70,11 +70,11 @@
axis2_url_create (axis2_env_t **env, axis2_char_t *protocol,
axis2_char_t *server, int port, axis2_char_t *path)
{
+ axis2_url_impl_t *url_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK((*env)->error, protocol, NULL);
- axis2_url_impl_t *url_impl =
- (axis2_url_impl_t *)AXIS2_MALLOC ((*env)->allocator,
+ url_impl = (axis2_url_impl_t *)AXIS2_MALLOC ((*env)->allocator,
sizeof(axis2_url_impl_t));
if(NULL == url_impl)
@@ -259,8 +259,9 @@
axis2_status_t AXIS2_CALL
axis2_url_free (axis2_url_t *url, axis2_env_t **env)
{
+ axis2_url_impl_t *url_impl = NULL;
AXIS2_FUNC_PARAM_CHECK(url, env, AXIS2_FAILURE);
- axis2_url_impl_t *url_impl = AXIS2_INTF_TO_IMPL(url);
+ url_impl = AXIS2_INTF_TO_IMPL(url);
if(NULL != url_impl->protocol)
{
AXIS2_FREE((*env)->allocator, url_impl->protocol);
@@ -289,12 +290,15 @@
axis2_url_to_external_form (axis2_url_t *url,
axis2_env_t **env)
{
+ axis2_url_impl_t *url_impl = NULL;
+ axis2_char_t *external_form = NULL;
+ axis2_ssize_t len = 0;
AXIS2_FUNC_PARAM_CHECK(url, env, NULL);
- axis2_url_impl_t *url_impl = AXIS2_INTF_TO_IMPL(url);
- axis2_ssize_t len = AXIS2_STRLEN(url_impl->protocol) +
- AXIS2_STRLEN(url_impl->server) + AXIS2_STRLEN(url_impl->path) +
+ url_impl = AXIS2_INTF_TO_IMPL(url);
+ len = AXIS2_STRLEN(url_impl->protocol) +
+ AXIS2_STRLEN(url_impl->server) + AXIS2_STRLEN(url_impl->path) +
7; /* port number is maximum 5 digits */
- axis2_char_t *external_form = (axis2_char_t*) AXIS2_MALLOC((*env)->allocator,
+ external_form = (axis2_char_t*) AXIS2_MALLOC((*env)->allocator,
len);
sprintf(external_form, "%s://%s:%d%s", url_impl->protocol, url_impl->server,
url_impl->port, url_impl->path);
Modified: webservices/axis2/trunk/c/modules/core/util/core_utils.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/util/core_utils.c?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/util/core_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/util/core_utils.c Sun Feb 5 18:41:57 2006
@@ -21,7 +21,7 @@
#include <axis2_addr.h>
#include <axis2_http_transport.h>
-axis2_msg_ctx_t *AXIS2_CALL
+AXIS2_DECLARE(axis2_msg_ctx_t *)
axis2_core_utils_create_out_msg_ctx(axis2_env_t **env,
axis2_msg_ctx_t *in_msg_ctx)
{
Modified: webservices/axis2/trunk/c/modules/platforms/windows/axis2_windows.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/platforms/windows/axis2_windows.h?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/platforms/windows/axis2_windows.h (original)
+++ webservices/axis2/trunk/c/modules/platforms/windows/axis2_windows.h Sun Feb 5 18:41:57 2006
@@ -48,7 +48,8 @@
/*for network handling*/
#include <winsock2.h>
-
+/* for time */
+#include <time.h>
/***************************************************************
* Default paths to shared library/DLLs and files
@@ -62,11 +63,15 @@
#define AXIS2_PLATFORM_CHANNEL_PATH "http_channel.dll"
#define AXIS2_PLATFORM_SSLCHANNEL_PATH "Unknown"
-#define AXIS2_PLATFORM_LOG_PATH ""
-#define AXIS2_PLATFORM_CLIENTLOG_PATH ""
-#define AXIS2_PLATFORM_CONFIG_PATH ""
-#define AXIS2_PLATFORM_SECUREINFO ""
-
+#define AXIS2_PLATFORM_LOG_PATH "" /*/usr/local/axis2/log/axis2_log*/
+#define AXIS2_PLATFORM_CLIENTLOG_PATH "" /* /usr/local/axis2/log/axis2_client_log*/
+#define AXIS2_PLATFORM_CONFIG_PATH "" /* /etc/axiscpp.conf */
+#define AXIS2_PLATFORM_SECUREINFO ""
+
+/**
+ * Resource that contains the configuration
+ */
+#define AXIS2_CONFIGURATION_RESOURCE "" /* should be set */
// =============================================================
// Library loading and procedure resolution
@@ -96,6 +101,9 @@
// =============================================================
// Miscellaneous
// =============================================================
+
+#define AXIS2_STRRCHR(x, y) (strrchr(x, y))
+
#define AXIS2_PLATFORM_SLEEP(x) Sleep(0);
/**
@@ -143,7 +151,6 @@
*/
#define AXIS2_PLATFORM_GET_TIME_IN_MILLIS _ftime
#define AXIS2_PLATFORM_TIMEB timeb
-
/**
* Platform specific file handling
*/
@@ -151,7 +158,7 @@
#define AXIS2_R_OK 04 /* test for read permission */
#define AXIS2_W_OK 02 /* test for write permission */
#define AXIS2_X_OK 00 /* test for execute or search permission */
-/*#define AXIS2_F_OK F_OK*/ /* test whether the directories leading to the file can be
+#define AXIS2_F_OK 01 /* test whether the directories leading to the file can be
searched and the file exists */
/**
* windows specific directory handling functions
Modified: webservices/axis2/trunk/c/modules/util/axis2_hash.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/axis2_hash.h?rev=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/axis2_hash.h (original)
+++ webservices/axis2/trunk/c/modules/util/axis2_hash.h Sun Feb 5 18:41:57 2006
@@ -175,7 +175,7 @@
* @param ht The hash table
* @return The number of key/value pairs in the hash table.
*/
- unsigned int axis2_hash_count (axis2_hash_t *ht);
+ AXIS2_DECLARE( unsigned int ) axis2_hash_count (axis2_hash_t *ht);
/**
* Merge two hash tables into one new hash table. The values of the overlay