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 di...@apache.org on 2007/03/17 08:34:27 UTC
svn commit: r519255 [3/4] - in /webservices/axis2/trunk/c/modules:
core/addr/ core/clientapi/ core/context/ core/deployment/ core/description/
core/engine/ core/phaseresolver/ core/receivers/
core/transport/http/common/ core/transport/http/receiver/ co...
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?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c Sat Mar 17 00:34:24 2007
@@ -180,7 +180,7 @@
AXIS2_PARAM_CHECK(env->error, op, AXIS2_FAILURE);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "op name is:%s",
- AXIS2_QNAME_GET_LOCALPART(axis2_op_get_qname(op, env),
+ axis2_qname_get_localpart(axis2_op_get_qname(op, env),
env));
for (i = 1; i < 5; i++)
{
@@ -228,7 +228,7 @@
modulename = (axis2_qname_t *) axis2_array_list_get(moduleqnames, env,
i);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "module name is:%s",
- AXIS2_QNAME_GET_LOCALPART(modulename, env));
+ axis2_qname_get_localpart(modulename, env));
module_desc = AXIS2_CONF_GET_MODULE(phase_resolver->axis2_config, env,
modulename);
if (module_desc)
@@ -301,10 +301,10 @@
{
return AXIS2_FAILURE;
}
- if ((0 != AXIS2_STRCMP(AXIS2_PHASE_TRANSPORT_IN, phase_name)) &&
- (0 != AXIS2_STRCMP(AXIS2_PHASE_DISPATCH, phase_name)) &&
- (0 != AXIS2_STRCMP(AXIS2_PHASE_POST_DISPATCH, phase_name)) &&
- (0 != AXIS2_STRCMP(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
+ if ((0 != axis2_strcmp(AXIS2_PHASE_TRANSPORT_IN, phase_name)) &&
+ (0 != axis2_strcmp(AXIS2_PHASE_DISPATCH, phase_name)) &&
+ (0 != axis2_strcmp(AXIS2_PHASE_POST_DISPATCH, phase_name)) &&
+ (0 != axis2_strcmp(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
{
if (!all_handlers)
{
@@ -348,7 +348,7 @@
AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(phase_resolver->
svc->wsdl_svc->wsdl_component, env, AXIS2_IN_FLOW_KEY);
if (property)
- flow = (axis2_flow_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
+ flow = (axis2_flow_t *) axis2_property_get_value(property, env);
break;
}
case AXIS2_OUT_FLOW:
@@ -357,7 +357,7 @@
AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(phase_resolver->
svc->wsdl_svc->wsdl_component, env, AXIS2_OUT_FLOW_KEY);
if (property)
- flow = (axis2_flow_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
+ flow = (axis2_flow_t *) axis2_property_get_value(property, env);
break;
}
case AXIS2_FAULT_IN_FLOW:
@@ -366,7 +366,7 @@
AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(phase_resolver->
svc->wsdl_svc->wsdl_component, env, AXIS2_IN_FAULTFLOW_KEY);
if (property)
- flow = (axis2_flow_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
+ flow = (axis2_flow_t *) axis2_property_get_value(property, env);
break;
}
case AXIS2_FAULT_OUT_FLOW:
@@ -375,7 +375,7 @@
AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(phase_resolver->
svc->wsdl_svc->wsdl_component, env, AXIS2_OUT_FAULTFLOW_KEY);
if (property)
- flow = (axis2_flow_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
+ flow = (axis2_flow_t *) axis2_property_get_value(property, env);
break;
}
}*/
@@ -409,17 +409,17 @@
}
/* TODO change this in proper way */
- if (!phase_name || (0 == AXIS2_STRCMP(phase_name, "")))
+ if (!phase_name || (0 == axis2_strcmp(phase_name, "")))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_PHASE_IS_NOT_SPECIFED,
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- else if ((0 == AXIS2_STRCMP(AXIS2_PHASE_TRANSPORT_IN, phase_name)) ||
- (0 == AXIS2_STRCMP(AXIS2_PHASE_DISPATCH, phase_name)) ||
- (0 == AXIS2_STRCMP(AXIS2_PHASE_POST_DISPATCH, phase_name)) ||
- (0 == AXIS2_STRCMP(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
+ else if ((0 == axis2_strcmp(AXIS2_PHASE_TRANSPORT_IN, phase_name)) ||
+ (0 == axis2_strcmp(AXIS2_PHASE_DISPATCH, phase_name)) ||
+ (0 == axis2_strcmp(AXIS2_PHASE_POST_DISPATCH, phase_name)) ||
+ (0 == axis2_strcmp(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
{
if (all_handlers)
{
@@ -990,7 +990,7 @@
axis2_hash_this(index_i, NULL, NULL, &v);
op_desc = (axis2_op_t *) v;
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "op name is:%s",
- AXIS2_QNAME_GET_LOCALPART(axis2_op_get_qname(op_desc, env), env));
+ axis2_qname_get_localpart(axis2_op_get_qname(op_desc, env), env));
modules = axis2_op_get_all_modules(op_desc, env);
module_desc_qname = axis2_module_desc_get_qname(module_desc, env);
if (modules)
@@ -1005,7 +1005,7 @@
module_desc_qname_l = axis2_module_desc_get_qname(module_desc_l ,
env);
- if (AXIS2_QNAME_EQUALS(module_desc_qname_l, env, module_desc_qname))
+ if (axis2_qname_equals(module_desc_qname_l, env, module_desc_qname))
{
engaged = AXIS2_TRUE;
break;
@@ -1105,10 +1105,10 @@
{
return AXIS2_FAILURE;
}
- if ((0 != AXIS2_STRCMP(AXIS2_PHASE_TRANSPORT_IN, phase_name)) &&
- (0 != AXIS2_STRCMP(AXIS2_PHASE_DISPATCH, phase_name)) &&
- (0 != AXIS2_STRCMP(AXIS2_PHASE_POST_DISPATCH, phase_name)) &&
- (0 != AXIS2_STRCMP(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
+ if ((0 != axis2_strcmp(AXIS2_PHASE_TRANSPORT_IN, phase_name)) &&
+ (0 != axis2_strcmp(AXIS2_PHASE_DISPATCH, phase_name)) &&
+ (0 != axis2_strcmp(AXIS2_PHASE_POST_DISPATCH, phase_name)) &&
+ (0 != axis2_strcmp(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
{
if (phase_holder)
{
@@ -1247,10 +1247,10 @@
{
return AXIS2_FAILURE;
}
- if ((0 == AXIS2_STRCMP(AXIS2_PHASE_TRANSPORT_IN, phase_name)) ||
- (0 == AXIS2_STRCMP(AXIS2_PHASE_DISPATCH, phase_name)) ||
- (0 == AXIS2_STRCMP(AXIS2_PHASE_POST_DISPATCH, phase_name)) ||
- (0 == AXIS2_STRCMP(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
+ if ((0 == axis2_strcmp(AXIS2_PHASE_TRANSPORT_IN, phase_name)) ||
+ (0 == axis2_strcmp(AXIS2_PHASE_DISPATCH, phase_name)) ||
+ (0 == axis2_strcmp(AXIS2_PHASE_POST_DISPATCH, phase_name)) ||
+ (0 == axis2_strcmp(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
{
status = AXIS2_PHASE_HOLDER_ADD_HANDLER(phase_holder, env,
metadata);
@@ -1329,7 +1329,7 @@
module_desc_l = axis2_array_list_get(modules, env, j);
module_d_qname_l = axis2_module_desc_get_qname(module_desc_l, env);
- if (AXIS2_TRUE == AXIS2_QNAME_EQUALS(module_d_qname, env,
+ if (AXIS2_TRUE == axis2_qname_equals(module_d_qname, env,
module_d_qname_l))
{
engaged = AXIS2_TRUE;
@@ -1445,10 +1445,10 @@
metadata = axis2_flow_get_handler(flow, env, j);
phase_rule = axis2_handler_desc_get_rules(metadata, env);
phase_name = axis2_phase_rule_get_name(phase_rule, env);
- if ((0 != AXIS2_STRCMP(AXIS2_PHASE_TRANSPORT_IN, phase_name)) &&
- (0 != AXIS2_STRCMP(AXIS2_PHASE_DISPATCH, phase_name)) &&
- (0 != AXIS2_STRCMP(AXIS2_PHASE_POST_DISPATCH, phase_name)) &&
- (0 != AXIS2_STRCMP(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
+ if ((0 != axis2_strcmp(AXIS2_PHASE_TRANSPORT_IN, phase_name)) &&
+ (0 != axis2_strcmp(AXIS2_PHASE_DISPATCH, phase_name)) &&
+ (0 != axis2_strcmp(AXIS2_PHASE_POST_DISPATCH, phase_name)) &&
+ (0 != axis2_strcmp(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
{
status = AXIS2_PHASE_HOLDER_ADD_HANDLER(phase_holder,
env, metadata);
@@ -1461,10 +1461,10 @@
}
}
- if ((0 == AXIS2_STRCMP(AXIS2_PHASE_TRANSPORT_IN, phase_name)) ||
- (0 == AXIS2_STRCMP(AXIS2_PHASE_DISPATCH, phase_name)) ||
- (0 == AXIS2_STRCMP(AXIS2_PHASE_POST_DISPATCH, phase_name)) ||
- (0 == AXIS2_STRCMP(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
+ if ((0 == axis2_strcmp(AXIS2_PHASE_TRANSPORT_IN, phase_name)) ||
+ (0 == axis2_strcmp(AXIS2_PHASE_DISPATCH, phase_name)) ||
+ (0 == axis2_strcmp(AXIS2_PHASE_POST_DISPATCH, phase_name)) ||
+ (0 == axis2_strcmp(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
{
axis2_array_list_t *phase_list = NULL;
axis2_phase_holder_t *phase_holder = NULL;
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?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c Sat Mar 17 00:34:24 2007
@@ -87,7 +87,7 @@
return NULL;
}
- msg_recv->scope = AXIS2_STRDUP("app*", env);
+ msg_recv->scope = axis2_strdup ("app*", env);
msg_recv->derived = NULL;
msg_recv->receive = axis2_msg_recv_receive_impl;
@@ -202,7 +202,7 @@
AXIS2_FREE(env->allocator, msg_recv->scope);
msg_recv->scope = NULL;
}
- msg_recv->scope = AXIS2_STRDUP(scope, env);
+ msg_recv->scope = axis2_strdup(scope, env);
if (!msg_recv->scope)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -247,9 +247,9 @@
scope_param = AXIS2_SVC_GET_PARAM(svc, env, AXIS2_SCOPE);
if (scope_param)
{
- param_value = AXIS2_PARAM_GET_VALUE(scope_param, env);
+ param_value = axis2_param_get_value(scope_param, env);
}
- if (param_value && (0 == AXIS2_STRCMP(AXIS2_APPLICATION_SCOPE,
+ if (param_value && (0 == axis2_strcmp(AXIS2_APPLICATION_SCOPE,
param_value)))
{
return AXIS2_SUCCESS;
@@ -262,7 +262,7 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- dll_desc = AXIS2_PARAM_GET_VALUE(impl_info_param, env);
+ dll_desc = axis2_param_get_value(impl_info_param, env);
return axis2_class_loader_delete_dll(env, dll_desc);
}
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?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- 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 Mar 17 00:34:24 2007
@@ -121,7 +121,7 @@
op_desc = axis2_op_ctx_get_op(op_ctx, env);
style = axis2_op_get_style(op_desc, env);
- if (0 == AXIS2_STRCMP(AXIS2_STYLE_DOC, style))
+ if (0 == axis2_strcmp(AXIS2_STYLE_DOC, style))
{
axiom_soap_envelope_t *envelope = NULL;
axiom_soap_body_t *body = NULL;
@@ -132,7 +132,7 @@
om_element = AXIOM_NODE_GET_DATA_ELEMENT(om_node, env);
om_node = AXIOM_NODE_GET_FIRST_ELEMENT(om_node, env);
}
- else if (0 == AXIS2_STRCMP(AXIS2_STYLE_RPC, style))
+ else if (0 == axis2_strcmp(AXIS2_STYLE_RPC, style))
{
axiom_soap_envelope_t *envelope = NULL;
axiom_soap_body_t *body = NULL;
@@ -165,7 +165,7 @@
function_name = (axis2_char_t *) axis2_array_list_get(
function_arr, env, i);
- if (0 == AXIS2_STRCMP(function_name, local_name))
+ if (0 == axis2_strcmp(function_name, local_name))
{
matches = AXIS2_TRUE;
@@ -216,12 +216,12 @@
if (result_node)
{
- if (0 == AXIS2_STRCMP(style, AXIS2_STYLE_RPC))
+ if (0 == axis2_strcmp(style, AXIS2_STYLE_RPC))
{
axiom_namespace_t *ns = NULL;
axis2_char_t *res_name = NULL;
- res_name = AXIS2_STRACAT(local_name, "Response", env);
+ res_name = axis2_stracat(local_name, "Response", env);
ns = axiom_namespace_create(env, "http://soapenc/", "res");
if (!ns)
{
Modified: webservices/axis2/trunk/c/modules/core/transport/http/common/http_header.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/http_header.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/http_header.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/http_header.c Sat Mar 17 00:34:24 2007
@@ -80,8 +80,8 @@
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->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));
@@ -114,15 +114,15 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_ENV_CHECK(env, NULL);
- tmp_str = AXIS2_STRDUP(str, env);
+ 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])
+ if ('\r' == tmp_str[axis2_strlen(tmp_str)-2])
{
- tmp_str[AXIS2_STRLEN(tmp_str)-2] = '\0';
+ tmp_str[axis2_strlen(tmp_str)-2] = '\0';
}
ch = strchr((const char *)tmp_str, ':');
@@ -182,8 +182,8 @@
axis2_char_t *external_form = NULL;
AXIS2_ENV_CHECK(env, NULL);
http_header_impl = AXIS2_INTF_TO_IMPL(header);
- len = AXIS2_STRLEN(http_header_impl->name) +
- AXIS2_STRLEN(http_header_impl->value) + 8;
+ len = axis2_strlen(http_header_impl->name) +
+ axis2_strlen(http_header_impl->value) + 8;
external_form = (axis2_char_t *) AXIS2_MALLOC(env->allocator,
len);
sprintf(external_form, "%s: %s%s", http_header_impl->name,
Modified: webservices/axis2/trunk/c/modules/core/transport/http/common/http_out_transport_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/http_out_transport_info.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/http_out_transport_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/http_out_transport_info.c Sat Mar 17 00:34:24 2007
@@ -153,8 +153,8 @@
axis2_char_t *charset_pos = axis2_strcasestr(content_type, "charset");
if (!charset_pos)
{
- tmp1 = AXIS2_STRACAT(content_type, ";charset=", env);
- tmp2 = AXIS2_STRACAT(tmp1, info_impl->encoding, env);
+ 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));
@@ -195,7 +195,7 @@
{
AXIS2_FREE(env->allocator, info_impl->encoding);
}
- info_impl->encoding = AXIS2_STRDUP(encoding, env);
+ info_impl->encoding = axis2_strdup(encoding, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/common/http_request_line.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/http_request_line.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/http_request_line.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/http_request_line.c Sat Mar 17 00:34:24 2007
@@ -97,9 +97,9 @@
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(
+ 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(
http_version, env);
request_line_impl->request_line.ops = AXIS2_MALLOC(env->allocator,
@@ -171,7 +171,7 @@
AXIS2_PARAM_CHECK(env->error, str, NULL);
- tmp = AXIS2_STRSTR(str, AXIS2_HTTP_CRLF);
+ tmp = axis2_strstr(str, AXIS2_HTTP_CRLF);
if (NULL == tmp)
@@ -265,9 +265,9 @@
req_line_impl = AXIS2_INTF_TO_IMPL(
request_line);
- alloc_len = AXIS2_STRLEN(req_line_impl->method) +
- AXIS2_STRLEN(req_line_impl->uri) +
- AXIS2_STRLEN(req_line_impl->http_version) + 6;
+ alloc_len = axis2_strlen(req_line_impl->method) +
+ axis2_strlen(req_line_impl->uri) +
+ axis2_strlen(req_line_impl->http_version) + 6;
/* 5 = 2 * spaces + '/' +CR + LF + '\0' */
ret = AXIS2_MALLOC(env->allocator,
Modified: webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_request.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_request.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_request.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_request.c Sat Mar 17 00:34:24 2007
@@ -321,7 +321,7 @@
header_name = AXIS2_HTTP_HEADER_GET_NAME((axis2_http_header_t *)
axis2_array_list_get(simple_request_impl->header_group,
env, i), env);
- if (0 == AXIS2_STRCASECMP(name, header_name))
+ if (0 == axis2_strcasecmp(name, header_name))
return AXIS2_TRUE;
}
return AXIS2_FALSE;
@@ -376,7 +376,7 @@
tmp_header = (axis2_http_header_t *)axis2_array_list_get(header_group,
env, i);
tmp_name = AXIS2_HTTP_HEADER_GET_NAME(tmp_header, env);
- if (0 == AXIS2_STRCASECMP(str, tmp_name))
+ if (0 == axis2_strcasecmp(str, tmp_name))
{
return tmp_header;
}
@@ -418,7 +418,7 @@
tmp_header = (axis2_http_header_t *)axis2_array_list_get(header_group,
env, i);
tmp_name = AXIS2_HTTP_HEADER_GET_NAME(tmp_header, env);
- if (0 == AXIS2_STRCASECMP(str, tmp_name))
+ if (0 == axis2_strcasecmp(str, tmp_name))
{
AXIS2_HTTP_HEADER_FREE(tmp_header, env);
axis2_array_list_remove(header_group, env, i);
@@ -550,7 +550,7 @@
tmp_buf2 = AXIS2_MALLOC(env->allocator, 128 * sizeof(char));
while (AXIS2_STREAM_READ(body, env, tmp_buf2, 128) > 0)
{
- tmp_buf3 = AXIS2_STRACAT(tmp_buf, tmp_buf2, env);
+ tmp_buf3 = axis2_stracat(tmp_buf, tmp_buf2, env);
if (tmp_buf)
{
AXIS2_FREE(env->allocator, tmp_buf);
@@ -565,7 +565,7 @@
if (tmp_buf)
{
*buf = tmp_buf;
- return AXIS2_STRLEN(tmp_buf);
+ return axis2_strlen(tmp_buf);
}
return -1;
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_response.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_response.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_response.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_response.c Sat Mar 17 00:34:24 2007
@@ -309,7 +309,7 @@
AXIS2_PARAM_CHECK(env->error, phrase, AXIS2_FAILURE);
tmp_status_line_str = AXIS2_MALLOC(env->allocator,
- (AXIS2_STRLEN(http_ver) + AXIS2_STRLEN(phrase) + 8) *
+ (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);
@@ -434,7 +434,7 @@
tmp_header = (axis2_http_header_t *)axis2_array_list_get(header_group,
env, i);
tmp_name = AXIS2_HTTP_HEADER_GET_NAME(tmp_header, env);
- if (0 == AXIS2_STRCASECMP(str, tmp_name))
+ if (0 == axis2_strcasecmp(str, tmp_name))
{
return tmp_header;
}
@@ -478,7 +478,7 @@
tmp_header = (axis2_http_header_t *)axis2_array_list_get(header_group,
env, i);
tmp_name = AXIS2_HTTP_HEADER_GET_NAME(tmp_header, env);
- if (0 == AXIS2_STRCASECMP(str, tmp_name))
+ if (0 == axis2_strcasecmp(str, tmp_name))
{
AXIS2_HTTP_HEADER_FREE(tmp_header, env);
axis2_array_list_remove(header_group, env, i);
@@ -525,7 +525,7 @@
tmp_header = (axis2_http_header_t *)axis2_array_list_get(header_group,
env, i);
tmp_name = AXIS2_HTTP_HEADER_GET_NAME(tmp_header, env);
- if (0 == AXIS2_STRCASECMP(AXIS2_HTTP_HEADER_GET_NAME(header, env),
+ if (0 == axis2_strcasecmp(AXIS2_HTTP_HEADER_GET_NAME(header, env),
tmp_name))
{
AXIS2_HTTP_HEADER_FREE(tmp_header, env);
@@ -617,7 +617,7 @@
}
AXIS2_INTF_TO_IMPL(simple_response)->stream = body_stream;
}
- AXIS2_STREAM_WRITE(body_stream, env, str, AXIS2_STRLEN(str));
+ AXIS2_STREAM_WRITE(body_stream, env, str, axis2_strlen(str));
return AXIS2_SUCCESS;
}
@@ -727,7 +727,7 @@
header_name = AXIS2_HTTP_HEADER_GET_NAME((axis2_http_header_t *)
axis2_array_list_get(simple_response_impl->header_group,
env, i), env);
- if (0 == AXIS2_STRCASECMP(name, header_name))
+ if (0 == axis2_strcasecmp(name, header_name))
return AXIS2_TRUE;
}
return AXIS2_FALSE;
Modified: webservices/axis2/trunk/c/modules/core/transport/http/common/http_status_line.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/http_status_line.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/http_status_line.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/http_status_line.c Sat Mar 17 00:34:24 2007
@@ -97,7 +97,7 @@
return NULL;
}
status_line_impl->status_line.ops = NULL;
- status_line_impl->line = (axis2_char_t *)AXIS2_STRDUP(str, env);
+ status_line_impl->line = (axis2_char_t *)axis2_strdup(str, env);
status_line_impl->http_version = NULL;
status_line_impl->reason_phrase = NULL;
status_line_impl->status_code = NULL;
@@ -154,11 +154,11 @@
*tmp++ = '\0';
reason_phrase = tmp;
status_line_impl->http_version = (axis2_char_t *)
- AXIS2_STRDUP(http_version, env);
+ axis2_strdup(http_version, env);
status_line_impl->status_code = (axis2_char_t *)
- AXIS2_STRDUP(status_code, env);
+ axis2_strdup(status_code, env);
status_line_impl->reason_phrase = (axis2_char_t *)
- AXIS2_STRDUP(reason_phrase, env);
+ axis2_strdup(reason_phrase, env);
if (NULL == status_line_impl->http_version ||
NULL == status_line_impl->reason_phrase)
@@ -274,7 +274,7 @@
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- if (0 == AXIS2_STRNCASECMP(AXIS2_INTF_TO_IMPL(status_line)->line, "HTTP", 4))
+ if (0 == axis2_strncasecmp(AXIS2_INTF_TO_IMPL(status_line)->line, "HTTP", 4))
{
return AXIS2_TRUE;
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c Sat Mar 17 00:34:24 2007
@@ -212,11 +212,11 @@
encoding_header_value = AXIS2_HTTP_HEADER_GET_VALUE(encoding_header,
env);
}
- if (content_length < 0 && (encoding_header_value && 0 != AXIS2_STRCMP
+ if (content_length < 0 && (encoding_header_value && 0 != axis2_strcmp
(encoding_header_value,
AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED)))
{
- if (0 == AXIS2_STRCASECMP(AXIS2_HTTP_REQUEST_LINE_GET_METHOD(
+ if (0 == axis2_strcasecmp(AXIS2_HTTP_REQUEST_LINE_GET_METHOD(
AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE(
simple_request, env), env), AXIS2_HTTP_HEADER_POST))
{
@@ -242,7 +242,7 @@
axis2_msg_ctx_set_server_side(msg_ctx, env, AXIS2_TRUE);
- if (0 == AXIS2_STRCASECMP(http_version, AXIS2_HTTP_HEADER_PROTOCOL_11))
+ if (0 == axis2_strcasecmp(http_version, AXIS2_HTTP_HEADER_PROTOCOL_11))
{
axis2_http_worker_set_transport_out_config(http_worker, env, conf_ctx,
response);
@@ -258,7 +258,7 @@
http_worker_impl->svr_port,
path);
- url_external_form = AXIS2_URL_TO_EXTERNAL_FORM(request_url, env);
+ url_external_form = axis2_url_to_external_form(request_url, env);
axis2_msg_ctx_set_transport_out_stream(msg_ctx, env, out_stream);
@@ -285,7 +285,7 @@
env);
soap_action_str = axis2_string_create(env, soap_action);
}
- if (0 == AXIS2_STRCASECMP(AXIS2_HTTP_REQUEST_LINE_GET_METHOD(
+ if (0 == axis2_strcasecmp(AXIS2_HTTP_REQUEST_LINE_GET_METHOD(
AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE(
simple_request, env), env), AXIS2_HTTP_HEADER_GET))
{
@@ -293,7 +293,7 @@
(env, msg_ctx, request_body, out_stream,
AXIS2_HTTP_SIMPLE_REQUEST_GET_CONTENT_TYPE(
simple_request, env) , soap_action_str,
- AXIS2_URL_TO_EXTERNAL_FORM(request_url, env),
+ axis2_url_to_external_form(request_url, env),
conf_ctx,
axis2_http_transport_utils_get_request_params(env,
AXIS2_HTTP_REQUEST_LINE_GET_URI(
@@ -313,7 +313,7 @@
axis2_char_t str_len[10];
AXIS2_HTTP_SIMPLE_RESPONSE_SET_BODY_STRING(response, env,
body_string);
- sprintf(str_len, "%d", AXIS2_STRLEN(body_string));
+ sprintf(str_len, "%d", axis2_strlen(body_string));
cont_len = axis2_http_header_create(env,
AXIS2_HTTP_HEADER_CONTENT_LENGTH, str_len);
AXIS2_HTTP_SIMPLE_RESPONSE_SET_HEADER(response, env, cont_len);
@@ -325,7 +325,7 @@
return AXIS2_TRUE;
}
}
- else if (0 == AXIS2_STRCASECMP(AXIS2_HTTP_REQUEST_LINE_GET_METHOD(
+ else if (0 == axis2_strcasecmp(AXIS2_HTTP_REQUEST_LINE_GET_METHOD(
AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE(
simple_request, env), env), AXIS2_HTTP_HEADER_POST))
{
@@ -430,7 +430,7 @@
} /* Done freeing message contexts */
msg_ctx = NULL;
- AXIS2_URL_FREE(request_url, env);
+ axis2_url_free(request_url, env);
axis2_string_free(soap_action_str, env);
request_url = NULL;
return status;
@@ -459,7 +459,7 @@
env, AXIS2_HTTP_HEADER_CONNECTION);
if (conn_header)
{
- if (0 == AXIS2_STRCASECMP(AXIS2_HTTP_HEADER_GET_VALUE(conn_header,
+ if (0 == axis2_strcasecmp(AXIS2_HTTP_HEADER_GET_VALUE(conn_header,
env), AXIS2_HTTP_HEADER_CONNECTION_KEEPALIVE))
{
axis2_http_header_t *header = axis2_http_header_create(env,
@@ -470,7 +470,7 @@
AXIS2_SIMPLE_HTTP_SVR_CONN_SET_KEEP_ALIVE(svr_conn, env,
AXIS2_TRUE);
}
- if (0 == AXIS2_STRCASECMP(AXIS2_HTTP_HEADER_GET_VALUE(conn_header,
+ if (0 == axis2_strcasecmp(AXIS2_HTTP_HEADER_GET_VALUE(conn_header,
env), AXIS2_HTTP_HEADER_CONNECTION_CLOSE))
{
axis2_http_header_t *header = axis2_http_header_create(env,
@@ -485,7 +485,7 @@
else
{
if (AXIS2_HTTP_SIMPLE_RESPONSE_GET_HTTP_VERSION(simple_response, env)
- && AXIS2_STRCASECMP(
+ && axis2_strcasecmp(
AXIS2_HTTP_SIMPLE_RESPONSE_GET_HTTP_VERSION(
simple_response, env), AXIS2_HTTP_HEADER_PROTOCOL_11))
{
Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c Sat Mar 17 00:34:24 2007
@@ -193,12 +193,12 @@
server_impl = AXIS2_INTF_TO_IMPL(server);
server_impl->conf_ctx = conf_ctx;
- param = (axis2_param_t *)AXIS2_PARAM_CONTAINER_GET_PARAM(
+ param = (axis2_param_t *)axis2_param_container_get_param(
axis2_transport_in_desc_param_container(in_desc, env),
env, "port");
if (param)
{
- port_str = AXIS2_PARAM_GET_VALUE(param, env);
+ port_str = axis2_param_get_value(param, env);
}
if (port_str)
{
@@ -280,7 +280,7 @@
AXIS2_PARAM_CHECK(env->error, svc_name, NULL);
host_address = "127.0.0.1"; /* TODO : get from axis2.xml */
- svc_path = AXIS2_STRACAT("/axis2/services/", svc_name, env);
+ svc_path = axis2_stracat("/axis2/services/", svc_name, env);
url = axis2_url_create(env, "http", host_address,
AXIS2_INTF_TO_IMPL(server)->port, svc_path);
AXIS2_FREE(env->allocator, svc_path);
@@ -288,8 +288,8 @@
{
return NULL;
}
- epr = axis2_endpoint_ref_create(env, AXIS2_URL_TO_EXTERNAL_FORM(url, env));
- AXIS2_URL_FREE(url, env);
+ epr = axis2_endpoint_ref_create(env, axis2_url_to_external_form(url, env));
+ axis2_url_free(url, env);
return epr;
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_response_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_response_writer.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- 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 Sat Mar 17 00:34:24 2007
@@ -127,7 +127,7 @@
return NULL;
}
response_writer_impl->stream = stream;
- response_writer_impl->encoding = (axis2_char_t *)AXIS2_STRDUP(encoding, env);
+ response_writer_impl->encoding = (axis2_char_t *)axis2_strdup(encoding, env);
response_writer_impl->response_writer.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_http_response_writer_ops_t));
@@ -282,7 +282,7 @@
AXIS2_PARAM_CHECK(env->error, str, AXIS2_FAILURE);
writer_impl = AXIS2_INTF_TO_IMPL(response_writer);
- len = AXIS2_STRLEN(str);
+ len = axis2_strlen(str);
if (NULL == writer_impl->stream)
{
return AXIS2_FAILURE;
Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/simple_http_svr_conn.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/receiver/simple_http_svr_conn.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- 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 Sat Mar 17 00:34:24 2007
@@ -350,8 +350,8 @@
if (str_line)
{
- if (0 != AXIS2_STRNCASECMP(str_line, "GET", 3) && 0 !=
- AXIS2_STRNCASECMP(str_line, "POST", 4))
+ if (0 != axis2_strncasecmp(str_line, "GET", 3) && 0 !=
+ axis2_strncasecmp(str_line, "POST", 4))
{
char write_buf[512];
sprintf(write_buf, "%s %s\r\n%s: close\r\n\r\n",
@@ -359,7 +359,7 @@
AXIS2_HTTP_RESPONSE_BAD_REQUEST,
AXIS2_HTTP_HEADER_CONNECTION);
AXIS2_STREAM_WRITE(svr_conn_impl->stream, env, write_buf,
- AXIS2_STRLEN(write_buf) + 1);
+ axis2_strlen(write_buf) + 1);
return NULL;
}
}
@@ -423,7 +423,7 @@
}*/
if (AXIS2_TRUE == end_of_line)
{
- if (0 == AXIS2_STRCMP(str_line, AXIS2_HTTP_CRLF))
+ if (0 == axis2_strcmp(str_line, AXIS2_HTTP_CRLF))
{
end_of_headers = AXIS2_TRUE;
}
@@ -490,7 +490,7 @@
axis2_char_t *enc_value = AXIS2_HTTP_HEADER_GET_VALUE(enc_header, env);
if (enc_value)
{
- if (0 == AXIS2_STRCMP(enc_value,
+ if (0 == axis2_strcmp(enc_value,
AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED))
{
chuked_encoding = AXIS2_TRUE;
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- 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 Sat Mar 17 00:34:24 2007
@@ -243,7 +243,7 @@
if (http_client_impl->url)
{
- AXIS2_URL_FREE(http_client_impl->url, env);
+ axis2_url_free(http_client_impl->url, env);
http_client_impl->url = NULL;
}
if (http_client_impl->response)
@@ -324,8 +324,8 @@
else
{
client_impl->sockfd = axis2_network_handler_open_socket(env,
- AXIS2_URL_GET_SERVER(client_impl->url, env),
- AXIS2_URL_GET_PORT(client_impl->url, env));
+ axis2_url_get_server(client_impl->url, env),
+ axis2_url_get_port(client_impl->url, env));
}
if (client_impl->sockfd < 0)
{
@@ -347,15 +347,15 @@
axis2_network_handler_set_sock_option(env, client_impl->sockfd,
SO_SNDTIMEO, client_impl->timeout);
}
- if (0 == AXIS2_STRCASECMP(AXIS2_URL_GET_PROTOCOL(client_impl->url, env),
+ if (0 == axis2_strcasecmp(axis2_url_get_protocol(client_impl->url, env),
"HTTPS"))
{
#ifdef AXIS2_SSL_ENABLED
if (AXIS2_TRUE == client_impl->proxy_enabled)
{
if (AXIS2_SUCCESS != axis2_http_client_connect_ssl_host(client, env,
- AXIS2_URL_GET_SERVER(client_impl->url, env),
- AXIS2_URL_GET_PORT(client_impl->url, env)))
+ axis2_url_get_server(client_impl->url, env),
+ axis2_url_get_port(client_impl->url, env)))
{
return AXIS2_FAILURE;
}
@@ -400,16 +400,16 @@
}
/* check whether we have transfer encoding and then see whether the
* value is "chunked" */
- if (0 == AXIS2_STRCMP(AXIS2_HTTP_HEADER_GET_NAME(tmp_header, env),
+ if (0 == axis2_strcmp(AXIS2_HTTP_HEADER_GET_NAME(tmp_header, env),
AXIS2_HTTP_HEADER_TRANSFER_ENCODING) && 0 ==
- AXIS2_STRCMP(AXIS2_HTTP_HEADER_GET_VALUE(tmp_header,
+ axis2_strcmp(AXIS2_HTTP_HEADER_GET_VALUE(tmp_header,
env), AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED))
{
chunking_enabled = AXIS2_TRUE;
}
header_ext_form = AXIS2_HTTP_HEADER_TO_EXTERNAL_FORM(
tmp_header, env);
- str_header2 = AXIS2_STRACAT(str_header, header_ext_form, env);
+ str_header2 = axis2_stracat(str_header, header_ext_form, env);
AXIS2_FREE(env->allocator, str_header);
str_header = NULL;
AXIS2_FREE(env->allocator, header_ext_form);
@@ -429,24 +429,24 @@
* POST http://host:port/path HTTP/1.x if we have enabled proxies
*/
axis2_char_t *host_port_str = NULL;
- axis2_char_t *server = AXIS2_URL_GET_SERVER(client_impl->url, env);
+ axis2_char_t *server = axis2_url_get_server(client_impl->url, env);
axis2_http_request_line_t *request_line =
AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE(request, env);
axis2_char_t *path = AXIS2_HTTP_REQUEST_LINE_GET_URI(request_line, env);
/* length = len(server) + len(:port) + len("http://") + len(path) + 1*/
- host_port_str = AXIS2_MALLOC(env->allocator, AXIS2_STRLEN(server) +
- + AXIS2_STRLEN(path) + 20 * sizeof(axis2_char_t));
+ host_port_str = AXIS2_MALLOC(env->allocator, axis2_strlen(server) +
+ + axis2_strlen(path) + 20 * sizeof(axis2_char_t));
if (NULL == host_port_str)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- sprintf(host_port_str, "http://%s:%d%s", server, AXIS2_URL_GET_PORT(
+ sprintf(host_port_str, "http://%s:%d%s", server, axis2_url_get_port(
client_impl->url, env), path);
str_request_line = AXIS2_MALLOC(env->allocator,
- AXIS2_STRLEN(host_port_str) + 20 * sizeof(axis2_char_t));
+ axis2_strlen(host_port_str) + 20 * sizeof(axis2_char_t));
sprintf(str_request_line, "%s %s %s\r\n",
AXIS2_HTTP_REQUEST_LINE_GET_METHOD(request_line, env),
host_port_str, AXIS2_HTTP_REQUEST_LINE_GET_HTTP_VERSION(
@@ -455,13 +455,13 @@
host_port_str = NULL;
}
- wire_format = AXIS2_STRACAT(str_request_line, str_header, env);
+ wire_format = axis2_stracat(str_request_line, str_header, env);
AXIS2_FREE(env->allocator, str_header);
str_header = NULL;
AXIS2_FREE(env->allocator, str_request_line);
str_request_line = NULL;
written = AXIS2_STREAM_WRITE(client_impl->data_stream, env, wire_format,
- AXIS2_STRLEN(wire_format));
+ axis2_strlen(wire_format));
AXIS2_FREE(env->allocator, wire_format);
wire_format = NULL;
written = AXIS2_STREAM_WRITE(client_impl->data_stream, env, AXIS2_HTTP_CRLF,
@@ -620,7 +620,7 @@
}
if (AXIS2_TRUE == end_of_line)
{
- if (0 == AXIS2_STRCMP(str_header, AXIS2_HTTP_CRLF))
+ if (0 == axis2_strcmp(str_header, AXIS2_HTTP_CRLF))
{
end_of_headers = AXIS2_TRUE;
}
@@ -681,7 +681,7 @@
AXIS2_PARAM_CHECK(env->error, url, AXIS2_FAILURE);
if (AXIS2_INTF_TO_IMPL(client)->url)
{
- AXIS2_URL_FREE(AXIS2_INTF_TO_IMPL(client)->url, env);
+ axis2_url_free(AXIS2_INTF_TO_IMPL(client)->url, env);
AXIS2_INTF_TO_IMPL(client)->url = NULL;
}
AXIS2_INTF_TO_IMPL(client)->url = url;
@@ -744,12 +744,12 @@
AXIS2_FREE(env->allocator, client_impl->proxy_host_port);
client_impl->proxy_host_port = NULL;
}
- client_impl->proxy_host = AXIS2_STRDUP(proxy_host, env);
+ client_impl->proxy_host = axis2_strdup(proxy_host, env);
if (NULL == client_impl->proxy_host)
{
return AXIS2_FAILURE;
}
- client_impl->proxy_host_port = AXIS2_MALLOC(env->allocator, AXIS2_STRLEN(
+ client_impl->proxy_host_port = AXIS2_MALLOC(env->allocator, axis2_strlen(
proxy_host) + 10 * sizeof(axis2_char_t));
sprintf(client_impl->proxy_host_port, "%s:%d", proxy_host, proxy_port);
client_impl->proxy_enabled = AXIS2_TRUE;
@@ -797,11 +797,11 @@
return AXIS2_FAILURE;
}
connect_string = AXIS2_MALLOC(env->allocator,
- AXIS2_STRLEN(host) * sizeof(axis2_char_t) +
+ axis2_strlen(host) * sizeof(axis2_char_t) +
30 * sizeof(axis2_char_t));
sprintf(connect_string, "CONNECT %s:%d HTTP/1.0\r\n\r\n", host, port);
AXIS2_STREAM_WRITE(tmp_stream, env, connect_string,
- AXIS2_STRLEN(connect_string) * sizeof(axis2_char_t));
+ axis2_strlen(connect_string) * sizeof(axis2_char_t));
memset(str_status_line, 0, 512);
while ((read = AXIS2_STREAM_READ(tmp_stream, env, tmp_buf, 1)) > 0)
@@ -850,7 +850,7 @@
}
if (AXIS2_TRUE == end_of_line)
{
- if (0 == AXIS2_STRCMP(str_status_line, AXIS2_HTTP_CRLF))
+ if (0 == axis2_strcmp(str_status_line, AXIS2_HTTP_CRLF))
{
end_of_response = AXIS2_TRUE;
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c Sat Mar 17 00:34:24 2007
@@ -308,10 +308,10 @@
method = (axis2_property_t *) axis2_msg_ctx_get_property(msg_ctx, env,
AXIS2_HTTP_METHOD, AXIS2_FALSE);
if (method)
- method_value = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE (method, env);
+ method_value = (axis2_char_t *) axis2_property_get_value (method, env);
/* The default is POST */
- if (method_value && 0 == AXIS2_STRCMP(method_value, AXIS2_HTTP_HEADER_GET))
+ if (method_value && 0 == axis2_strcmp(method_value, AXIS2_HTTP_HEADER_GET))
{
send_via_get = AXIS2_TRUE;
}
@@ -346,10 +346,10 @@
* is done at client side
*/
/*property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_FREE_FUNC(property, env,
+ axis2_property_set_scope(property, env, AXIS2_SCOPE_REQUEST);
+ axis2_property_set_free_func(property, env,
axis2_http_client_free_void_arg);
- AXIS2_PROPERTY_SET_VALUE(property, env, sender_impl->client);
+ axis2_property_set_value(property, env, sender_impl->client);
axis2_msg_ctx_set_property(msg_ctx, env, AXIS2_HTTP_CLIENT,
property, AXIS2_FALSE);*/
@@ -379,8 +379,8 @@
AXIS2_DUMP_INPUT_MSG_TRUE, AXIS2_FALSE);
if(dump_property)
{
- axis2_char_t *dump_true = AXIS2_PROPERTY_GET_VALUE(dump_property, env);
- if(0 == AXIS2_STRCMP(dump_true, AXIS2_VALUE_TRUE))
+ axis2_char_t *dump_true = axis2_property_get_value(dump_property, env);
+ if(0 == axis2_strcmp(dump_true, AXIS2_VALUE_TRUE))
{
AXIS2_HTTP_CLIENT_SET_DUMP_INPUT_MSG(sender_impl->client, env, AXIS2_TRUE);
}
@@ -415,7 +415,7 @@
}
request_line = axis2_http_request_line_create(env, "POST",
- AXIS2_URL_GET_PATH(url, env),
+ axis2_url_get_path(url, env),
sender_impl->http_version);
}
else
@@ -424,7 +424,7 @@
axis2_char_t *path = NULL;
request_params = axis2_http_sender_get_param_string( sender, env, msg_ctx);
- path = axis2_strcat(env, AXIS2_URL_GET_PATH(url, env), "?",
+ path = axis2_strcat(env, axis2_url_get_path(url, env), "?",
request_params, NULL);
request_line = axis2_http_request_line_create(env, "GET", path,
sender_impl->http_version);
@@ -440,7 +440,7 @@
if ('\"' != *soap_action)
{
axis2_char_t *tmp_soap_action = NULL;
- tmp_soap_action = AXIS2_MALLOC(env->allocator, (AXIS2_STRLEN(soap_action) + 5) * sizeof(axis2_char_t));
+ tmp_soap_action = AXIS2_MALLOC(env->allocator, (axis2_strlen(soap_action) + 5) * sizeof(axis2_char_t));
sprintf(tmp_soap_action, "\"%s\"", soap_action);
axis2_http_sender_util_add_header (env, request, AXIS2_HTTP_HEADER_SOAP_ACTION, tmp_soap_action);
AXIS2_FREE(env->allocator, tmp_soap_action);
@@ -489,10 +489,10 @@
if (axis2_strcmp(soap_action, ""))
{
axis2_char_t *temp_content_type = NULL;
- temp_content_type = AXIS2_STRACAT(content_type, ";action=", env);
+ temp_content_type = axis2_stracat(content_type, ";action=", env);
AXIS2_FREE(env->allocator, content_type);
content_type = temp_content_type;
- temp_content_type = AXIS2_STRACAT(content_type, soap_action, env);
+ temp_content_type = axis2_stracat(content_type, soap_action, env);
AXIS2_FREE(env->allocator, content_type);
content_type = temp_content_type;
}
@@ -502,8 +502,8 @@
{
axis2_char_t *temp_content_type = NULL;
content_type = (axis2_char_t *)AXIS2_HTTP_HEADER_ACCEPT_TEXT_XML;
- content_type = AXIS2_STRACAT(content_type, ";charset=", env);
- temp_content_type = AXIS2_STRACAT(content_type, char_set_enc, env);
+ content_type = axis2_stracat(content_type, ";charset=", env);
+ temp_content_type = axis2_stracat(content_type, char_set_enc, env);
AXIS2_FREE(env->allocator, content_type);
content_type = temp_content_type;
}
@@ -511,20 +511,20 @@
{
axis2_char_t *temp_content_type = NULL;
content_type = (axis2_char_t *)AXIS2_HTTP_HEADER_ACCEPT_APPL_SOAP;
- content_type = AXIS2_STRACAT(content_type, ";charset=", env);
- temp_content_type = AXIS2_STRACAT(content_type, char_set_enc, env);
+ content_type = axis2_stracat(content_type, ";charset=", env);
+ temp_content_type = axis2_stracat(content_type, char_set_enc, env);
AXIS2_FREE(env->allocator, content_type);
content_type = temp_content_type;
if (axis2_strcmp(soap_action, ""))
{
- temp_content_type = AXIS2_STRACAT(content_type, ";action=", env);
+ temp_content_type = axis2_stracat(content_type, ";action=", env);
AXIS2_FREE(env->allocator, content_type);
content_type = temp_content_type;
- temp_content_type = AXIS2_STRACAT(content_type, soap_action, env);
+ temp_content_type = axis2_stracat(content_type, soap_action, env);
AXIS2_FREE(env->allocator, content_type);
content_type = temp_content_type;
}
- temp_content_type = AXIS2_STRACAT(content_type, ";", env);
+ temp_content_type = axis2_stracat(content_type, ";", env);
AXIS2_FREE(env->allocator, content_type);
content_type = temp_content_type;
}
@@ -538,7 +538,7 @@
if (content_type_property)
{
- content_type_hash = (axis2_hash_t *) AXIS2_PROPERTY_GET_VALUE (content_type_property, env);
+ content_type_hash = (axis2_hash_t *) axis2_property_get_value (content_type_property, env);
if (content_type_hash)
content_type_value = (char *) axis2_hash_get (content_type_hash,
AXIS2_HTTP_HEADER_CONTENT_TYPE,
@@ -559,15 +559,15 @@
}*/
}
- if (0 == AXIS2_STRCMP(sender_impl->http_version,
+ if (0 == axis2_strcmp(sender_impl->http_version,
AXIS2_HTTP_HEADER_PROTOCOL_11))
{
axis2_char_t *header = NULL;
- header = AXIS2_MALLOC(env->allocator, AXIS2_STRLEN(
- AXIS2_URL_GET_SERVER(url, env)) + 10 * sizeof(
+ header = AXIS2_MALLOC(env->allocator, axis2_strlen(
+ axis2_url_get_server(url, env)) + 10 * sizeof(
axis2_char_t));
- sprintf(header, "%s:%d", AXIS2_URL_GET_SERVER(url, env),
- AXIS2_URL_GET_PORT(url, env));
+ sprintf(header, "%s:%d", axis2_url_get_server(url, env),
+ axis2_url_get_port(url, env));
axis2_http_sender_util_add_header (env, request, AXIS2_HTTP_HEADER_HOST, header);
AXIS2_FREE(env->allocator, header);
header = NULL;
@@ -601,12 +601,11 @@
if (ssl_pp_param)
{
- ssl_pp = AXIS2_PARAM_GET_VALUE(ssl_pp_param, env);
+ ssl_pp = axis2_param_get_value(ssl_pp_param, env);
}
status_code = AXIS2_HTTP_CLIENT_SEND(sender_impl->client, env, request, ssl_pp);
-
/*AXIS2_FREE(env->allocator, buffer);
buffer = NULL;*/
@@ -643,8 +642,8 @@
AXIS2_FAILURE);
/* handle one way case */
- if (AXIS2_STRCMP(mep, AXIS2_MEP_URI_OUT_ONLY) == 0 ||
- AXIS2_STRCMP(mep, AXIS2_MEP_URI_ROBUST_OUT_ONLY) == 0)
+ if (axis2_strcmp(mep, AXIS2_MEP_URI_OUT_ONLY) == 0 ||
+ axis2_strcmp(mep, AXIS2_MEP_URI_ROBUST_OUT_ONLY) == 0)
{
return AXIS2_FAILURE;
}
@@ -659,8 +658,8 @@
}
- if (tmp_header_val && (AXIS2_STRSTR(tmp_header_val,
- AXIS2_HTTP_HEADER_ACCEPT_APPL_SOAP) || AXIS2_STRSTR(
+ if (tmp_header_val && (axis2_strstr(tmp_header_val,
+ AXIS2_HTTP_HEADER_ACCEPT_APPL_SOAP) || axis2_strstr(
tmp_header_val, AXIS2_HTTP_HEADER_ACCEPT_TEXT_XML)))
{
return axis2_http_sender_process_response(sender, env,
@@ -734,30 +733,30 @@
header, env);
if (name)
{
- if (0 == AXIS2_STRCMP(name, AXIS2_HTTP_HEADER_TRANSFER_ENCODING) &&
- 0 == AXIS2_STRCMP(AXIS2_HTTP_HEADER_GET_VALUE(header
+ if (0 == axis2_strcmp(name, AXIS2_HTTP_HEADER_TRANSFER_ENCODING) &&
+ 0 == axis2_strcmp(AXIS2_HTTP_HEADER_GET_VALUE(header
, env), AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED))
{
axis2_char_t *transfer_encoding = NULL;
/* transfer_encoding = */
-/* AXIS2_STRDUP(AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED, */
+/* axis2_strdup(AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED, */
/* env); */
/* property = axis2_property_create(env); */
-/* AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST); */
-/* AXIS2_PROPERTY_SET_VALUE(property, env, transfer_encoding); */
+/* axis2_property_set_scope(property, env, AXIS2_SCOPE_REQUEST); */
+/* axis2_property_set_value(property, env, transfer_encoding); */
/* axis2_msg_ctx_set_property(msg_ctx, env, */
/* AXIS2_HTTP_HEADER_TRANSFER_ENCODING, */
/* property, */
/* AXIS2_FALSE); */
/* response_chunked = AXIS2_TRUE; */
transfer_encoding =
- AXIS2_STRDUP(AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED,
+ axis2_strdup(AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED,
env);
response_chunked = AXIS2_TRUE;
axis2_msg_ctx_set_transfer_encoding(msg_ctx, env, transfer_encoding);
}
- if (0 != AXIS2_STRCMP(name, AXIS2_HTTP_HEADER_CONTENT_TYPE))
+ if (0 != axis2_strcmp(name, AXIS2_HTTP_HEADER_CONTENT_TYPE))
{
axis2_char_t *tmp_charset = NULL;
axis2_char_t *content_type = AXIS2_HTTP_HEADER_GET_VALUE(header,
@@ -765,7 +764,7 @@
tmp_charset = strstr(content_type, AXIS2_HTTP_CHAR_SET_ENCODING);
if (charset)
{
- charset = AXIS2_STRDUP(tmp_charset, env);
+ charset = axis2_strdup(tmp_charset, env);
break;
}
}
@@ -781,8 +780,8 @@
axis2_ctx_t *axis_ctx = axis2_op_ctx_get_base(
axis2_msg_ctx_get_op_ctx(msg_ctx, env), env);
property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(content_type,
+ axis2_property_set_scope(property, env, AXIS2_SCOPE_REQUEST);
+ axis2_property_set_value(property, env, axis2_strdup(content_type,
env));
axis2_ctx_set_property(axis_ctx, env, MTOM_RECIVED_CONTENT_TYPE,
property, AXIS2_FALSE);
@@ -795,8 +794,8 @@
if (axis_ctx)
{
property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, charset);
+ axis2_property_set_scope(property, env, AXIS2_SCOPE_REQUEST);
+ axis2_property_set_value(property, env, charset);
axis2_ctx_set_property(axis_ctx, env, AXIS2_CHARACTER_SET_ENCODING,
property, AXIS2_FALSE);
}
@@ -812,8 +811,8 @@
tmp_len = AXIS2_HTTP_SIMPLE_RESPONSE_GET_CONTENT_LENGTH(response, env);
memcpy(content_length, &tmp_len, sizeof(int));
property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, content_length);
+ axis2_property_set_scope(property, env, AXIS2_SCOPE_REQUEST);
+ axis2_property_set_value(property, env, content_length);
axis2_msg_ctx_set_property(msg_ctx, env,
AXIS2_HTTP_HEADER_CONTENT_LENGTH, property,
AXIS2_FALSE);
@@ -847,9 +846,9 @@
/*axis_ctx = axis2_op_ctx_get_base( axis2_msg_ctx_get_op_ctx(msg_ctx, env),
env);*/
property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_FREE_FUNC(property, env, axis2_stream_free_void_arg);
- AXIS2_PROPERTY_SET_VALUE(property, env, in_stream);
+ axis2_property_set_scope(property, env, AXIS2_SCOPE_REQUEST);
+ axis2_property_set_free_func(property, env, axis2_stream_free_void_arg);
+ axis2_property_set_value(property, env, in_stream);
/*axis2_ctx_set_property(axis_ctx, env, AXIS2_TRANSPORT_IN, property,
AXIS2_FALSE);*/
axis2_msg_ctx_set_property(msg_ctx, env, AXIS2_TRANSPORT_IN, property,
@@ -875,7 +874,7 @@
if (tmp_param)
{
- so_str = (axis2_char_t *)AXIS2_PARAM_GET_VALUE(tmp_param, env);
+ so_str = (axis2_char_t *)axis2_param_get_value(tmp_param, env);
if (so_str)
{
AXIS2_INTF_TO_IMPL(sender)->so_timeout = AXIS2_ATOI(so_str);
@@ -885,7 +884,7 @@
AXIS2_HTTP_CONNECTION_TIMEOUT);
if (tmp_param)
{
- connection_str = (axis2_char_t *)AXIS2_PARAM_GET_VALUE(tmp_param, env);
+ connection_str = (axis2_char_t *)axis2_param_get_value(tmp_param, env);
if (connection_str)
{
AXIS2_INTF_TO_IMPL(sender)->connection_timeout =
@@ -902,7 +901,7 @@
axis2_char_t *version)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_INTF_TO_IMPL(sender)->http_version = AXIS2_STRDUP(version, env);
+ AXIS2_INTF_TO_IMPL(sender)->http_version = axis2_strdup(version, env);
if (NULL == AXIS2_INTF_TO_IMPL(sender)->http_version)
{
return AXIS2_FAILURE;
@@ -944,12 +943,12 @@
return AXIS2_FAILURE;
}
- proxy_param = AXIS2_PARAM_CONTAINER_GET_PARAM(
+ proxy_param = axis2_param_container_get_param(
axis2_transport_out_desc_param_container(trans_desc, env),
env, AXIS2_HTTP_PROXY);
if (proxy_param)
{
- transport_attrs = AXIS2_PARAM_GET_ATTRIBUTES(proxy_param, env);
+ transport_attrs = axis2_param_get_attributes(proxy_param, env);
if (transport_attrs)
{
axis2_generic_obj_t *obj = NULL;
@@ -1023,7 +1022,7 @@
AXIS2_SSL_SERVER_CERT, AXIS2_FALSE);
if(server_cert_property)
{
- server_cert = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(
+ server_cert = (axis2_char_t *) axis2_property_get_value(
server_cert_property, env);
}
else
@@ -1032,7 +1031,7 @@
AXIS2_SSL_SERVER_CERT);
if(server_cert_param)
{
- server_cert = (axis2_char_t *) AXIS2_PARAM_GET_VALUE(
+ server_cert = (axis2_char_t *) axis2_param_get_value(
server_cert_param, env);
}
}
@@ -1066,7 +1065,7 @@
AXIS2_SSL_KEY_FILE, AXIS2_FALSE);
if(key_file_property)
{
- key_file = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(
+ key_file = (axis2_char_t *) axis2_property_get_value(
key_file_property, env);
}
else
@@ -1075,7 +1074,7 @@
AXIS2_SSL_KEY_FILE);
if(key_file_param)
{
- key_file = (axis2_char_t *) AXIS2_PARAM_GET_VALUE(
+ key_file = (axis2_char_t *) axis2_param_get_value(
key_file_param, env);
}
}
@@ -1170,7 +1169,7 @@
pair = axis2_array_list_get(param_list, env, i);
if(i ==0)
- tmp_string = AXIS2_STRACAT(param_string, pair, env);
+ tmp_string = axis2_stracat(param_string, pair, env);
else
tmp_string = axis2_strcat(env, param_string, "&", pair, NULL);
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- 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 Sat Mar 17 00:34:24 2007
@@ -102,7 +102,7 @@
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- transport_sender_impl->http_version = AXIS2_STRDUP(
+ transport_sender_impl->http_version = axis2_strdup(
AXIS2_HTTP_HEADER_PROTOCOL_11, env);
transport_sender_impl->chunked = AXIS2_TRUE;
transport_sender_impl->connection_timeout =
@@ -181,7 +181,7 @@
AXIS2_CHARACTER_SET_ENCODING, AXIS2_FALSE);
if (property)
{
- char_set_enc = AXIS2_PROPERTY_GET_VALUE(property, env);
+ char_set_enc = axis2_property_get_value(property, env);
property = NULL;
}*/
char_set_enc_str = axis2_msg_ctx_get_charset_encoding(msg_ctx, env);
@@ -202,7 +202,7 @@
AXIS2_CHARACTER_SET_ENCODING, AXIS2_FALSE);
if (property)
{
- char_set_enc = AXIS2_PROPERTY_GET_VALUE(property, env);
+ char_set_enc = axis2_property_get_value(property, env);
property = NULL;
}
}
@@ -233,10 +233,10 @@
else
{
axis2_endpoint_ref_t *ctx_epr = axis2_msg_ctx_get_to(msg_ctx, env);
- if (ctx_epr && 0 != AXIS2_STRCMP(
+ if (ctx_epr && 0 != axis2_strcmp(
AXIS2_WSA_ANONYMOUS_URL_SUBMISSION,
axis2_endpoint_ref_get_address(ctx_epr, env)) &&
- 0 != AXIS2_STRCMP(AXIS2_WSA_ANONYMOUS_URL,
+ 0 != axis2_strcmp(AXIS2_WSA_ANONYMOUS_URL,
axis2_endpoint_ref_get_address(ctx_epr, env)))
{
epr = ctx_epr;
@@ -271,8 +271,8 @@
axiom_output_set_soap11(om_output, env, axis2_msg_ctx_get_is_soap_11(msg_ctx, env));
if (epr)
{
- if (AXIS2_STRCMP(AXIS2_WSA_NONE_URL_SUBMISSION, axis2_endpoint_ref_get_address(epr, env)) == 0 ||
- AXIS2_STRCMP(AXIS2_WSA_NONE_URL, axis2_endpoint_ref_get_address(epr, env)) == 0)
+ if (axis2_strcmp(AXIS2_WSA_NONE_URL_SUBMISSION, axis2_endpoint_ref_get_address(epr, env)) == 0 ||
+ axis2_strcmp(AXIS2_WSA_NONE_URL, axis2_endpoint_ref_get_address(epr, env)) == 0)
{
epr = NULL;
}
@@ -448,16 +448,16 @@
AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, out_desc, AXIS2_FAILURE);
- version_param = AXIS2_PARAM_CONTAINER_GET_PARAM(
+ version_param = axis2_param_container_get_param(
axis2_transport_out_desc_param_container(out_desc, env), env,
AXIS2_HTTP_PROTOCOL_VERSION);
if (version_param)
{
- version = AXIS2_PARAM_GET_VALUE(version_param, env);
+ version = axis2_param_get_value(version_param, env);
}
if (version)
{
- if (0 == AXIS2_STRCMP(version, AXIS2_HTTP_HEADER_PROTOCOL_11))
+ if (0 == axis2_strcmp(version, AXIS2_HTTP_HEADER_PROTOCOL_11))
{
axis2_char_t *encoding = NULL;
axis2_param_t *encoding_param = NULL;
@@ -466,16 +466,16 @@
AXIS2_FREE(env->allocator,
AXIS2_INTF_TO_IMPL(transport_sender)->http_version);
}
- AXIS2_INTF_TO_IMPL(transport_sender)->http_version = AXIS2_STRDUP(
+ AXIS2_INTF_TO_IMPL(transport_sender)->http_version = axis2_strdup(
version, env);
- encoding_param = AXIS2_PARAM_CONTAINER_GET_PARAM(
+ encoding_param = axis2_param_container_get_param(
axis2_transport_out_desc_param_container(out_desc, env), env,
AXIS2_HTTP_HEADER_TRANSFER_ENCODING);
if (encoding_param)
{
- encoding = AXIS2_PARAM_GET_VALUE(encoding_param, env);
+ encoding = axis2_param_get_value(encoding_param, env);
}
- if (encoding && 0 == AXIS2_STRCMP(encoding,
+ if (encoding && 0 == axis2_strcmp(encoding,
AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED))
{
AXIS2_INTF_TO_IMPL(transport_sender)->chunked = AXIS2_TRUE;
@@ -485,14 +485,14 @@
AXIS2_INTF_TO_IMPL(transport_sender)->chunked = AXIS2_FALSE;
}
}
- else if (0 == AXIS2_STRCMP(version, AXIS2_HTTP_HEADER_PROTOCOL_10))
+ else if (0 == axis2_strcmp(version, AXIS2_HTTP_HEADER_PROTOCOL_10))
{
if (AXIS2_INTF_TO_IMPL(transport_sender)->http_version)
{
AXIS2_FREE(env->allocator,
AXIS2_INTF_TO_IMPL(transport_sender)->http_version);
}
- AXIS2_INTF_TO_IMPL(transport_sender)->http_version = AXIS2_STRDUP(
+ AXIS2_INTF_TO_IMPL(transport_sender)->http_version = axis2_strdup(
version, env);
AXIS2_INTF_TO_IMPL(transport_sender)->chunked = AXIS2_FALSE;
}
@@ -505,23 +505,23 @@
}
- temp_param = AXIS2_PARAM_CONTAINER_GET_PARAM(
+ temp_param = axis2_param_container_get_param(
axis2_transport_out_desc_param_container(out_desc, env), env,
AXIS2_HTTP_SO_TIMEOUT);
if (temp_param)
{
- temp = AXIS2_PARAM_GET_VALUE(temp_param, env);
+ temp = axis2_param_get_value(temp_param, env);
}
if (temp)
{
AXIS2_INTF_TO_IMPL(transport_sender)->so_timeout = AXIS2_ATOI(temp);
}
- temp = (axis2_char_t *)AXIS2_PARAM_CONTAINER_GET_PARAM(
+ temp = (axis2_char_t *)axis2_param_container_get_param(
axis2_transport_out_desc_param_container(out_desc, env), env,
AXIS2_HTTP_CONNECTION_TIMEOUT);
if (temp_param)
{
- temp = AXIS2_PARAM_GET_VALUE(temp_param, env);
+ temp = axis2_param_get_value(temp_param, env);
}
if (temp)
{
@@ -602,9 +602,9 @@
const axis2_char_t *mep = axis2_op_get_msg_exchange_pattern(op, env);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "OP name axis2_qname_get_localpart = %s",
mep);
- if (AXIS2_STRCMP(mep, AXIS2_MEP_URI_OUT_ONLY) == 0 ||
- AXIS2_STRCMP(mep, AXIS2_MEP_URI_ROBUST_OUT_ONLY) == 0 ||
- AXIS2_STRCMP(mep, AXIS2_MEP_URI_IN_ONLY) == 0)
+ if (axis2_strcmp(mep, AXIS2_MEP_URI_OUT_ONLY) == 0 ||
+ axis2_strcmp(mep, AXIS2_MEP_URI_ROBUST_OUT_ONLY) == 0 ||
+ axis2_strcmp(mep, AXIS2_MEP_URI_IN_ONLY) == 0)
{
return status;
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c Sat Mar 17 00:34:24 2007
@@ -120,10 +120,10 @@
method = (axis2_property_t *) axis2_msg_ctx_get_property(msg_ctx, env,
AXIS2_HTTP_METHOD, AXIS2_FALSE);
if (method)
- method_value = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE (method, env);
+ method_value = (axis2_char_t *) axis2_property_get_value (method, env);
/* The default is POST */
- if (method_value && 0 == AXIS2_STRCMP(method_value, AXIS2_HTTP_HEADER_GET))
+ if (method_value && 0 == axis2_strcmp(method_value, AXIS2_HTTP_HEADER_GET))
{
send_via_get = AXIS2_TRUE;
}
@@ -158,16 +158,16 @@
{
axis2_char_t *tmp_soap_action = NULL;
tmp_soap_action = AXIS2_MALLOC(env->allocator, (
- AXIS2_STRLEN(soap_action) + 5) * sizeof(axis2_char_t));
+ axis2_strlen(soap_action) + 5) * sizeof(axis2_char_t));
sprintf(tmp_soap_action, "\"%s\"", soap_action);
headers = curl_slist_append (headers,
- AXIS2_STRACAT (soap_action_header, tmp_soap_action,env));
+ axis2_stracat (soap_action_header, tmp_soap_action,env));
AXIS2_FREE(env->allocator, tmp_soap_action);
}
else
{
headers = curl_slist_append (headers,
- AXIS2_STRACAT (soap_action_header, soap_action,env));
+ axis2_stracat (soap_action_header, soap_action,env));
}
}
@@ -183,10 +183,10 @@
if (axis2_strcmp(soap_action, ""))
{
axis2_char_t *temp_content_type = NULL;
- temp_content_type = AXIS2_STRACAT(content_type, ";action=", env);
+ temp_content_type = axis2_stracat(content_type, ";action=", env);
AXIS2_FREE(env->allocator, content_type);
content_type = temp_content_type;
- temp_content_type = AXIS2_STRACAT(content_type, soap_action, env);
+ temp_content_type = axis2_stracat(content_type, soap_action, env);
AXIS2_FREE(env->allocator, content_type);
content_type = temp_content_type;
}
@@ -196,8 +196,8 @@
{
axis2_char_t *temp_content_type = NULL;
content_type = (axis2_char_t *)AXIS2_HTTP_HEADER_ACCEPT_TEXT_XML;
- content_type = AXIS2_STRACAT(content_type, ";charset=", env);
- temp_content_type = AXIS2_STRACAT(content_type, char_set_enc, env);
+ content_type = axis2_stracat(content_type, ";charset=", env);
+ temp_content_type = axis2_stracat(content_type, char_set_enc, env);
AXIS2_FREE(env->allocator, content_type);
content_type = temp_content_type;
}
@@ -205,20 +205,20 @@
{
axis2_char_t *temp_content_type = NULL;
content_type = (axis2_char_t *)AXIS2_HTTP_HEADER_ACCEPT_APPL_SOAP;
- content_type = AXIS2_STRACAT(content_type, ";charset=", env);
- temp_content_type = AXIS2_STRACAT(content_type, char_set_enc, env);
+ content_type = axis2_stracat(content_type, ";charset=", env);
+ temp_content_type = axis2_stracat(content_type, char_set_enc, env);
AXIS2_FREE(env->allocator, content_type);
content_type = temp_content_type;
if (axis2_strcmp(soap_action, ""))
{
- temp_content_type = AXIS2_STRACAT(content_type, ";action=", env);
+ temp_content_type = axis2_stracat(content_type, ";action=", env);
AXIS2_FREE(env->allocator, content_type);
content_type = temp_content_type;
- temp_content_type = AXIS2_STRACAT(content_type, soap_action, env);
+ temp_content_type = axis2_stracat(content_type, soap_action, env);
AXIS2_FREE(env->allocator, content_type);
content_type = temp_content_type;
}
- temp_content_type = AXIS2_STRACAT(content_type, ";", env);
+ temp_content_type = axis2_stracat(content_type, ";", env);
AXIS2_FREE(env->allocator, content_type);
content_type = temp_content_type;
}
@@ -237,7 +237,7 @@
if (content_type_property)
{
- content_type_hash = (axis2_hash_t *) AXIS2_PROPERTY_GET_VALUE (content_type_property, env);
+ content_type_hash = (axis2_hash_t *) axis2_property_get_value (content_type_property, env);
if (content_type_hash)
content_type_value = (char *) axis2_hash_get (content_type_hash,
AXIS2_HTTP_HEADER_CONTENT_TYPE,
@@ -260,8 +260,8 @@
{
char tmp_buf[10];
sprintf (tmp_buf, "%d", buffer_size);
- headers = curl_slist_append (headers, AXIS2_STRACAT (content_len, tmp_buf, env));
- headers = curl_slist_append (headers, AXIS2_STRACAT (content,content_type, env));
+ headers = curl_slist_append (headers, axis2_stracat (content_len, tmp_buf, env));
+ headers = curl_slist_append (headers, axis2_stracat (content,content_type, env));
}
if (!doing_mtom)
{
@@ -298,9 +298,9 @@
in_stream = axis2_stream_create_libcurl (env, data->memory, data->size);
trans_in_property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(trans_in_property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_FREE_FUNC(trans_in_property, env, axis2_stream_free_void_arg);
- AXIS2_PROPERTY_SET_VALUE(trans_in_property, env, in_stream);
+ axis2_property_set_scope(trans_in_property, env, AXIS2_SCOPE_REQUEST);
+ axis2_property_set_free_func(trans_in_property, env, axis2_stream_free_void_arg);
+ axis2_property_set_value(trans_in_property, env, in_stream);
axis2_msg_ctx_set_property(msg_ctx, env, AXIS2_TRANSPORT_IN, trans_in_property,
AXIS2_FALSE);
return AXIS2_SUCCESS;
@@ -337,7 +337,7 @@
memcpy(&(mem->memory[mem->size]), ptr, realsize);
mem->size += realsize;
mem->memory[mem->size] = 0;
- axis2_array_list_add (mem->alist, mem->env, AXIS2_STRDUP (mem->memory, mem->env));
+ axis2_array_list_add (mem->alist, mem->env, axis2_strdup (mem->memory, mem->env));
}
return realsize;
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_out_transport_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_out_transport_info.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_out_transport_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_out_transport_info.c Sat Mar 17 00:34:24 2007
@@ -168,7 +168,7 @@
{
AXIS2_FREE(env->allocator, info_impl->encoding);
}
- info_impl->encoding = AXIS2_STRDUP(encoding, env);
+ info_impl->encoding = axis2_strdup(encoding, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_out_transport_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_out_transport_info.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_out_transport_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_out_transport_info.c Sat Mar 17 00:34:24 2007
@@ -151,8 +151,8 @@
if (info_impl->encoding)
{
- tmp1 = AXIS2_STRACAT(content_type, ";charset=", env);
- tmp2 = AXIS2_STRACAT(tmp1, info_impl->encoding, env);
+ tmp1 = axis2_stracat(content_type, ";charset=", env);
+ tmp2 = axis2_stracat(tmp1, info_impl->encoding, env);
info_impl->request->content_type = apr_pstrdup(info_impl->request->pool,
tmp2);
AXIS2_FREE(env->allocator, tmp1);
@@ -183,7 +183,7 @@
{
AXIS2_FREE(env->allocator, info_impl->encoding);
}
- info_impl->encoding = AXIS2_STRDUP(encoding, env);
+ info_impl->encoding = axis2_strdup(encoding, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c Sat Mar 17 00:34:24 2007
@@ -174,7 +174,7 @@
}
content_length = request->remaining;
http_version = request->protocol;
- /*req_url = AXIS2_URL_TO_EXTERNAL_FORM(url, env);*/
+ /*req_url = axis2_url_to_external_form(url, env);*/
req_url = request->unparsed_uri;
content_type = (axis2_char_t *)apr_table_get(request->headers_in,
@@ -308,7 +308,7 @@
/*if (url)
{
- AXIS2_URL_FREE(url, env);
+ axis2_url_free(url, env);
url = NULL;
}
if (req_url)
Modified: webservices/axis2/trunk/c/modules/core/transport/http/util/http_chunked_stream.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/util/http_chunked_stream.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/util/http_chunked_stream.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/util/http_chunked_stream.c Sat Mar 17 00:34:24 2007
@@ -219,7 +219,7 @@
return -1;
}
sprintf(tmp_buf, "%x%s", (unsigned int)count, AXIS2_HTTP_CRLF);
- len = AXIS2_STREAM_WRITE(stream, env, tmp_buf, AXIS2_STRLEN(tmp_buf));
+ 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;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org