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 sa...@apache.org on 2006/06/04 05:09:41 UTC
svn commit: r411506 [11/27] - in /webservices/axis2/trunk/c: axiom/include/
axiom/src/attachments/ axiom/src/om/ axiom/src/parser/guththila/
axiom/src/parser/libxml2/ axiom/src/soap/ axiom/test/om/ axiom/test/soap/
guththila/src/ include/ modules/core/...
Modified: webservices/axis2/trunk/c/modules/core/description/svc_grp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/svc_grp.c?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/svc_grp.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/svc_grp.c Sat Jun 3 20:09:08 2006
@@ -22,16 +22,16 @@
*/
typedef struct axis2_svc_grp_impl
{
- axis2_svc_grp_t svc_grp;
- axis2_char_t *svc_grp_name;
- axis2_hash_t *svcs;
+ axis2_svc_grp_t svc_grp;
+ axis2_char_t *svc_grp_name;
+ axis2_hash_t *svcs;
/** to store service Group modules name */
axis2_array_list_t *modules;
/** to store module ref at deploy time parsing */
axis2_conf_t *parent;
axis2_array_list_t *module_list;
-
+
} axis2_svc_grp_impl_t;
#define AXIS2_INTF_TO_IMPL(svc_grp) ((axis2_svc_grp_impl_t *)svc_grp)
@@ -45,7 +45,7 @@
axis2_status_t AXIS2_CALL
axis2_svc_grp_set_svc_grp_name (axis2_svc_grp_t *svc_grp,
const axis2_env_t *env,
- axis2_char_t *name);
+ axis2_char_t *name);
axis2_char_t * AXIS2_CALL
axis2_svc_grp_get_svc_grp_name (axis2_svc_grp_t *svc_grp,
@@ -54,12 +54,12 @@
axis2_status_t AXIS2_CALL
axis2_svc_grp_add_svc (axis2_svc_grp_t* svc_grp,
const axis2_env_t *env,
- axis2_svc_t *svc);
+ axis2_svc_t *svc);
axis2_svc_t * AXIS2_CALL
axis2_svc_grp_get_svc (axis2_svc_grp_t *svc_grp,
const axis2_env_t *env,
- axis2_qname_t* svc_name);
+ axis2_qname_t* svc_name);
axis2_hash_t *AXIS2_CALL
axis2_svc_grp_get_svcs(axis2_svc_grp_t *svc_grp,
@@ -68,27 +68,27 @@
axis2_status_t AXIS2_CALL
axis2_svc_grp_remove_svc (axis2_svc_grp_t *svc_grp,
const axis2_env_t *env,
- axis2_qname_t* svc_name);
-
+ axis2_qname_t* svc_name);
+
axis2_status_t AXIS2_CALL
axis2_svc_grp_add_param (axis2_svc_grp_t *svc_grp,
const axis2_env_t *env,
- axis2_param_t *param);
-
+ axis2_param_t *param);
+
axis2_param_t * AXIS2_CALL
axis2_svc_grp_get_param(axis2_svc_grp_t *svc_grp,
const axis2_env_t *env,
- const axis2_char_t *name);
-
+ const axis2_char_t *name);
+
axis2_array_list_t * AXIS2_CALL
axis2_svc_grp_get_params (axis2_svc_grp_t *svc_grp,
const axis2_env_t *env);
-
+
axis2_bool_t AXIS2_CALL
axis2_svc_grp_is_param_locked(axis2_svc_grp_t *svc_grp,
const axis2_env_t *env,
- axis2_char_t *param_name);
+ axis2_char_t *param_name);
axis2_status_t AXIS2_CALL
axis2_svc_grp_add_module(axis2_svc_grp_t *svc_grp,
@@ -144,14 +144,14 @@
axis2_svc_grp_impl_t *svc_grp_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
svc_grp_impl = (axis2_svc_grp_impl_t *)
- AXIS2_MALLOC (env->allocator, sizeof(axis2_svc_grp_impl_t));
+ AXIS2_MALLOC (env->allocator, sizeof(axis2_svc_grp_impl_t));
- if(NULL == svc_grp_impl)
+ if(NULL == svc_grp_impl)
{
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
-
+
svc_grp_impl->svc_grp.param_container = NULL;
svc_grp_impl->modules = NULL;
svc_grp_impl->svcs = NULL;
@@ -184,34 +184,34 @@
return NULL;
}
- svc_grp_impl->svcs = axis2_hash_make (env);
- if(NULL == svc_grp_impl->svcs)
+ svc_grp_impl->svcs = axis2_hash_make (env);
+ if(NULL == svc_grp_impl->svcs)
{
axis2_svc_grp_free(&(svc_grp_impl->svc_grp), env);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
svc_grp_impl->svc_grp.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_svc_grp_ops_t));
- if(NULL == svc_grp_impl->svc_grp.ops)
- {
+ if(NULL == svc_grp_impl->svc_grp.ops)
+ {
AXIS2_FREE(env->allocator, svc_grp_impl);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
- }
+ }
- svc_grp_impl->svc_grp.ops->free = axis2_svc_grp_free;
- svc_grp_impl->svc_grp.ops->set_svc_grp_name = axis2_svc_grp_set_svc_grp_name;
- svc_grp_impl->svc_grp.ops->get_svc_grp_name = axis2_svc_grp_get_svc_grp_name;
- svc_grp_impl->svc_grp.ops->add_svc = axis2_svc_grp_add_svc;
- svc_grp_impl->svc_grp.ops->get_svc = axis2_svc_grp_get_svc;
+ svc_grp_impl->svc_grp.ops->free = axis2_svc_grp_free;
+ svc_grp_impl->svc_grp.ops->set_svc_grp_name = axis2_svc_grp_set_svc_grp_name;
+ svc_grp_impl->svc_grp.ops->get_svc_grp_name = axis2_svc_grp_get_svc_grp_name;
+ svc_grp_impl->svc_grp.ops->add_svc = axis2_svc_grp_add_svc;
+ svc_grp_impl->svc_grp.ops->get_svc = axis2_svc_grp_get_svc;
svc_grp_impl->svc_grp.ops->get_svcs = axis2_svc_grp_get_svcs;
- svc_grp_impl->svc_grp.ops->remove_svc = axis2_svc_grp_remove_svc;
- svc_grp_impl->svc_grp.ops->add_param = axis2_svc_grp_add_param;
- svc_grp_impl->svc_grp.ops->get_param = axis2_svc_grp_get_param;
- svc_grp_impl->svc_grp.ops->get_params = axis2_svc_grp_get_params;
- svc_grp_impl->svc_grp.ops->is_param_locked = axis2_svc_grp_is_param_locked;
+ svc_grp_impl->svc_grp.ops->remove_svc = axis2_svc_grp_remove_svc;
+ svc_grp_impl->svc_grp.ops->add_param = axis2_svc_grp_add_param;
+ svc_grp_impl->svc_grp.ops->get_param = axis2_svc_grp_get_param;
+ svc_grp_impl->svc_grp.ops->get_params = axis2_svc_grp_get_params;
+ svc_grp_impl->svc_grp.ops->is_param_locked = axis2_svc_grp_is_param_locked;
svc_grp_impl->svc_grp.ops->add_module = axis2_svc_grp_add_module;
svc_grp_impl->svc_grp.ops->get_parent = axis2_svc_grp_get_parent;
svc_grp_impl->svc_grp.ops->set_parent = axis2_svc_grp_set_parent;
@@ -221,9 +221,9 @@
svc_grp_impl->svc_grp.ops->set_axis_desc = axis2_svc_grp_set_axis_desc;
svc_grp_impl->svc_grp.ops->add_moduleref = axis2_svc_grp_add_moduleref;
svc_grp_impl->svc_grp.ops->get_modules = axis2_svc_grp_get_modules;
- svc_grp_impl->svc_grp.ops->get_svc_grp_ctx = axis2_svc_grp_get_svc_grp_ctx;
+ svc_grp_impl->svc_grp.ops->get_svc_grp_ctx = axis2_svc_grp_get_svc_grp_ctx;
- return &(svc_grp_impl->svc_grp);
+ return &(svc_grp_impl->svc_grp);
}
AXIS2_EXTERN axis2_svc_grp_t * AXIS2_CALL
@@ -256,11 +256,11 @@
if(NULL != svc_grp->ops)
{
- AXIS2_FREE(env->allocator, svc_grp->ops);
+ AXIS2_FREE(env->allocator, svc_grp->ops);
svc_grp->ops = NULL;
}
- if(NULL != svc_grp->param_container)
+ if(NULL != svc_grp->param_container)
{
AXIS2_PARAM_CONTAINER_FREE(svc_grp->param_container,
env);
@@ -294,32 +294,32 @@
if(NULL != svc_grp_impl)
{
- AXIS2_FREE(env->allocator, svc_grp_impl);
+ AXIS2_FREE(env->allocator, svc_grp_impl);
svc_grp_impl = NULL;
}
- return AXIS2_SUCCESS;
+ return AXIS2_SUCCESS;
}
axis2_status_t AXIS2_CALL
axis2_svc_grp_set_svc_grp_name (axis2_svc_grp_t *svc_grp,
const axis2_env_t *env,
- axis2_char_t *name)
+ axis2_char_t *name)
{
axis2_svc_grp_impl_t *svc_grp_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
svc_grp_impl = AXIS2_INTF_TO_IMPL(svc_grp);
-
+
if(svc_grp_impl->svc_grp_name)
AXIS2_FREE(env->allocator, svc_grp_impl->svc_grp_name);
- svc_grp_impl->svc_grp_name = AXIS2_STRDUP(name, env);
+ svc_grp_impl->svc_grp_name = AXIS2_STRDUP(name, env);
if(!svc_grp_impl->svc_grp_name)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- return AXIS2_SUCCESS;
+ return AXIS2_SUCCESS;
}
axis2_char_t * AXIS2_CALL
@@ -327,14 +327,14 @@
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
-
- return AXIS2_INTF_TO_IMPL(svc_grp)->svc_grp_name;
+
+ return AXIS2_INTF_TO_IMPL(svc_grp)->svc_grp_name;
}
axis2_status_t AXIS2_CALL
axis2_svc_grp_add_svc (axis2_svc_grp_t *svc_grp,
const axis2_env_t *env,
- axis2_svc_t *svc)
+ axis2_svc_t *svc)
{
axis2_svc_grp_impl_t *svc_grp_impl = NULL;
axis2_phase_resolver_t *handler_resolver = NULL;
@@ -344,7 +344,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, svc, AXIS2_FAILURE);
-
+
svc_grp_impl = AXIS2_INTF_TO_IMPL(svc_grp);
if(!svc_grp_impl->svcs)
@@ -355,7 +355,7 @@
}
svc_qname = AXIS2_SVC_GET_QNAME(svc, env);
svc_name = AXIS2_QNAME_TO_STRING(svc_qname, env);
- axis2_hash_set (svc_grp_impl->svcs, svc_name, AXIS2_HASH_KEY_STRING, svc);
+ axis2_hash_set (svc_grp_impl->svcs, svc_name, AXIS2_HASH_KEY_STRING, svc);
handler_resolver = axis2_phase_resolver_create_with_config_and_svc(env,
svc_grp_impl->parent, svc);
@@ -396,7 +396,7 @@
return status;
}
- AXIS2_PHASE_RESOLVER_FREE(handler_resolver, env);
+ AXIS2_PHASE_RESOLVER_FREE(handler_resolver, env);
return status;
}
@@ -428,13 +428,13 @@
axis2_status_t AXIS2_CALL
axis2_svc_grp_remove_svc (axis2_svc_grp_t *svc_grp,
const axis2_env_t *env,
- axis2_qname_t* svc_qname)
+ axis2_qname_t* svc_qname)
{
axis2_svc_t *svc = NULL;
axis2_char_t *svc_name = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, svc_name, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, svc_name, AXIS2_FAILURE);
svc = axis2_svc_grp_get_svc(svc_grp, env, svc_qname);
if (NULL != svc)
@@ -442,10 +442,10 @@
/*this.parent.notifyObservers(AxisEvent.SERVICE_DEPLOY , service);*/
}
svc_name = AXIS2_QNAME_TO_STRING(svc_qname, env);
- axis2_hash_set (AXIS2_INTF_TO_IMPL(svc_grp)->svcs, svc_name,
+ axis2_hash_set (AXIS2_INTF_TO_IMPL(svc_grp)->svcs, svc_name,
AXIS2_HASH_KEY_STRING, NULL);
-
- return AXIS2_SUCCESS;
+
+ return AXIS2_SUCCESS;
}
axis2_status_t AXIS2_CALL
@@ -471,17 +471,17 @@
axis2_param_t * AXIS2_CALL
axis2_svc_grp_get_param (axis2_svc_grp_t *svc_grp,
const axis2_env_t *env,
- const axis2_char_t *name)
+ const axis2_char_t *name)
{
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, name, NULL);
- if(NULL == svc_grp->param_container)
+ if(NULL == svc_grp->param_container)
{
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_STATE_PARAM_CONTAINER,
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_STATE_PARAM_CONTAINER,
AXIS2_FAILURE);
return NULL;
}
-
+
return AXIS2_PARAM_CONTAINER_GET_PARAM(svc_grp->param_container, env, name);
}
@@ -490,9 +490,9 @@
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
-
- return AXIS2_PARAM_CONTAINER_GET_PARAMS(svc_grp->param_container, env);
-
+
+ return AXIS2_PARAM_CONTAINER_GET_PARAMS(svc_grp->param_container, env);
+
}
axis2_bool_t AXIS2_CALL
Modified: webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c?rev=411506&r1=411505&r2=411506&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 Sat Jun 3 20:09:08 2006
@@ -24,7 +24,7 @@
*/
typedef struct axis2_transport_in_desc_impl
{
- axis2_transport_in_desc_t transport_in;
+ axis2_transport_in_desc_t transport_in;
/**
* Field flowInclude
* This will have a shallow copy and will not be freed by the descructor
@@ -58,7 +58,7 @@
axis2_status_t AXIS2_CALL
axis2_transport_in_desc_free (
axis2_transport_in_desc_t *transport_in,
- const axis2_env_t *env);
+ const axis2_env_t *env);
axis2_qname_t *AXIS2_CALL
axis2_transport_in_desc_get_qname(axis2_transport_in_desc_t *transport_in,
@@ -143,8 +143,8 @@
transport_in_impl = (axis2_transport_in_desc_impl_t *) AXIS2_MALLOC(env->
allocator, sizeof(axis2_transport_in_desc_impl_t));
-
- if(NULL == transport_in_impl)
+
+ if(NULL == transport_in_impl)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -169,24 +169,24 @@
transport_in_impl->qname = AXIS2_QNAME_CLONE(qname, env);
- transport_in_impl->transport_in.ops =
- AXIS2_MALLOC (env->allocator, sizeof(axis2_transport_in_desc_ops_t));
- if(NULL == transport_in_impl->transport_in.ops)
+ transport_in_impl->transport_in.ops =
+ AXIS2_MALLOC (env->allocator, sizeof(axis2_transport_in_desc_ops_t));
+ if(NULL == transport_in_impl->transport_in.ops)
{
axis2_transport_in_desc_free(&(transport_in_impl->transport_in), env);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
transport_in_impl->transport_in.ops->free = axis2_transport_in_desc_free;
- transport_in_impl->transport_in.ops->get_qname =
+ transport_in_impl->transport_in.ops->get_qname =
axis2_transport_in_desc_get_qname;
- transport_in_impl->transport_in.ops->set_qname =
+ transport_in_impl->transport_in.ops->set_qname =
axis2_transport_in_desc_set_qname;
- transport_in_impl->transport_in.ops->get_inflow =
+ transport_in_impl->transport_in.ops->get_inflow =
axis2_transport_in_desc_get_inflow;
- transport_in_impl->transport_in.ops->set_inflow =
+ transport_in_impl->transport_in.ops->set_inflow =
axis2_transport_in_desc_set_inflow;
transport_in_impl->transport_in.ops->get_faultflow =
axis2_transport_in_desc_get_faultflow;
@@ -211,7 +211,7 @@
transport_in_impl->transport_in.ops->is_param_locked =
axis2_transport_in_desc_is_param_locked;
- return &(transport_in_impl->transport_in);
+ return &(transport_in_impl->transport_in);
}
/***************************Function implementation****************************/
@@ -232,7 +232,7 @@
transport_in_impl->recv = NULL;
}
- if(NULL != transport_in->ops)
+ if(NULL != transport_in->ops)
{
AXIS2_FREE(env->allocator, transport_in->ops);
transport_in->ops = NULL;
@@ -276,7 +276,7 @@
AXIS2_FREE(env->allocator, transport_in_impl);
- return AXIS2_SUCCESS;
+ return AXIS2_SUCCESS;
}
axis2_qname_t *AXIS2_CALL
Modified: webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c?rev=411506&r1=411505&r2=411506&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 Sat Jun 3 20:09:08 2006
@@ -23,7 +23,7 @@
*/
typedef struct axis2_transport_out_desc_impl
{
- axis2_transport_out_desc_t transport_out;
+ axis2_transport_out_desc_t transport_out;
/**
* Field flowInclude
@@ -64,7 +64,7 @@
axis2_status_t AXIS2_CALL
axis2_transport_out_desc_free (
axis2_transport_out_desc_t *transport_out,
- const axis2_env_t *env);
+ const axis2_env_t *env);
axis2_qname_t *AXIS2_CALL
axis2_transport_out_desc_get_qname(axis2_transport_out_desc_t *transport_out,
@@ -143,13 +143,13 @@
{
axis2_transport_out_desc_impl_t *transport_out_impl = NULL;
- AXIS2_ENV_CHECK(env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, qname, NULL);
-
- transport_out_impl = (axis2_transport_out_desc_impl_t *) AXIS2_MALLOC(env->
+
+ transport_out_impl = (axis2_transport_out_desc_impl_t *) AXIS2_MALLOC(env->
allocator, sizeof(axis2_transport_out_desc_impl_t));
-
- if(NULL == transport_out_impl)
+
+ if(NULL == transport_out_impl)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -174,24 +174,24 @@
transport_out_impl->qname = AXIS2_QNAME_CLONE(qname, env);
- transport_out_impl->transport_out.ops =
- AXIS2_MALLOC (env->allocator, sizeof(axis2_transport_out_desc_ops_t));
- if(NULL == transport_out_impl->transport_out.ops)
+ transport_out_impl->transport_out.ops =
+ AXIS2_MALLOC (env->allocator, sizeof(axis2_transport_out_desc_ops_t));
+ if(NULL == transport_out_impl->transport_out.ops)
{
axis2_transport_out_desc_free(&(transport_out_impl->transport_out), env);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
transport_out_impl->transport_out.ops->free = axis2_transport_out_desc_free;
- transport_out_impl->transport_out.ops->get_qname =
+ transport_out_impl->transport_out.ops->get_qname =
axis2_transport_out_desc_get_qname;
- transport_out_impl->transport_out.ops->set_qname =
+ transport_out_impl->transport_out.ops->set_qname =
axis2_transport_out_desc_set_qname;
- transport_out_impl->transport_out.ops->get_outflow =
+ transport_out_impl->transport_out.ops->get_outflow =
axis2_transport_out_desc_get_outflow;
- transport_out_impl->transport_out.ops->set_outflow =
+ transport_out_impl->transport_out.ops->set_outflow =
axis2_transport_out_desc_set_outflow;
transport_out_impl->transport_out.ops->get_faultflow =
axis2_transport_out_desc_get_faultflow;
@@ -216,7 +216,7 @@
transport_out_impl->transport_out.ops->is_param_locked =
axis2_transport_out_desc_is_param_locked;
- return &(transport_out_impl->transport_out);
+ return &(transport_out_impl->transport_out);
}
/***************************Function implementation****************************/
@@ -237,7 +237,7 @@
transport_out_impl->sender = NULL;
}
- if(NULL != transport_out->ops)
+ if(NULL != transport_out->ops)
{
AXIS2_FREE(env->allocator, transport_out->ops);
transport_out->ops = NULL;
@@ -281,7 +281,7 @@
AXIS2_FREE(env->allocator, transport_out_impl);
- return AXIS2_SUCCESS;
+ return AXIS2_SUCCESS;
}
axis2_qname_t *AXIS2_CALL
Modified: webservices/axis2/trunk/c/modules/core/engine/axis2_engine.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/axis2_engine.h?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/axis2_engine.h (original)
+++ webservices/axis2/trunk/c/modules/core/engine/axis2_engine.h Sat Jun 3 20:09:08 2006
@@ -186,7 +186,7 @@
/**
* @brief Message Context struct
- * Axis2 Message Context
+ * Axis2 Message Context
*/
struct axis2_engine
{
Modified: webservices/axis2/trunk/c/modules/core/engine/axis2_event.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/axis2_event.h?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/axis2_event.h (original)
+++ webservices/axis2/trunk/c/modules/core/engine/axis2_event.h Sat Jun 3 20:09:08 2006
@@ -68,7 +68,7 @@
/**
* @brief Message Context struct
- * Axis2 Message Context
+ * Axis2 Message Context
*/
struct axis2_event
{
Modified: webservices/axis2/trunk/c/modules/core/engine/conf.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/conf.c?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/conf.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/conf.c Sat Jun 3 20:09:08 2006
@@ -30,7 +30,7 @@
*/
struct axis2_conf_impl
{
- axis2_conf_t conf;
+ axis2_conf_t conf;
axis2_hash_t *svc_grps;
axis2_hash_t *transports_in;
axis2_hash_t *transports_out;
@@ -73,12 +73,12 @@
axis2_status_t AXIS2_CALL
axis2_conf_add_svc_grp (axis2_conf_t *conf,
const axis2_env_t *env,
- axis2_svc_grp_t *svc_grp);
+ axis2_svc_grp_t *svc_grp);
axis2_svc_grp_t * AXIS2_CALL
axis2_conf_get_svc_grp (axis2_conf_t *conf,
const axis2_env_t *env,
- axis2_char_t *svc_grp_name);
+ axis2_char_t *svc_grp_name);
axis2_hash_t * AXIS2_CALL
axis2_conf_get_svc_grps(axis2_conf_t *conf,
@@ -87,7 +87,7 @@
axis2_status_t AXIS2_CALL
axis2_conf_add_svc (axis2_conf_t *conf,
const axis2_env_t *env,
- axis2_svc_t *svc);
+ axis2_svc_t *svc);
axis2_svc_t * AXIS2_CALL
axis2_conf_get_svc (axis2_conf_t *conf,
@@ -97,7 +97,7 @@
axis2_status_t AXIS2_CALL
axis2_conf_remove_svc (axis2_conf_t *conf,
const axis2_env_t *env,
- const axis2_char_t *name);
+ const axis2_char_t *name);
axis2_status_t AXIS2_CALL
axis2_conf_add_param (axis2_conf_t *conf,
@@ -107,7 +107,7 @@
axis2_param_t * AXIS2_CALL
axis2_conf_get_param (axis2_conf_t *conf,
const axis2_env_t *env,
- const axis2_char_t *name);
+ const axis2_char_t *name);
axis2_array_list_t * AXIS2_CALL
axis2_conf_get_params (axis2_conf_t *conf,
@@ -116,7 +116,7 @@
axis2_bool_t AXIS2_CALL
axis2_conf_is_param_locked (axis2_conf_t *conf,
const axis2_env_t *env,
- axis2_char_t *param_name);
+ axis2_char_t *param_name);
/**
* To split a given svc name into it's svc grp name and svc name.
@@ -131,7 +131,7 @@
split_svc_name(const axis2_env_t *env,
axis2_char_t *svc_name,
axis2_char_t **svc_name_st);
-
+
axis2_transport_in_desc_t * AXIS2_CALL
axis2_conf_get_transport_in(axis2_conf_t *conf,
const axis2_env_t *env,
@@ -158,7 +158,7 @@
axis2_hash_t * AXIS2_CALL
axis2_conf_get_transports_out(axis2_conf_t *conf,
- const axis2_env_t *env);
+ const axis2_env_t *env);
axis2_module_desc_t *AXIS2_CALL
axis2_conf_get_module(axis2_conf_t *conf,
@@ -322,15 +322,15 @@
AXIS2_ENV_CHECK(env, NULL);
- config_impl = (axis2_conf_impl_t *) AXIS2_MALLOC (env->allocator
- , sizeof(axis2_conf_impl_t));
-
- if(NULL == config_impl)
+ config_impl = (axis2_conf_impl_t *) AXIS2_MALLOC (env->allocator
+ , sizeof(axis2_conf_impl_t));
+
+ if(NULL == config_impl)
{
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
-
+
config_impl->conf.param_container = NULL;
config_impl->svc_grps = NULL;
/*config_impl->modules = NULL;*/
@@ -352,62 +352,62 @@
config_impl->conf.ops = NULL;
config_impl->conf.param_container = (axis2_param_container_t *)
- axis2_param_container_create(env);
- if(NULL == config_impl->conf.param_container)
- {
+ axis2_param_container_create(env);
+ if(NULL == config_impl->conf.param_container)
+ {
axis2_conf_free(&(config_impl->conf), env);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
- }
+ }
- config_impl->svc_grps = axis2_hash_make(env);
- if(NULL == config_impl->svc_grps)
- {
+ config_impl->svc_grps = axis2_hash_make(env);
+ if(NULL == config_impl->svc_grps)
+ {
axis2_conf_free(&(config_impl->conf), env);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
- }
+ }
- config_impl->transports_in = axis2_hash_make(env);
- if(NULL == config_impl->transports_in)
- {
+ config_impl->transports_in = axis2_hash_make(env);
+ if(NULL == config_impl->transports_in)
+ {
axis2_conf_free(&(config_impl->conf), env);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
- }
+ }
- config_impl->transports_out = axis2_hash_make(env);
- if(NULL == config_impl->transports_out)
- {
+ config_impl->transports_out = axis2_hash_make(env);
+ if(NULL == config_impl->transports_out)
+ {
axis2_conf_free(&(config_impl->conf), env);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
- }
+ }
- /*config_impl->modules = axis2_hash_make(env);
- if(NULL == config_impl->modules)
- {
+ /*config_impl->modules = axis2_hash_make(env);
+ if(NULL == config_impl->modules)
+ {
axis2_conf_free(&(config_impl->conf), env);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
- }*/
+ }*/
- config_impl->engaged_modules = axis2_array_list_create(env, 0);
- if(NULL == config_impl->engaged_modules)
- {
+ config_impl->engaged_modules = axis2_array_list_create(env, 0);
+ if(NULL == config_impl->engaged_modules)
+ {
axis2_conf_free(&(config_impl->conf), env);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
- }
+ }
config_impl->in_phases_upto_and_including_post_dispatch =
- axis2_array_list_create(env, 0);
- if(NULL == config_impl->in_phases_upto_and_including_post_dispatch)
- {
+ axis2_array_list_create(env, 0);
+ if(NULL == config_impl->in_phases_upto_and_including_post_dispatch)
+ {
axis2_conf_free(&(config_impl->conf), env);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
- }
+ }
else
{
phase = axis2_phase_create(env, AXIS2_PHASE_TRANSPORTIN);
@@ -439,37 +439,37 @@
}
}
- /*config_impl->out_phases = axis2_array_list_create(env, 0);
- if(NULL == config_impl->out_phases)
- {
+ /*config_impl->out_phases = axis2_array_list_create(env, 0);
+ if(NULL == config_impl->out_phases)
+ {
axis2_conf_free(&(config_impl->conf), env);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
- }
+ }
- config_impl->in_faultphases = axis2_array_list_create(env, 0);
- if(NULL == config_impl->in_faultphases)
- {
+ config_impl->in_faultphases = axis2_array_list_create(env, 0);
+ if(NULL == config_impl->in_faultphases)
+ {
axis2_conf_free(&(config_impl->conf), env);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
- }
+ }
- config_impl->out_faultphases = axis2_array_list_create(env, 0);
- if(NULL == config_impl->out_faultphases)
- {
+ config_impl->out_faultphases = axis2_array_list_create(env, 0);
+ if(NULL == config_impl->out_faultphases)
+ {
axis2_conf_free(&(config_impl->conf), env);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
- }*/
+ }*/
- config_impl->handlers = axis2_array_list_create(env, 0);
- if(NULL == config_impl->handlers)
- {
+ config_impl->handlers = axis2_array_list_create(env, 0);
+ if(NULL == config_impl->handlers)
+ {
axis2_conf_free(&(config_impl->conf), env);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
- }
+ }
config_impl->all_svcs = axis2_hash_make(env);
if(NULL == config_impl->all_svcs)
@@ -528,22 +528,22 @@
return NULL;
}
- config_impl->conf.ops->free = axis2_conf_free;
- config_impl->conf.ops->add_svc_grp =
+ config_impl->conf.ops->free = axis2_conf_free;
+ config_impl->conf.ops->add_svc_grp =
axis2_conf_add_svc_grp;
- config_impl->conf.ops->get_svc_grp =
+ config_impl->conf.ops->get_svc_grp =
axis2_conf_get_svc_grp;
config_impl->conf.ops->get_svc_grps =
axis2_conf_get_svc_grps;
- config_impl->conf.ops->add_svc = axis2_conf_add_svc;
- config_impl->conf.ops->get_svc = axis2_conf_get_svc;
- config_impl->conf.ops->remove_svc =
+ config_impl->conf.ops->add_svc = axis2_conf_add_svc;
+ config_impl->conf.ops->get_svc = axis2_conf_get_svc;
+ config_impl->conf.ops->remove_svc =
axis2_conf_remove_svc;
config_impl->conf.ops->add_param =
axis2_conf_add_param;
- config_impl->conf.ops->get_param =
+ config_impl->conf.ops->get_param =
axis2_conf_get_param;
- config_impl->conf.ops->get_params =
+ config_impl->conf.ops->get_params =
axis2_conf_get_params;
config_impl->conf.ops->is_param_locked =
axis2_conf_is_param_locked;
@@ -615,8 +615,8 @@
config_impl->conf.ops->engage_module_with_version =
axis2_conf_engage_module_with_version;
- return &(config_impl->conf);
-}
+ return &(config_impl->conf);
+}
/**********************Start of op impls********************************/
@@ -627,10 +627,10 @@
axis2_conf_impl_t *config_impl = NULL;
axis2_status_t status = AXIS2_SUCCESS;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
config_impl = AXIS2_INTF_TO_IMPL(conf);
- if(NULL != conf->param_container)
+ if(NULL != conf->param_container)
{
AXIS2_PARAM_CONTAINER_FREE(conf->param_container, env);
conf->param_container = NULL;
@@ -919,7 +919,7 @@
config_impl->faulty_modules = NULL;
}
- if(NULL != config_impl->dep_engine)
+ if(NULL != config_impl->dep_engine)
{
AXIS2_DEP_ENGINE_FREE(config_impl->dep_engine, env);
config_impl->dep_engine= NULL;
@@ -951,17 +951,17 @@
if(NULL != conf->ops)
{
- AXIS2_FREE(env->allocator, conf->ops);
+ AXIS2_FREE(env->allocator, conf->ops);
conf->ops = NULL;
}
if(config_impl)
{
- AXIS2_FREE(env->allocator, config_impl);
+ AXIS2_FREE(env->allocator, config_impl);
config_impl = NULL;
}
- return status;
+ return status;
}
axis2_status_t AXIS2_CALL
@@ -1053,18 +1053,18 @@
}
axis2_hash_set (config_impl->svc_grps, svc_grp_name,
AXIS2_HASH_KEY_STRING, svc_grp);
-
- return AXIS2_SUCCESS;
+
+ return AXIS2_SUCCESS;
}
axis2_svc_grp_t * AXIS2_CALL
axis2_conf_get_svc_grp (axis2_conf_t *conf,
const axis2_env_t *env,
- axis2_char_t *svc_grp_name)
+ axis2_char_t *svc_grp_name)
{
axis2_conf_impl_t *config_impl = NULL;
- AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK(env->error, svc_grp_name, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
+ AXIS2_PARAM_CHECK(env->error, svc_grp_name, NULL);
config_impl = AXIS2_INTF_TO_IMPL(conf);
if(!config_impl->svc_grps)
@@ -1073,7 +1073,7 @@
AXIS2_FAILURE);
return NULL;
}
- return (axis2_svc_grp_t *) (axis2_hash_get (config_impl->svc_grps,
+ return (axis2_svc_grp_t *) (axis2_hash_get (config_impl->svc_grps,
svc_grp_name, AXIS2_HASH_KEY_STRING));
}
@@ -1096,57 +1096,57 @@
axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, svc, AXIS2_FAILURE);
-
- svc_grp = axis2_svc_grp_create(env);
-
- if(NULL == svc_grp)
+
+ svc_grp = axis2_svc_grp_create(env);
+
+ if(NULL == svc_grp)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE)
return AXIS2_FAILURE;
}
-
-
- svc_grp_qname = AXIS2_SVC_GET_QNAME(svc, env);
+
+
+ svc_grp_qname = AXIS2_SVC_GET_QNAME(svc, env);
if(NULL == svc_grp_qname)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_STATE_SVC,
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
-
- svc_grp_name = AXIS2_QNAME_GET_LOCALPART(svc_grp_qname, env);
- if(!svc_grp_name)
+
+ svc_grp_name = AXIS2_QNAME_GET_LOCALPART(svc_grp_qname, env);
+ if(!svc_grp_name)
{
return AXIS2_FAILURE;
}
- status = AXIS2_SVC_GRP_SET_NAME(svc_grp, env, svc_grp_name);
+ status = AXIS2_SVC_GRP_SET_NAME(svc_grp, env, svc_grp_name);
if(AXIS2_FAILURE == status)
{
return status;
}
- status = AXIS2_SVC_GRP_SET_PARENT(svc_grp, env, conf);
+ status = AXIS2_SVC_GRP_SET_PARENT(svc_grp, env, conf);
if(AXIS2_FAILURE == status)
{
return status;
}
- status = AXIS2_SVC_GRP_ADD_SVC(svc_grp, env, svc);
+ status = AXIS2_SVC_GRP_ADD_SVC(svc_grp, env, svc);
if(AXIS2_FAILURE == status)
{
return status;
}
status = axis2_conf_add_svc_grp(conf, env, svc_grp);
-
- return status;
+
+ return status;
}
axis2_svc_t * AXIS2_CALL
axis2_conf_get_svc (axis2_conf_t *conf,
const axis2_env_t *env,
- axis2_char_t* svc_name)
+ axis2_char_t* svc_name)
{
- AXIS2_ENV_CHECK(env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, svc_name, NULL);
-
+
return axis2_hash_get(AXIS2_INTF_TO_IMPL(conf)->all_svcs, svc_name,
AXIS2_HASH_KEY_STRING);
}
@@ -1154,7 +1154,7 @@
axis2_status_t AXIS2_CALL
axis2_conf_remove_svc (axis2_conf_t *conf,
const axis2_env_t *env,
- const axis2_char_t *svc_name)
+ const axis2_char_t *svc_name)
{
axis2_conf_impl_t *config_impl = NULL;
@@ -1169,21 +1169,21 @@
axis2_status_t AXIS2_CALL
axis2_conf_add_param (axis2_conf_t *conf,
const axis2_env_t *env,
- axis2_param_t *param)
+ axis2_param_t *param)
{
axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, param, AXIS2_FAILURE);
- if(AXIS2_TRUE == axis2_conf_is_param_locked(conf, env,
+ if(AXIS2_TRUE == axis2_conf_is_param_locked(conf, env,
AXIS2_PARAM_GET_NAME(param, env)))
{
AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_PARAMETER_LOCKED_CANNOT_OVERRIDE, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- else
+ else
{
status = AXIS2_PARAM_CONTAINER_ADD_PARAM(conf->param_container, env,
param);
@@ -1194,36 +1194,36 @@
axis2_param_t * AXIS2_CALL
axis2_conf_get_param (axis2_conf_t *conf,
const axis2_env_t *env,
- const axis2_char_t *name)
+ const axis2_char_t *name)
{
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, name, NULL);
- if(NULL == conf->param_container)
- {
- AXIS2_ERROR_SET(env->error,
+ if(NULL == conf->param_container)
+ {
+ AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_INVALID_STATE_PARAM_CONTAINER, AXIS2_FAILURE);
return NULL;
- }
-
- return AXIS2_PARAM_CONTAINER_GET_PARAM(conf->param_container, env,
+ }
+
+ return AXIS2_PARAM_CONTAINER_GET_PARAM(conf->param_container, env,
name);
-
+
}
axis2_array_list_t * AXIS2_CALL
axis2_conf_get_params (axis2_conf_t *conf,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
- return AXIS2_PARAM_CONTAINER_GET_PARAMS(conf->param_container, env);
-
+ AXIS2_ENV_CHECK(env, NULL);
+ return AXIS2_PARAM_CONTAINER_GET_PARAMS(conf->param_container, env);
+
}
axis2_bool_t AXIS2_CALL
axis2_conf_is_param_locked (axis2_conf_t *conf,
const axis2_env_t *env,
- axis2_char_t *param_name)
+ axis2_char_t *param_name)
{
axis2_param_t *param = NULL;
@@ -1449,7 +1449,7 @@
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(conf)->transports_out;
-}
+}
/*static axis2_status_t
split_svc_name (const axis2_env_t *env,
@@ -1458,7 +1458,7 @@
{
axis2_char_t *svc_name_l = NULL;
axis2_char_t *grp_name = NULL;
-
+
svc_name_l = strpbrk(svc_name, SERVICE_NAME_SPLIT_CHAR);
if(NULL == svc_name_l)
{
@@ -1472,8 +1472,8 @@
svc_name_l = svc_name_l + 1;
*(svc_name_st + 1) = AXIS2_STRDUP(svc_name_l, env);
*(svc_name_st + 2) = grp_name;
-
- return AXIS2_SUCCESS;
+
+ return AXIS2_SUCCESS;
}
*/
Modified: webservices/axis2/trunk/c/modules/core/engine/disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/disp.c?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/disp.c Sat Jun 3 20:09:08 2006
@@ -25,7 +25,7 @@
typedef struct axis2_disp_impl
{
/** phase */
- axis2_disp_t disp;
+ axis2_disp_t disp;
/** base class, inherits from handler */
axis2_handler_t *base;
/** phase name */
Modified: webservices/axis2/trunk/c/modules/core/engine/disp_checker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/disp_checker.c?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/disp_checker.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/disp_checker.c Sat Jun 3 20:09:08 2006
@@ -28,7 +28,7 @@
typedef struct axis2_disp_checker_impl
{
/** phase */
- axis2_disp_checker_t disp_checker;
+ axis2_disp_checker_t disp_checker;
/** base class, inherits from handler */
axis2_handler_t *base;
/** phase name */
Modified: webservices/axis2/trunk/c/modules/core/engine/event.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/event.c?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/event.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/event.c Sat Jun 3 20:09:08 2006
@@ -62,13 +62,13 @@
event_impl->event.ops = NULL;
event_impl->svc = NULL;
- event_impl->event_type = event_type;
+ event_impl->event_type = event_type;
if (svc)
{
event_impl->svc = svc;
}
-
+
/* initialize ops */
event_impl->event.ops = AXIS2_MALLOC( env->allocator, sizeof(axis2_event_ops_t) );
if (!event_impl->event.ops)
Modified: webservices/axis2/trunk/c/modules/core/engine/phase.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/phase.c?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/phase.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/phase.c Sat Jun 3 20:09:08 2006
@@ -24,7 +24,7 @@
typedef struct axis2_phase_impl
{
/** phase */
- axis2_phase_t phase;
+ axis2_phase_t phase;
/** phase name */
axis2_char_t *name;
/** array list of phases */
@@ -169,7 +169,7 @@
phase_impl->last_handler_set = AXIS2_FALSE;
phase_impl->is_one_handler = AXIS2_FALSE;
- phase_impl->handlers = axis2_array_list_create(env, 10);
+ phase_impl->handlers = axis2_array_list_create(env, 10);
if (!(phase_impl->handlers))
{
/** error is already set by last method array list container create */
Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c Sat Jun 3 20:09:08 2006
@@ -23,7 +23,7 @@
*/
typedef struct axis2_phase_holder_impl
{
- axis2_phase_holder_t phase_holder;
+ axis2_phase_holder_t phase_holder;
axis2_array_list_t *phase_list;
} axis2_phase_holder_impl_t;
@@ -33,9 +33,9 @@
/************************* Function prototypes ********************************/
axis2_status_t AXIS2_CALL
- axis2_phase_holder_free (
+ axis2_phase_holder_free (
axis2_phase_holder_t *phase_holder,
- const axis2_env_t *env);
+ const axis2_env_t *env);
axis2_bool_t AXIS2_CALL
axis2_phase_holder_is_phase_exist(axis2_phase_holder_t *phase_holder,
@@ -65,12 +65,12 @@
{
axis2_phase_holder_impl_t *phase_holder_impl = NULL;
- AXIS2_ENV_CHECK(env, NULL);
-
- phase_holder_impl = (axis2_phase_holder_impl_t *) AXIS2_MALLOC(env->
+ AXIS2_ENV_CHECK(env, NULL);
+
+ phase_holder_impl = (axis2_phase_holder_impl_t *) AXIS2_MALLOC(env->
allocator, sizeof(axis2_phase_holder_impl_t));
-
- if(NULL == phase_holder_impl)
+
+ if(NULL == phase_holder_impl)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -79,26 +79,26 @@
phase_holder_impl->phase_list = NULL;
phase_holder_impl->phase_holder.ops = NULL;
- phase_holder_impl->phase_holder.ops =
- AXIS2_MALLOC (env->allocator, sizeof(axis2_phase_holder_ops_t));
- if(NULL == phase_holder_impl->phase_holder.ops)
+ phase_holder_impl->phase_holder.ops =
+ AXIS2_MALLOC (env->allocator, sizeof(axis2_phase_holder_ops_t));
+ if(NULL == phase_holder_impl->phase_holder.ops)
{
axis2_phase_holder_free(&(phase_holder_impl->phase_holder), env);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
phase_holder_impl->phase_holder.ops->free = axis2_phase_holder_free;
- phase_holder_impl->phase_holder.ops->is_phase_exist =
+ phase_holder_impl->phase_holder.ops->is_phase_exist =
axis2_phase_holder_is_phase_exist;
- phase_holder_impl->phase_holder.ops->add_handler =
+ phase_holder_impl->phase_holder.ops->add_handler =
axis2_phase_holder_add_handler;
- phase_holder_impl->phase_holder.ops->get_phase =
+ phase_holder_impl->phase_holder.ops->get_phase =
axis2_phase_holder_get_phase;
- phase_holder_impl->phase_holder.ops->build_transport_handler_chain =
+ phase_holder_impl->phase_holder.ops->build_transport_handler_chain =
axis2_phase_holder_build_transport_handler_chain;
-
- return &(phase_holder_impl->phase_holder);
+
+ return &(phase_holder_impl->phase_holder);
}
AXIS2_EXTERN axis2_phase_holder_t * AXIS2_CALL
@@ -136,7 +136,7 @@
AXIS2_ARRAY_LIST_FREE(phase_holder_impl->phase_list, env);
phase_holder_impl->phase_list = NULL;
}*/
-
+
if(NULL != phase_holder->ops)
{
AXIS2_FREE(env->allocator, phase_holder->ops);
@@ -149,7 +149,7 @@
phase_holder_impl = NULL;
}
- return AXIS2_SUCCESS;
+ return AXIS2_SUCCESS;
}
/**
Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c Sat Jun 3 20:09:08 2006
@@ -33,7 +33,7 @@
*/
typedef struct axis2_phase_resolver_impl
{
- axis2_phase_resolver_t phase_resolver;
+ axis2_phase_resolver_t phase_resolver;
/**
* Field axisConfig
*/
@@ -56,9 +56,9 @@
/************************* Function prototypes ********************************/
axis2_status_t AXIS2_CALL
- axis2_phase_resolver_free (
+ axis2_phase_resolver_free (
axis2_phase_resolver_t *phase_resolver,
- const axis2_env_t *env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_phase_resolver_build_chains(axis2_phase_resolver_t *phase_resolver,
@@ -142,36 +142,36 @@
{
axis2_phase_resolver_impl_t *phase_resolver_impl = NULL;
- AXIS2_ENV_CHECK(env, NULL);
-
- phase_resolver_impl = (axis2_phase_resolver_impl_t *) AXIS2_MALLOC(env->allocator,
- sizeof(axis2_phase_resolver_impl_t));
+ AXIS2_ENV_CHECK(env, NULL);
+
+ phase_resolver_impl = (axis2_phase_resolver_impl_t *) AXIS2_MALLOC(env->allocator,
+ sizeof(axis2_phase_resolver_impl_t));
if(NULL == phase_resolver_impl)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
-
+
phase_resolver_impl->phase_resolver.ops = NULL;
phase_resolver_impl->axis2_config = NULL;
phase_resolver_impl->svc = NULL;
phase_resolver_impl->phase_holder = NULL;
-
+
- phase_resolver_impl->phase_resolver.ops =
- AXIS2_MALLOC (env->allocator, sizeof(axis2_phase_resolver_ops_t));
- if(NULL == phase_resolver_impl->phase_resolver.ops)
+ phase_resolver_impl->phase_resolver.ops =
+ AXIS2_MALLOC (env->allocator, sizeof(axis2_phase_resolver_ops_t));
+ if(NULL == phase_resolver_impl->phase_resolver.ops)
{
axis2_phase_resolver_free(&(phase_resolver_impl->phase_resolver), env);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
phase_resolver_impl->phase_resolver.ops->free =
axis2_phase_resolver_free;
-
+
phase_resolver_impl->phase_resolver.ops->build_chains =
axis2_phase_resolver_build_chains;
@@ -194,7 +194,7 @@
axis2_phase_resolver_engage_module_to_op;
- return &(phase_resolver_impl->phase_resolver);
+ return &(phase_resolver_impl->phase_resolver);
}
AXIS2_EXTERN axis2_phase_resolver_t * AXIS2_CALL
@@ -259,7 +259,7 @@
AXIS2_PHASE_HOLDER_FREE(phase_resolver_impl->phase_holder, env);
phase_resolver_impl->phase_holder = NULL;
}
-
+
if(phase_resolver->ops)
{
AXIS2_FREE(env->allocator, phase_resolver->ops);
@@ -272,7 +272,7 @@
phase_resolver_impl = NULL;
}
- return AXIS2_SUCCESS;
+ return AXIS2_SUCCESS;
}
axis2_status_t AXIS2_CALL
Modified: webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c Sat Jun 3 20:09:08 2006
@@ -32,12 +32,12 @@
*/
typedef struct axis2_msg_recv_impl
{
- axis2_msg_recv_t msg_recv;
+ axis2_msg_recv_t msg_recv;
axis2_char_t *scope;
} axis2_msg_recv_impl_t;
#define AXIS2_INTF_TO_IMPL(msg_recv) ((axis2_msg_recv_impl_t *) msg_recv)
-
+
/*************************** Function headers *********************************/
axis2_status_t AXIS2_CALL
@@ -85,8 +85,8 @@
axis2_msg_recv_delete_svc_obj(axis2_msg_recv_t *msg_recv,
const axis2_env_t *env,
axis2_msg_ctx_t *msg_ctx);
-
-/************************* End of function headers ****************************/
+
+/************************* End of function headers ****************************/
axis2_msg_recv_t * AXIS2_CALL
axis2_msg_recv_create (const axis2_env_t *env)
@@ -95,10 +95,10 @@
AXIS2_ENV_CHECK(env, NULL);
- msg_recv_impl = (axis2_msg_recv_impl_t *) AXIS2_MALLOC(env->allocator,
- sizeof(axis2_msg_recv_impl_t));
+ msg_recv_impl = (axis2_msg_recv_impl_t *) AXIS2_MALLOC(env->allocator,
+ sizeof(axis2_msg_recv_impl_t));
- if(NULL == msg_recv_impl)
+ if(NULL == msg_recv_impl)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -111,15 +111,15 @@
msg_recv_impl->msg_recv.ops = (axis2_msg_recv_ops_t *)
AXIS2_MALLOC( env->allocator, sizeof(axis2_msg_recv_ops_t));
- if(NULL == msg_recv_impl->msg_recv.ops)
- {
+ if(NULL == msg_recv_impl->msg_recv.ops)
+ {
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
axis2_msg_recv_free(&(msg_recv_impl->msg_recv), env);
return NULL;
- }
+ }
- msg_recv_impl->msg_recv.ops->free = axis2_msg_recv_free;
+ msg_recv_impl->msg_recv.ops->free = axis2_msg_recv_free;
msg_recv_impl->msg_recv.ops->make_new_svc_obj =
axis2_msg_recv_make_new_svc_obj;
msg_recv_impl->msg_recv.ops->get_impl_obj = axis2_msg_recv_get_impl_obj;
@@ -128,10 +128,10 @@
msg_recv_impl->msg_recv.ops->delete_svc_obj = axis2_msg_recv_delete_svc_obj;
msg_recv_impl->msg_recv.ops->receive_sync =
axis2_raw_xml_in_out_msg_recv_receive_sync;
- msg_recv_impl->msg_recv.ops->receive_async =
+ msg_recv_impl->msg_recv.ops->receive_async =
axis2_raw_xml_in_out_msg_recv_receive_async;
-
- return &(msg_recv_impl->msg_recv);
+
+ return &(msg_recv_impl->msg_recv);
}
/******************************************************************************/
@@ -162,7 +162,7 @@
recv_impl = NULL;
}
- return AXIS2_SUCCESS;
+ return AXIS2_SUCCESS;
}
axis2_status_t AXIS2_CALL
@@ -171,7 +171,7 @@
axis2_msg_ctx_t *in_msg_ctx,
void *callback_recv_param)
{
- return AXIS2_SUCCESS;
+ return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c?rev=411506&r1=411505&r2=411506&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 Sat Jun 3 20:09:08 2006
@@ -39,9 +39,9 @@
axis2_msg_recv_t *msg_recv = NULL;
axis2_status_t status = AXIS2_FAILURE;
- AXIS2_ENV_CHECK(env, NULL);
- msg_recv = axis2_msg_recv_create(env);
- if(NULL == msg_recv)
+ AXIS2_ENV_CHECK(env, NULL);
+ msg_recv = axis2_msg_recv_create(env);
+ if(NULL == msg_recv)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -55,7 +55,7 @@
msg_recv->ops->invoke_in_out_business_logic_sync =
axis2_raw_xml_in_out_msg_recv_invoke_business_logic_sync;
msg_recv->ops->receive = msg_recv->ops->receive_sync;
- return msg_recv;
+ return msg_recv;
}
/***************************Function implementation****************************/
Modified: webservices/axis2/trunk/c/modules/core/receivers/svr_callback.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/receivers/svr_callback.c?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/svr_callback.c (original)
+++ webservices/axis2/trunk/c/modules/core/receivers/svr_callback.c Sat Jun 3 20:09:08 2006
@@ -25,12 +25,12 @@
*/
typedef struct axis2_svr_callback_impl
{
- axis2_svr_callback_t svr_callback;
+ axis2_svr_callback_t svr_callback;
axis2_char_t *scope;
} axis2_svr_callback_impl_t;
#define AXIS2_INTF_TO_IMPL(svr_callback) ((axis2_svr_callback_impl_t *) svr_callback)
-
+
/*************************** Function headers *********************************/
axis2_status_t AXIS2_CALL
@@ -46,8 +46,8 @@
axis2_svr_callback_handle_fault(axis2_svr_callback_t *svr_callback,
const axis2_env_t *env,
axis2_msg_ctx_t *msg_ctx);
-
-/************************* End of function headers ****************************/
+
+/************************* End of function headers ****************************/
axis2_svr_callback_t * AXIS2_CALL
axis2_svr_callback_create (const axis2_env_t *env)
@@ -56,10 +56,10 @@
AXIS2_ENV_CHECK(env, NULL);
- svr_callback_impl = (axis2_svr_callback_impl_t *)
+ svr_callback_impl = (axis2_svr_callback_impl_t *)
AXIS2_MALLOC (env->allocator, sizeof (axis2_svr_callback_impl_t));
- if(NULL == svr_callback_impl)
+ if(NULL == svr_callback_impl)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -70,21 +70,21 @@
svr_callback_impl->svr_callback.ops = (axis2_svr_callback_ops_t *)
AXIS2_MALLOC( env->allocator, sizeof(axis2_svr_callback_ops_t));
- if(NULL == svr_callback_impl->svr_callback.ops)
- {
+ if(NULL == svr_callback_impl->svr_callback.ops)
+ {
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
axis2_svr_callback_free(&(svr_callback_impl->svr_callback), env);
return NULL;
- }
+ }
- svr_callback_impl->svr_callback.ops->free = axis2_svr_callback_free;
+ svr_callback_impl->svr_callback.ops->free = axis2_svr_callback_free;
svr_callback_impl->svr_callback.ops->handle_result =
axis2_svr_callback_handle_result;
svr_callback_impl->svr_callback.ops->handle_fault =
axis2_svr_callback_handle_fault;
-
- return &(svr_callback_impl->svr_callback);
+
+ return &(svr_callback_impl->svr_callback);
}
/******************************************************************************/
@@ -110,7 +110,7 @@
svr_callback_impl = NULL;
}
- return AXIS2_SUCCESS;
+ return AXIS2_SUCCESS;
}
axis2_status_t AXIS2_CALL
Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_chunked_stream.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/http_chunked_stream.c?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/http_chunked_stream.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/http_chunked_stream.c Sat Jun 3 20:09:08 2006
@@ -22,18 +22,18 @@
/**
* @brief HTTP Chunked Stream struct impl
- * Axis2 HTTP Chunked Stream impl
+ * Axis2 HTTP Chunked Stream impl
*/
typedef struct axis2_http_chunked_stream_impl axis2_http_chunked_stream_impl_t;
struct axis2_http_chunked_stream_impl
{
- axis2_http_chunked_stream_t chunked_stream;
- axis2_stream_t *stream;
- int current_chunk_size;
- int unread_len;
- axis2_bool_t end_of_chunks;
- axis2_bool_t chunk_started;
+ axis2_http_chunked_stream_t chunked_stream;
+ axis2_stream_t *stream;
+ int current_chunk_size;
+ int unread_len;
+ axis2_bool_t end_of_chunks;
+ axis2_bool_t chunk_started;
};
#define AXIS2_INTF_TO_IMPL(chunked_stream) \
@@ -42,11 +42,11 @@
/***************************** Function headers *******************************/
int AXIS2_CALL
axis2_http_chunked_stream_read (axis2_http_chunked_stream_t *chunked_stream,
- const axis2_env_t *env, void *buffer, size_t count);
+ const axis2_env_t *env, void *buffer, size_t count);
int AXIS2_CALL
axis2_http_chunked_stream_write (axis2_http_chunked_stream_t *chunked_stream,
- const axis2_env_t *env, const void *buffer,
- size_t count);
+ const axis2_env_t *env, const void *buffer,
+ size_t count);
int AXIS2_CALL
axis2_http_chunked_stream_get_current_chunk_size
(axis2_http_chunked_stream_t *chunked_stream,
@@ -54,17 +54,17 @@
axis2_status_t AXIS2_CALL
axis2_http_chunked_stream_start_chunk(
- axis2_http_chunked_stream_t *chunked_stream,
+ axis2_http_chunked_stream_t *chunked_stream,
const axis2_env_t *env);
-
+
axis2_status_t AXIS2_CALL
axis2_http_chunked_stream_write_last_chunk(
- axis2_http_chunked_stream_t *chunked_stream,
+ axis2_http_chunked_stream_t *chunked_stream,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_http_chunked_stream_free (axis2_http_chunked_stream_t *chunked_stream,
- const axis2_env_t *env);
+ const axis2_env_t *env);
/***************************** End of function headers ************************/
AXIS2_EXTERN axis2_http_chunked_stream_t * AXIS2_CALL
@@ -77,27 +77,27 @@
chunked_stream_impl = (axis2_http_chunked_stream_impl_t *)AXIS2_MALLOC
(env->allocator, sizeof(
axis2_http_chunked_stream_impl_t));
-
+
if(NULL == chunked_stream_impl)
- {
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ {
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
- }
+ }
chunked_stream_impl->stream = stream;
chunked_stream_impl->current_chunk_size = -1;
- chunked_stream_impl->unread_len = -1;
- chunked_stream_impl->end_of_chunks = AXIS2_FALSE;
- chunked_stream_impl->chunk_started = AXIS2_FALSE;
-
+ chunked_stream_impl->unread_len = -1;
+ chunked_stream_impl->end_of_chunks = AXIS2_FALSE;
+ chunked_stream_impl->chunk_started = AXIS2_FALSE;
+
chunked_stream_impl->chunked_stream.ops = AXIS2_MALLOC(env->allocator,
- sizeof(axis2_http_chunked_stream_ops_t));
+ sizeof(axis2_http_chunked_stream_ops_t));
if(NULL == chunked_stream_impl->chunked_stream.ops)
- {
- axis2_http_chunked_stream_free((axis2_http_chunked_stream_t*)
+ {
+ axis2_http_chunked_stream_free((axis2_http_chunked_stream_t*)
chunked_stream_impl, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
- }
+ }
chunked_stream_impl->chunked_stream.ops->read =
axis2_http_chunked_stream_read;
@@ -105,105 +105,105 @@
axis2_http_chunked_stream_write;
chunked_stream_impl->chunked_stream.ops->get_current_chunk_size =
axis2_http_chunked_stream_get_current_chunk_size;
- chunked_stream_impl->chunked_stream.ops->write_last_chunk =
- axis2_http_chunked_stream_write_last_chunk;
+ chunked_stream_impl->chunked_stream.ops->write_last_chunk =
+ axis2_http_chunked_stream_write_last_chunk;
chunked_stream_impl->chunked_stream.ops->free =
axis2_http_chunked_stream_free;
- return &(chunked_stream_impl->chunked_stream);
+ return &(chunked_stream_impl->chunked_stream);
}
axis2_status_t AXIS2_CALL
axis2_http_chunked_stream_free(axis2_http_chunked_stream_t *chunked_stream,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if(NULL != chunked_stream->ops)
AXIS2_FREE(env->allocator, chunked_stream->ops);
- AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(chunked_stream));
- return AXIS2_SUCCESS;
+ AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(chunked_stream));
+ return AXIS2_SUCCESS;
}
int AXIS2_CALL
axis2_http_chunked_stream_read (axis2_http_chunked_stream_t *chunked_stream,
- const axis2_env_t *env, void *buffer, size_t count)
+ const axis2_env_t *env, void *buffer, size_t count)
{
- int len = -1;
- int yet_to_read = 0;
- axis2_http_chunked_stream_impl_t *chunked_stream_impl = AXIS2_INTF_TO_IMPL
- (chunked_stream);
+ int len = -1;
+ int yet_to_read = 0;
+ axis2_http_chunked_stream_impl_t *chunked_stream_impl = AXIS2_INTF_TO_IMPL
+ (chunked_stream);
axis2_stream_t *stream = chunked_stream_impl->stream;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
- if(NULL == buffer)
- {
- return -1;
- }
- if(NULL == stream)
- {
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NULL_STREAM_IN_CHUNKED_STREAM
- , AXIS2_FAILURE);
- return -1;
- }
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+
+ if(NULL == buffer)
+ {
+ return -1;
+ }
+ if(NULL == stream)
+ {
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NULL_STREAM_IN_CHUNKED_STREAM
+ , AXIS2_FAILURE);
+ return -1;
+ }
if(AXIS2_TRUE == chunked_stream_impl->end_of_chunks)
- {
- return 0;
- }
- if(AXIS2_FALSE == chunked_stream_impl->chunk_started)
- {
- axis2_http_chunked_stream_start_chunk(chunked_stream, env);
- }
- yet_to_read = count;
- while(AXIS2_FALSE == chunked_stream_impl->end_of_chunks && yet_to_read > 0)
- {
- if(chunked_stream_impl->unread_len < yet_to_read)
- {
- len = AXIS2_STREAM_READ(chunked_stream_impl->stream, env,
- (axis2_char_t*)buffer + count - yet_to_read,
- chunked_stream_impl->unread_len);
- yet_to_read -= len;
- chunked_stream_impl->unread_len -= len;
- if(chunked_stream_impl->unread_len <= 0)
- {
- axis2_http_chunked_stream_start_chunk(chunked_stream, env);
- }
- }
- else
- {
- len = AXIS2_STREAM_READ(chunked_stream_impl->stream, env,
- (axis2_char_t*)buffer + count - yet_to_read,
- yet_to_read);
- yet_to_read -= len;
- chunked_stream_impl->unread_len -= len;
- }
- }
+ {
+ return 0;
+ }
+ if(AXIS2_FALSE == chunked_stream_impl->chunk_started)
+ {
+ axis2_http_chunked_stream_start_chunk(chunked_stream, env);
+ }
+ yet_to_read = count;
+ while(AXIS2_FALSE == chunked_stream_impl->end_of_chunks && yet_to_read > 0)
+ {
+ if(chunked_stream_impl->unread_len < yet_to_read)
+ {
+ len = AXIS2_STREAM_READ(chunked_stream_impl->stream, env,
+ (axis2_char_t*)buffer + count - yet_to_read,
+ chunked_stream_impl->unread_len);
+ yet_to_read -= len;
+ chunked_stream_impl->unread_len -= len;
+ if(chunked_stream_impl->unread_len <= 0)
+ {
+ axis2_http_chunked_stream_start_chunk(chunked_stream, env);
+ }
+ }
+ else
+ {
+ len = AXIS2_STREAM_READ(chunked_stream_impl->stream, env,
+ (axis2_char_t*)buffer + count - yet_to_read,
+ yet_to_read);
+ yet_to_read -= len;
+ chunked_stream_impl->unread_len -= len;
+ }
+ }
return count - yet_to_read;
}
int AXIS2_CALL
axis2_http_chunked_stream_write (axis2_http_chunked_stream_t *chunked_stream
- , const axis2_env_t *env, const void *buffer,
- size_t count)
+ , const axis2_env_t *env, const void *buffer,
+ size_t count)
{
- axis2_stream_t *stream = AXIS2_INTF_TO_IMPL(chunked_stream)->stream;
- int len = -1;
- axis2_char_t tmp_buf[10];
+ axis2_stream_t *stream = AXIS2_INTF_TO_IMPL(chunked_stream)->stream;
+ int len = -1;
+ axis2_char_t tmp_buf[10];
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
- if(NULL == buffer)
- {
- return -1;
- }
- if(NULL == stream)
- {
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NULL_STREAM_IN_CHUNKED_STREAM
- , AXIS2_FAILURE);
- return -1;
- }
- sprintf(tmp_buf, "%x%s", count, AXIS2_HTTP_CRLF);
- len = AXIS2_STREAM_WRITE(stream, env, tmp_buf, AXIS2_STRLEN(tmp_buf));
- len = AXIS2_STREAM_WRITE(stream, env, buffer, count);
- AXIS2_STREAM_WRITE(stream, env, AXIS2_HTTP_CRLF, 2);
+
+ if(NULL == buffer)
+ {
+ return -1;
+ }
+ if(NULL == stream)
+ {
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NULL_STREAM_IN_CHUNKED_STREAM
+ , AXIS2_FAILURE);
+ return -1;
+ }
+ sprintf(tmp_buf, "%x%s", count, AXIS2_HTTP_CRLF);
+ len = AXIS2_STREAM_WRITE(stream, env, tmp_buf, AXIS2_STRLEN(tmp_buf));
+ len = AXIS2_STREAM_WRITE(stream, env, buffer, count);
+ AXIS2_STREAM_WRITE(stream, env, AXIS2_HTTP_CRLF, 2);
return len;
}
@@ -220,69 +220,69 @@
axis2_status_t AXIS2_CALL
axis2_http_chunked_stream_start_chunk(
- axis2_http_chunked_stream_t *chunked_stream,
+ axis2_http_chunked_stream_t *chunked_stream,
const axis2_env_t *env)
{
- axis2_char_t tmp_buf[3] = "";
- axis2_char_t str_chunk_len[512] = "";
- axis2_char_t *tmp = NULL;
- int read = -1;
- axis2_http_chunked_stream_impl_t *chunked_stream_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
- chunked_stream_impl = AXIS2_INTF_TO_IMPL(chunked_stream);
- /* remove the last CRLF of the previous chunk if any */
- if(AXIS2_TRUE == chunked_stream_impl->chunk_started)
- {
- read = AXIS2_STREAM_READ(chunked_stream_impl->stream, env, tmp_buf, 2);
- chunked_stream_impl->chunk_started = AXIS2_FALSE;
- }
- /* read the len and chunk extension */
- while((read = AXIS2_STREAM_READ(chunked_stream_impl->stream, env, tmp_buf,
- 1)) > 0)
- {
- tmp_buf[read] = '\0';
- strcat(str_chunk_len, tmp_buf);
- if(0 != strstr(str_chunk_len, AXIS2_HTTP_CRLF))
- {
- break;
- }
- }
- /* check whether we have extensions */
- tmp = strchr(str_chunk_len, ';');
- if(NULL != tmp)
- {
- /* we don't use extensions right now */
- *tmp = '\0';
- }
- chunked_stream_impl->current_chunk_size = strtol(str_chunk_len, NULL, 16);
- if(0 == chunked_stream_impl->current_chunk_size)
- {
+ axis2_char_t tmp_buf[3] = "";
+ axis2_char_t str_chunk_len[512] = "";
+ axis2_char_t *tmp = NULL;
+ int read = -1;
+ axis2_http_chunked_stream_impl_t *chunked_stream_impl = NULL;
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+
+ chunked_stream_impl = AXIS2_INTF_TO_IMPL(chunked_stream);
+ /* remove the last CRLF of the previous chunk if any */
+ if(AXIS2_TRUE == chunked_stream_impl->chunk_started)
+ {
+ read = AXIS2_STREAM_READ(chunked_stream_impl->stream, env, tmp_buf, 2);
+ chunked_stream_impl->chunk_started = AXIS2_FALSE;
+ }
+ /* read the len and chunk extension */
+ while((read = AXIS2_STREAM_READ(chunked_stream_impl->stream, env, tmp_buf,
+ 1)) > 0)
+ {
+ tmp_buf[read] = '\0';
+ strcat(str_chunk_len, tmp_buf);
+ if(0 != strstr(str_chunk_len, AXIS2_HTTP_CRLF))
+ {
+ break;
+ }
+ }
+ /* check whether we have extensions */
+ tmp = strchr(str_chunk_len, ';');
+ if(NULL != tmp)
+ {
+ /* we don't use extensions right now */
+ *tmp = '\0';
+ }
+ chunked_stream_impl->current_chunk_size = strtol(str_chunk_len, NULL, 16);
+ if(0 == chunked_stream_impl->current_chunk_size)
+ {
/* Read the last CRLF */
read = AXIS2_STREAM_READ(chunked_stream_impl->stream, env, tmp_buf, 2);
- chunked_stream_impl->end_of_chunks = AXIS2_TRUE;
- }
- else
- {
- chunked_stream_impl->chunk_started = AXIS2_TRUE;
- chunked_stream_impl->unread_len =
- chunked_stream_impl->current_chunk_size;
- }
- return AXIS2_SUCCESS;
+ chunked_stream_impl->end_of_chunks = AXIS2_TRUE;
+ }
+ else
+ {
+ chunked_stream_impl->chunk_started = AXIS2_TRUE;
+ chunked_stream_impl->unread_len =
+ chunked_stream_impl->current_chunk_size;
+ }
+ return AXIS2_SUCCESS;
}
axis2_status_t AXIS2_CALL
axis2_http_chunked_stream_write_last_chunk(
- axis2_http_chunked_stream_t *chunked_stream,
+ axis2_http_chunked_stream_t *chunked_stream,
const axis2_env_t *env)
{
- axis2_stream_t *stream = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
- stream = AXIS2_INTF_TO_IMPL(chunked_stream)->stream;
- if(AXIS2_STREAM_WRITE(stream, env, "0\r\n\r\n", 5) == 5)
- {
- return AXIS2_SUCCESS;
- }
- return AXIS2_FAILURE;
+ axis2_stream_t *stream = NULL;
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+
+ stream = AXIS2_INTF_TO_IMPL(chunked_stream)->stream;
+ if(AXIS2_STREAM_WRITE(stream, env, "0\r\n\r\n", 5) == 5)
+ {
+ return AXIS2_SUCCESS;
+ }
+ return AXIS2_FAILURE;
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_header.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/http_header.c?rev=411506&r1=411505&r2=411506&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 Sat Jun 3 20:09:08 2006
@@ -22,14 +22,14 @@
/**
* @brief HTTP Header struct impl
- * Axis2 HTTP Header impl
+ * Axis2 HTTP Header impl
*/
typedef struct axis2_http_header_impl axis2_http_header_impl_t;
struct axis2_http_header_impl
{
- axis2_http_header_t http_header;
- axis2_char_t *name;
+ axis2_http_header_t http_header;
+ axis2_char_t *name;
axis2_char_t *value;
};
@@ -48,7 +48,7 @@
axis2_http_header_get_value (axis2_http_header_t *header, const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_http_header_free (axis2_http_header_t *header, const axis2_env_t *env);
+axis2_http_header_free (axis2_http_header_t *header, const axis2_env_t *env);
/***************************** End of function headers ************************/
@@ -64,24 +64,24 @@
http_header_impl = (axis2_http_header_impl_t *)AXIS2_MALLOC
(env->allocator, sizeof(
axis2_http_header_impl_t));
-
+
if(NULL == http_header_impl)
- {
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ {
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
- }
+ }
http_header_impl->name = (axis2_char_t *)AXIS2_STRDUP(name, env);
http_header_impl->value = (axis2_char_t *)AXIS2_STRDUP(value, env);
http_header_impl->http_header.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_http_header_ops_t));
if(NULL == http_header_impl->http_header.ops)
- {
- axis2_http_header_free((axis2_http_header_t*)
+ {
+ axis2_http_header_free((axis2_http_header_t*)
http_header_impl, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
- }
+ }
http_header_impl->http_header.ops->to_external_form =
axis2_http_header_to_external_form;
@@ -89,55 +89,55 @@
http_header_impl->http_header.ops->get_value = axis2_http_header_get_value;
http_header_impl->http_header.ops->free = axis2_http_header_free;
- return &(http_header_impl->http_header);
+ return &(http_header_impl->http_header);
}
AXIS2_EXTERN axis2_http_header_t * AXIS2_CALL AXIS2_CALL
axis2_http_header_create_by_str (const axis2_env_t *env, axis2_char_t *str)
{
- axis2_char_t *tmp_str = NULL;
- axis2_char_t *ch = NULL;
- axis2_char_t *ch2 = NULL;
- axis2_http_header_t *ret = NULL;
- AXIS2_ENV_CHECK(env, NULL);
+ axis2_char_t *tmp_str = NULL;
+ axis2_char_t *ch = NULL;
+ axis2_char_t *ch2 = NULL;
+ axis2_http_header_t *ret = NULL;
+ AXIS2_ENV_CHECK(env, NULL);
AXIS2_ENV_CHECK(env, NULL);
-
- tmp_str = AXIS2_STRDUP(str, env);
- if(NULL == tmp_str)
- {
- return NULL;
- }
- /* remove trailing \r\n */
- if('\r' == tmp_str[AXIS2_STRLEN(tmp_str)-2])
- {
- tmp_str[AXIS2_STRLEN(tmp_str)-2] = '\0';
- }
-
- ch = strchr((const char*)tmp_str, ':');
- if(NULL == ch)
- {
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HEADER,
- AXIS2_FAILURE);
- AXIS2_FREE(env->allocator, tmp_str);
- return NULL;
- }
- ch2 = ch + sizeof(axis2_char_t);
- /* skip spaces */
- while(' ' == *ch2)
- {
- ch2 += sizeof(axis2_char_t);
- }
- *ch = '\0';
- ret = axis2_http_header_create(env, tmp_str, ch2);
- AXIS2_FREE(env->allocator, tmp_str);
- return ret;
+
+ tmp_str = AXIS2_STRDUP(str, env);
+ if(NULL == tmp_str)
+ {
+ return NULL;
+ }
+ /* remove trailing \r\n */
+ if('\r' == tmp_str[AXIS2_STRLEN(tmp_str)-2])
+ {
+ tmp_str[AXIS2_STRLEN(tmp_str)-2] = '\0';
+ }
+
+ ch = strchr((const char*)tmp_str, ':');
+ if(NULL == ch)
+ {
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HEADER,
+ AXIS2_FAILURE);
+ AXIS2_FREE(env->allocator, tmp_str);
+ return NULL;
+ }
+ ch2 = ch + sizeof(axis2_char_t);
+ /* skip spaces */
+ while(' ' == *ch2)
+ {
+ ch2 += sizeof(axis2_char_t);
+ }
+ *ch = '\0';
+ ret = axis2_http_header_create(env, tmp_str, ch2);
+ AXIS2_FREE(env->allocator, tmp_str);
+ return ret;
}
axis2_status_t AXIS2_CALL
axis2_http_header_free (axis2_http_header_t *header, const axis2_env_t *env)
{
axis2_http_header_impl_t *http_header_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
http_header_impl = AXIS2_INTF_TO_IMPL(header);
if(NULL != http_header_impl->name)
@@ -153,8 +153,8 @@
if(NULL != header->ops)
AXIS2_FREE(env->allocator, header->ops);
- AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(header));
- return AXIS2_SUCCESS;
+ AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(header));
+ return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_out_transport_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/http_out_transport_info.c?rev=411506&r1=411505&r2=411506&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 Sat Jun 3 20:09:08 2006
@@ -22,16 +22,16 @@
/**
* @brief HTTP Header struct impl
- * Axis2 HTTP Header impl
+ * Axis2 HTTP Header impl
*/
typedef struct axis2_http_out_transport_info_impl
- axis2_http_out_transport_info_impl_t;
+ axis2_http_out_transport_info_impl_t;
struct axis2_http_out_transport_info_impl
{
- axis2_http_out_transport_info_t out_transport_info;
- axis2_http_simple_response_t *response;
- axis2_char_t *encoding;
+ axis2_http_out_transport_info_t out_transport_info;
+ axis2_http_simple_response_t *response;
+ axis2_char_t *encoding;
};
#define AXIS2_INTF_TO_IMPL(out_transport_info) \
@@ -40,24 +40,24 @@
/***************************** Function headers *******************************/
axis2_status_t AXIS2_CALL
axis2_http_out_transport_info_set_content_type
- (axis2_http_out_transport_info_t *info, const axis2_env_t *env,
- axis2_char_t *content_type);
+ (axis2_http_out_transport_info_t *info, const axis2_env_t *env,
+ axis2_char_t *content_type);
axis2_status_t AXIS2_CALL
axis2_http_out_transport_info_set_char_encoding
- (axis2_http_out_transport_info_t *info, const axis2_env_t *env,
- axis2_char_t *encoding);
+ (axis2_http_out_transport_info_t *info, const axis2_env_t *env,
+ axis2_char_t *encoding);
axis2_status_t AXIS2_CALL
axis2_http_out_transport_info_free
- (axis2_http_out_transport_info_t *out_transport_info,
- const axis2_env_t *env);
+ (axis2_http_out_transport_info_t *out_transport_info,
+ const axis2_env_t *env);
/***************************** End of function headers ************************/
axis2_http_out_transport_info_t * AXIS2_CALL
axis2_http_out_transport_info_create(const axis2_env_t *env,
- axis2_http_simple_response_t *response)
+ axis2_http_simple_response_t *response)
{
axis2_http_out_transport_info_impl_t *info_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -65,45 +65,45 @@
info_impl = (axis2_http_out_transport_info_impl_t *)AXIS2_MALLOC
(env->allocator, sizeof(
axis2_http_out_transport_info_impl_t));
-
+
if(NULL == info_impl)
- {
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ {
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
- }
+ }
info_impl->response = response;
- info_impl->encoding = NULL;
+ info_impl->encoding = NULL;
info_impl->out_transport_info.ops = AXIS2_MALLOC(env->allocator,
- sizeof(axis2_http_out_transport_info_ops_t));
+ sizeof(axis2_http_out_transport_info_ops_t));
if(NULL == info_impl->out_transport_info.ops)
- {
- axis2_http_out_transport_info_free((axis2_http_out_transport_info_t*)
+ {
+ axis2_http_out_transport_info_free((axis2_http_out_transport_info_t*)
info_impl, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- return NULL;
- }
+ return NULL;
+ }
info_impl->out_transport_info.ops->set_content_type =
- axis2_http_out_transport_info_set_content_type;
+ axis2_http_out_transport_info_set_content_type;
info_impl->out_transport_info.ops->set_char_encoding =
- axis2_http_out_transport_info_set_char_encoding;
+ axis2_http_out_transport_info_set_char_encoding;
info_impl->out_transport_info.ops->free =
- axis2_http_out_transport_info_free;
+ axis2_http_out_transport_info_free;
- return &(info_impl->out_transport_info);
+ return &(info_impl->out_transport_info);
}
axis2_status_t AXIS2_CALL
axis2_http_out_transport_info_free (axis2_http_out_transport_info_t *info,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
axis2_http_out_transport_info_impl_t *info_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
info_impl = AXIS2_INTF_TO_IMPL(info);
-
- info_impl->response = NULL; /* response doesn't belong to info */
+
+ info_impl->response = NULL; /* response doesn't belong to info */
if(NULL != info_impl->encoding)
{
AXIS2_FREE(env->allocator, info_impl->encoding);
@@ -112,8 +112,8 @@
if(NULL != info->ops)
AXIS2_FREE(env->allocator, info->ops);
- AXIS2_FREE(env->allocator, info_impl);
- return AXIS2_SUCCESS;
+ AXIS2_FREE(env->allocator, info_impl);
+ return AXIS2_SUCCESS;
}
axis2_status_t AXIS2_CALL
@@ -129,55 +129,55 @@
axis2_status_t AXIS2_CALL
axis2_http_out_transport_info_set_content_type
- (axis2_http_out_transport_info_t *info, const axis2_env_t *env,
- axis2_char_t *content_type)
+ (axis2_http_out_transport_info_t *info, const axis2_env_t *env,
+ axis2_char_t *content_type)
{
axis2_char_t *tmp1 = NULL;
- axis2_char_t *tmp2 = NULL;
- axis2_http_out_transport_info_impl_t *info_impl = NULL;
-
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ axis2_char_t *tmp2 = NULL;
+ axis2_http_out_transport_info_impl_t *info_impl = NULL;
+
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, content_type, AXIS2_FAILURE);
-
- info_impl = AXIS2_INTF_TO_IMPL(info);
-
- if(NULL != info_impl->encoding)
- {
-
- tmp1 = AXIS2_STRACAT(content_type, ";charset=", env);
- tmp2 = AXIS2_STRACAT(tmp1, info_impl->encoding, env);
- AXIS2_HTTP_SIMPLE_RESPONSE_SET_HEADER(info_impl->response, env,
- axis2_http_header_create(env, AXIS2_HTTP_HEADER_CONTENT_TYPE,
- tmp2));
- AXIS2_FREE(env->allocator, tmp1);
- AXIS2_FREE(env->allocator, tmp2);
- }
- else
- {
- AXIS2_HTTP_SIMPLE_RESPONSE_SET_HEADER(info_impl->response, env,
- axis2_http_header_create(env, AXIS2_HTTP_HEADER_CONTENT_TYPE,
- content_type));
- }
- return AXIS2_SUCCESS;
+
+ info_impl = AXIS2_INTF_TO_IMPL(info);
+
+ if(NULL != info_impl->encoding)
+ {
+
+ tmp1 = AXIS2_STRACAT(content_type, ";charset=", env);
+ tmp2 = AXIS2_STRACAT(tmp1, info_impl->encoding, env);
+ AXIS2_HTTP_SIMPLE_RESPONSE_SET_HEADER(info_impl->response, env,
+ axis2_http_header_create(env, AXIS2_HTTP_HEADER_CONTENT_TYPE,
+ tmp2));
+ AXIS2_FREE(env->allocator, tmp1);
+ AXIS2_FREE(env->allocator, tmp2);
+ }
+ else
+ {
+ AXIS2_HTTP_SIMPLE_RESPONSE_SET_HEADER(info_impl->response, env,
+ axis2_http_header_create(env, AXIS2_HTTP_HEADER_CONTENT_TYPE,
+ content_type));
+ }
+ return AXIS2_SUCCESS;
}
axis2_status_t AXIS2_CALL
axis2_http_out_transport_info_set_char_encoding
- (axis2_http_out_transport_info_t *info, const axis2_env_t *env,
- axis2_char_t *encoding)
+ (axis2_http_out_transport_info_t *info, const axis2_env_t *env,
+ axis2_char_t *encoding)
{
axis2_http_out_transport_info_impl_t *info_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, encoding, AXIS2_FAILURE);
-
+ AXIS2_PARAM_CHECK(env->error, encoding, AXIS2_FAILURE);
+
info_impl = AXIS2_INTF_TO_IMPL(info);
-
- if(NULL != info_impl->encoding)
- {
- AXIS2_FREE(env->allocator, info_impl->encoding);
- }
- info_impl->encoding = AXIS2_STRDUP(encoding, env);
-
- return AXIS2_SUCCESS;
+
+ if(NULL != info_impl->encoding)
+ {
+ AXIS2_FREE(env->allocator, info_impl->encoding);
+ }
+ info_impl->encoding = AXIS2_STRDUP(encoding, env);
+
+ return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_request_line.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/http_request_line.c?rev=411506&r1=411505&r2=411506&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 Sat Jun 3 20:09:08 2006
@@ -21,14 +21,14 @@
#include <stdio.h>
/**
* @brief HTTP Request Line struct impl
- * Axis2 HTTP Request Line impl
+ * Axis2 HTTP Request Line impl
*/
typedef struct axis2_http_request_line_impl axis2_http_request_line_impl_t;
struct axis2_http_request_line_impl
{
- axis2_http_request_line_t request_line;
- axis2_char_t *http_version;
+ axis2_http_request_line_t request_line;
+ axis2_char_t *http_version;
axis2_char_t *method;
axis2_char_t *uri;
};
@@ -64,7 +64,7 @@
axis2_status_t AXIS2_CALL
axis2_http_request_line_free(axis2_http_request_line_t *request_line,
- const axis2_env_t *env);
+ const axis2_env_t *env);
/***************************** End of function headers ************************/
AXIS2_EXTERN axis2_http_request_line_t * AXIS2_CALL
@@ -80,12 +80,12 @@
request_line_impl = (axis2_http_request_line_impl_t *)AXIS2_MALLOC
(env->allocator, sizeof(
axis2_http_request_line_impl_t));
-
+
if(NULL == request_line_impl)
- {
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ {
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
- }
+ }
request_line_impl->method = (axis2_char_t *)AXIS2_STRDUP(method, env);
request_line_impl->uri = (axis2_char_t *)AXIS2_STRDUP(uri, env);
request_line_impl->http_version = (axis2_char_t *)AXIS2_STRDUP(
@@ -94,12 +94,12 @@
request_line_impl->request_line.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_http_request_line_ops_t));
if(NULL == request_line_impl->request_line.ops)
- {
- axis2_http_request_line_free((axis2_http_request_line_t*)
+ {
+ axis2_http_request_line_free((axis2_http_request_line_t*)
request_line_impl, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
- }
+ }
request_line_impl->request_line.ops->get_method =
axis2_http_request_line_get_method;
@@ -111,7 +111,7 @@
axis2_http_request_line_to_string;
request_line_impl->request_line.ops->free =
axis2_http_request_line_free;
- return &(request_line_impl->request_line);
+ return &(request_line_impl->request_line);
}
axis2_status_t AXIS2_CALL
@@ -119,7 +119,7 @@
const axis2_env_t *env)
{
axis2_http_request_line_impl_t *request_line_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
request_line_impl = AXIS2_INTF_TO_IMPL(request_line);
if(NULL != request_line_impl->method)
@@ -140,8 +140,8 @@
if(NULL != request_line->ops)
AXIS2_FREE(env->allocator, request_line->ops);
- AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(request_line));
- return AXIS2_SUCCESS;
+ AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(request_line));
+ return AXIS2_SUCCESS;
}
AXIS2_EXTERN axis2_http_request_line_t* AXIS2_CALL
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org