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 pi...@apache.org on 2007/04/03 10:25:17 UTC
svn commit: r525082 [3/4] - in /webservices/axis2/trunk/c:
axiom/src/attachments/ axiom/src/om/ axiom/src/parser/libxml2/
axiom/src/soap/ axiom/src/util/ axiom/test/om/ axiom/test/soap/
guththila/src/ modules/core/addr/ modules/core/clientapi/ modules/...
Modified: webservices/axis2/trunk/c/modules/core/transport/http/common/http_response_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/http_response_writer.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/http_response_writer.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/http_response_writer.c Tue Apr 3 01:25:12 2007
@@ -57,7 +57,7 @@
return NULL;
}
response_writer->stream = stream;
- response_writer->encoding = (axis2_char_t *)axis2_strdup(env, encoding);
+ response_writer->encoding = (axis2_char_t *)axutil_strdup(env, encoding);
return response_writer;
}
@@ -172,7 +172,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, str, AXIS2_FAILURE);
- len = axis2_strlen(str);
+ len = axutil_strlen(str);
if (! response_writer->stream)
{
return AXIS2_FAILURE;
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=525082&r1=525081&r2=525082
==============================================================================
--- 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 Tue Apr 3 01:25:12 2007
@@ -175,7 +175,7 @@
header_name = axis2_http_header_get_name((axis2_http_header_t *)
axutil_array_list_get(simple_request->header_group,
env, i), env);
- if (0 == axis2_strcasecmp(name, header_name))
+ if (0 == axutil_strcasecmp(name, header_name))
return AXIS2_TRUE;
}
return AXIS2_FALSE;
@@ -226,7 +226,7 @@
tmp_header = (axis2_http_header_t *)axutil_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 == axutil_strcasecmp(str, tmp_name))
{
return tmp_header;
}
@@ -268,7 +268,7 @@
tmp_header = (axis2_http_header_t *)axutil_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 == axutil_strcasecmp(str, tmp_name))
{
axis2_http_header_free(tmp_header, env);
axutil_array_list_remove(header_group, env, i);
@@ -396,7 +396,7 @@
tmp_buf2 = AXIS2_MALLOC(env->allocator, 128 * sizeof(char));
while (axutil_stream_read(body, env, tmp_buf2, 128) > 0)
{
- tmp_buf3 = axis2_stracat(env, tmp_buf, tmp_buf2);
+ tmp_buf3 = axutil_stracat(env, tmp_buf, tmp_buf2);
if (tmp_buf)
{
AXIS2_FREE(env->allocator, tmp_buf);
@@ -411,7 +411,7 @@
if (tmp_buf)
{
*buf = tmp_buf;
- return axis2_strlen(tmp_buf);
+ return axutil_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=525082&r1=525081&r2=525082
==============================================================================
--- 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 Tue Apr 3 01:25:12 2007
@@ -143,7 +143,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) *
+ (axutil_strlen(http_ver) + axutil_strlen(phrase) + 8) *
sizeof(axis2_char_t *));
sprintf(tmp_status_line_str, "%s %3d %s%s", http_ver, status_code, phrase,
AXIS2_HTTP_CRLF);
@@ -256,7 +256,7 @@
tmp_header = (axis2_http_header_t *)axutil_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 == axutil_strcasecmp(str, tmp_name))
{
return tmp_header;
}
@@ -299,7 +299,7 @@
tmp_header = (axis2_http_header_t *)axutil_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 == axutil_strcasecmp(str, tmp_name))
{
axis2_http_header_free(tmp_header, env);
axutil_array_list_remove(header_group, env, i);
@@ -342,7 +342,7 @@
tmp_header = (axis2_http_header_t *)axutil_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 == axutil_strcasecmp(axis2_http_header_get_name(header, env),
tmp_name))
{
axis2_http_header_free(tmp_header, env);
@@ -434,7 +434,7 @@
}
simple_response->stream = body_stream;
}
- axutil_stream_write(body_stream, env, str, axis2_strlen(str));
+ axutil_stream_write(body_stream, env, str, axutil_strlen(str));
return AXIS2_SUCCESS;
}
@@ -536,7 +536,7 @@
header_name = axis2_http_header_get_name((axis2_http_header_t *)
axutil_array_list_get(simple_response->header_group,
env, i), env);
- if (0 == axis2_strcasecmp(name, header_name))
+ if (0 == axutil_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=525082&r1=525081&r2=525082
==============================================================================
--- 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 Tue Apr 3 01:25:12 2007
@@ -54,7 +54,7 @@
return NULL;
}
- status_line->line = (axis2_char_t *)axis2_strdup(env, str);
+ status_line->line = (axis2_char_t *)axutil_strdup(env, str);
status_line->http_version = NULL;
status_line->reason_phrase = NULL;
status_line->status_code = NULL;
@@ -111,11 +111,11 @@
*tmp++ = '\0';
reason_phrase = tmp;
status_line->http_version = (axis2_char_t *)
- axis2_strdup(env, http_version);
+ axutil_strdup(env, http_version);
status_line->status_code = (axis2_char_t *)
- axis2_strdup(env, status_code);
+ axutil_strdup(env, status_code);
status_line->reason_phrase = (axis2_char_t *)
- axis2_strdup(env, reason_phrase);
+ axutil_strdup(env, reason_phrase);
if (! status_line->http_version ||
! status_line->reason_phrase)
@@ -198,7 +198,7 @@
axis2_http_status_line_t *status_line,
const axutil_env_t *env)
{
- if (0 == axis2_strncasecmp(status_line->line, "HTTP", 4))
+ if (0 == axutil_strncasecmp(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=525082&r1=525081&r2=525082
==============================================================================
--- 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 Tue Apr 3 01:25:12 2007
@@ -163,11 +163,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 != axutil_strcmp
(encoding_header_value,
AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED)))
{
- if (0 == axis2_strcasecmp(axis2_http_request_line_get_method(
+ if (0 == axutil_strcasecmp(axis2_http_request_line_get_method(
axis2_http_simple_request_get_request_line(
simple_request, env), env), AXIS2_HTTP_HEADER_POST))
{
@@ -193,7 +193,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 == axutil_strcasecmp(http_version, AXIS2_HTTP_HEADER_PROTOCOL_11))
{
axis2_http_worker_set_transport_out_config(http_worker, env, conf_ctx,
response);
@@ -205,7 +205,7 @@
if (peer_ip)
{
peer_property = axutil_property_create (env);
- axutil_property_set_value (peer_property, env, axis2_strdup (env, peer_ip));
+ axutil_property_set_value (peer_property, env, axutil_strdup (env, peer_ip));
axis2_msg_ctx_set_property (msg_ctx, env, AXIS2_SVR_PEER_IP_ADDR, peer_property);
}
@@ -244,7 +244,7 @@
env);
soap_action_str = axutil_string_create(env, soap_action);
}
- if (0 == axis2_strcasecmp(axis2_http_request_line_get_method(
+ if (0 == axutil_strcasecmp(axis2_http_request_line_get_method(
axis2_http_simple_request_get_request_line(
simple_request, env), env), AXIS2_HTTP_HEADER_GET))
{
@@ -280,7 +280,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", axutil_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);
@@ -292,7 +292,7 @@
return AXIS2_TRUE;
}
}
- else if (0 == axis2_strcasecmp(axis2_http_request_line_get_method(
+ else if (0 == axutil_strcasecmp(axis2_http_request_line_get_method(
axis2_http_simple_request_get_request_line(
simple_request, env), env), AXIS2_HTTP_HEADER_POST))
{
@@ -444,7 +444,7 @@
env, AXIS2_HTTP_HEADER_CONNECTION);
if (conn_header)
{
- if (0 == axis2_strcasecmp(axis2_http_header_get_value(conn_header,
+ if (0 == axutil_strcasecmp(axis2_http_header_get_value(conn_header,
env), AXIS2_HTTP_HEADER_CONNECTION_KEEPALIVE))
{
axis2_http_header_t *header = axis2_http_header_create(env,
@@ -455,7 +455,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 == axutil_strcasecmp(axis2_http_header_get_value(conn_header,
env), AXIS2_HTTP_HEADER_CONNECTION_CLOSE))
{
axis2_http_header_t *header = axis2_http_header_create(env,
@@ -470,7 +470,7 @@
else
{
if (axis2_http_simple_response_get_http_version(simple_response, env)
- && axis2_strcasecmp(
+ && axutil_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/common/simple_http_svr_conn.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/simple_http_svr_conn.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/simple_http_svr_conn.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/simple_http_svr_conn.c Tue Apr 3 01:25:12 2007
@@ -199,8 +199,8 @@
if (str_line)
{
- if (0 != axis2_strncasecmp(str_line, "GET", 3) && 0 !=
- axis2_strncasecmp(str_line, "POST", 4))
+ if (0 != axutil_strncasecmp(str_line, "GET", 3) && 0 !=
+ axutil_strncasecmp(str_line, "POST", 4))
{
char write_buf[512];
sprintf(write_buf, "%s %s\r\n%s: close\r\n\r\n",
@@ -208,7 +208,7 @@
AXIS2_HTTP_RESPONSE_BAD_REQUEST,
AXIS2_HTTP_HEADER_CONNECTION);
axutil_stream_write(svr_conn->stream, env, write_buf,
- axis2_strlen(write_buf) + 1);
+ axutil_strlen(write_buf) + 1);
return NULL;
}
}
@@ -272,7 +272,7 @@
}*/
if (AXIS2_TRUE == end_of_line)
{
- if (0 == axis2_strcmp(str_line, AXIS2_HTTP_CRLF))
+ if (0 == axutil_strcmp(str_line, AXIS2_HTTP_CRLF))
{
end_of_headers = AXIS2_TRUE;
}
@@ -337,7 +337,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 == axutil_strcmp(enc_value,
AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED))
{
chuked_encoding = AXIS2_TRUE;
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=525082&r1=525081&r2=525082
==============================================================================
--- 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 Tue Apr 3 01:25:12 2007
@@ -270,7 +270,7 @@
AXIS2_PARAM_CHECK(env->error, svc_name, NULL);
host_address = "127.0.0.1"; /* TODO : get from axis2.xml */
- svc_path = axis2_stracat(env, "/axis2/services/", svc_name);
+ svc_path = axutil_stracat(env, "/axis2/services/", svc_name);
url = axutil_url_create(env, "http", host_address,
AXIS2_INTF_TO_IMPL(server)->port, svc_path);
AXIS2_FREE(env->allocator, svc_path);
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=525082&r1=525081&r2=525082
==============================================================================
--- 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 Tue Apr 3 01:25:12 2007
@@ -191,7 +191,7 @@
axutil_network_handler_set_sock_option(env, client->sockfd,
SO_SNDTIMEO, client->timeout);
}
- if (0 == axis2_strcasecmp(axutil_url_get_protocol(client->url, env),
+ if (0 == axutil_strcasecmp(axutil_url_get_protocol(client->url, env),
"HTTPS"))
{
#ifdef AXIS2_SSL_ENABLED
@@ -244,16 +244,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 == axutil_strcmp(axis2_http_header_get_name(tmp_header, env),
AXIS2_HTTP_HEADER_TRANSFER_ENCODING) && 0 ==
- axis2_strcmp(axis2_http_header_get_value(tmp_header,
+ axutil_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(env, str_header, header_ext_form);
+ str_header2 = axutil_stracat(env, str_header, header_ext_form);
AXIS2_FREE(env->allocator, str_header);
str_header = NULL;
AXIS2_FREE(env->allocator, header_ext_form);
@@ -280,8 +280,8 @@
/* 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, axutil_strlen(server) +
+ + axutil_strlen(path) + 20 * sizeof(axis2_char_t));
if (! host_port_str)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -290,7 +290,7 @@
sprintf(host_port_str, "http://%s:%d%s", server, axutil_url_get_port(
client->url, env), path);
str_request_line = AXIS2_MALLOC(env->allocator,
- axis2_strlen(host_port_str) + 20 * sizeof(axis2_char_t));
+ axutil_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(
@@ -299,13 +299,13 @@
host_port_str = NULL;
}
- wire_format = axis2_stracat(env, str_request_line, str_header);
+ wire_format = axutil_stracat(env, str_request_line, str_header);
AXIS2_FREE(env->allocator, str_header);
str_header = NULL;
AXIS2_FREE(env->allocator, str_request_line);
str_request_line = NULL;
written = axutil_stream_write(client->data_stream, env, wire_format,
- axis2_strlen(wire_format));
+ axutil_strlen(wire_format));
AXIS2_FREE(env->allocator, wire_format);
wire_format = NULL;
written = axutil_stream_write(client->data_stream, env, AXIS2_HTTP_CRLF,
@@ -462,7 +462,7 @@
}
if (AXIS2_TRUE == end_of_line)
{
- if (0 == axis2_strcmp(str_header, AXIS2_HTTP_CRLF))
+ if (0 == axutil_strcmp(str_header, AXIS2_HTTP_CRLF))
{
end_of_headers = AXIS2_TRUE;
}
@@ -583,12 +583,12 @@
AXIS2_FREE(env->allocator, client->proxy_host_port);
client->proxy_host_port = NULL;
}
- client->proxy_host = axis2_strdup(env, proxy_host);
+ client->proxy_host = axutil_strdup(env, proxy_host);
if (! client->proxy_host)
{
return AXIS2_FAILURE;
}
- client->proxy_host_port = AXIS2_MALLOC(env->allocator, axis2_strlen(
+ client->proxy_host_port = AXIS2_MALLOC(env->allocator, axutil_strlen(
proxy_host) + 10 * sizeof(axis2_char_t));
sprintf(client->proxy_host_port, "%s:%d", proxy_host, proxy_port);
client->proxy_enabled = AXIS2_TRUE;
@@ -634,11 +634,11 @@
return AXIS2_FAILURE;
}
connect_string = AXIS2_MALLOC(env->allocator,
- axis2_strlen(host) * sizeof(axis2_char_t) +
+ axutil_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);
axutil_stream_write(tmp_stream, env, connect_string,
- axis2_strlen(connect_string) * sizeof(axis2_char_t));
+ axutil_strlen(connect_string) * sizeof(axis2_char_t));
memset(str_status_line, 0, 512);
while ((read = axutil_stream_read(tmp_stream, env, tmp_buf, 1)) > 0)
@@ -687,7 +687,7 @@
}
if (AXIS2_TRUE == end_of_line)
{
- if (0 == axis2_strcmp(str_status_line, AXIS2_HTTP_CRLF))
+ if (0 == axutil_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=525082&r1=525081&r2=525082
==============================================================================
--- 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 Tue Apr 3 01:25:12 2007
@@ -211,7 +211,7 @@
method_value = (axis2_char_t *) axutil_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 == axutil_strcmp(method_value, AXIS2_HTTP_HEADER_GET))
{
send_via_get = AXIS2_TRUE;
}
@@ -279,7 +279,7 @@
if(dump_property)
{
axis2_char_t *dump_true = axutil_property_get_value(dump_property, env);
- if(0 == axis2_strcmp(dump_true, AXIS2_VALUE_TRUE))
+ if(0 == axutil_strcmp(dump_true, AXIS2_VALUE_TRUE))
{
axis2_http_client_set_dump_input_msg(sender->client, env, AXIS2_TRUE);
}
@@ -323,7 +323,7 @@
axis2_char_t *path = NULL;
request_params = axis2_http_sender_get_param_string( sender, env, msg_ctx);
- path = axis2_strcat(env, axutil_url_get_path(url, env), "?",
+ path = axutil_strcat(env, axutil_url_get_path(url, env), "?",
request_params, NULL);
request_line = axis2_http_request_line_create(env, "GET", path,
sender->http_version);
@@ -339,7 +339,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, (axutil_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);
@@ -385,16 +385,16 @@
if (AXIS2_TRUE != axis2_msg_ctx_get_is_soap_11(msg_ctx, env))
{
/* handle SOAP action for SOAP 1.2 case */
- if (axis2_strcmp(soap_action, ""))
+ if (axutil_strcmp(soap_action, ""))
{
axis2_char_t *temp_content_type = NULL;
- temp_content_type = axis2_stracat(env, content_type, ";action=\"");
+ temp_content_type = axutil_stracat(env, content_type, ";action=\"");
AXIS2_FREE(env->allocator, content_type);
content_type = temp_content_type;
- temp_content_type = axis2_stracat(env, content_type, soap_action);
+ temp_content_type = axutil_stracat(env, content_type, soap_action);
AXIS2_FREE(env->allocator, content_type);
content_type = temp_content_type;
- temp_content_type = axis2_stracat(env, content_type, "\"");
+ temp_content_type = axutil_stracat(env, content_type, "\"");
AXIS2_FREE(env->allocator, content_type);
content_type = temp_content_type;
}
@@ -404,8 +404,8 @@
{
axis2_char_t *temp_content_type = NULL;
content_type = (axis2_char_t *)AXIS2_HTTP_HEADER_ACCEPT_TEXT_XML;
- content_type = axis2_stracat(env, content_type, ";charset=");
- temp_content_type = axis2_stracat(env, content_type, char_set_enc);
+ content_type = axutil_stracat(env, content_type, ";charset=");
+ temp_content_type = axutil_stracat(env, content_type, char_set_enc);
AXIS2_FREE(env->allocator, content_type);
content_type = temp_content_type;
}
@@ -413,23 +413,23 @@
{
axis2_char_t *temp_content_type = NULL;
content_type = (axis2_char_t *)AXIS2_HTTP_HEADER_ACCEPT_APPL_SOAP;
- content_type = axis2_stracat(env, content_type, ";charset=");
- temp_content_type = axis2_stracat(env, content_type, char_set_enc);
+ content_type = axutil_stracat(env, content_type, ";charset=");
+ temp_content_type = axutil_stracat(env, content_type, char_set_enc);
AXIS2_FREE(env->allocator, content_type);
content_type = temp_content_type;
- if (axis2_strcmp(soap_action, ""))
+ if (axutil_strcmp(soap_action, ""))
{
- temp_content_type = axis2_stracat(env, content_type, ";action=\"");
+ temp_content_type = axutil_stracat(env, content_type, ";action=\"");
AXIS2_FREE(env->allocator, content_type);
content_type = temp_content_type;
- temp_content_type = axis2_stracat(env, content_type, soap_action);
+ temp_content_type = axutil_stracat(env, content_type, soap_action);
AXIS2_FREE(env->allocator, content_type);
content_type = temp_content_type;
- temp_content_type = axis2_stracat(env, content_type, "\"");
+ temp_content_type = axutil_stracat(env, content_type, "\"");
AXIS2_FREE(env->allocator, content_type);
content_type = temp_content_type;
}
- temp_content_type = axis2_stracat(env, content_type, ";");
+ temp_content_type = axutil_stracat(env, content_type, ";");
AXIS2_FREE(env->allocator, content_type);
content_type = temp_content_type;
}
@@ -463,11 +463,11 @@
}*/
}
- if (0 == axis2_strcmp(sender->http_version,
+ if (0 == axutil_strcmp(sender->http_version,
AXIS2_HTTP_HEADER_PROTOCOL_11))
{
axis2_char_t *header = NULL;
- header = AXIS2_MALLOC(env->allocator, axis2_strlen(
+ header = AXIS2_MALLOC(env->allocator, axutil_strlen(
axutil_url_get_server(url, env)) + 10 * sizeof(
axis2_char_t));
sprintf(header, "%s:%d", axutil_url_get_server(url, env),
@@ -543,8 +543,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 (axutil_strcmp(mep, AXIS2_MEP_URI_OUT_ONLY) == 0 ||
+ axutil_strcmp(mep, AXIS2_MEP_URI_ROBUST_OUT_ONLY) == 0)
{
return AXIS2_FAILURE;
}
@@ -559,8 +559,8 @@
}
- if (tmp_header_val && (axis2_strstr(tmp_header_val,
- AXIS2_HTTP_HEADER_ACCEPT_APPL_SOAP) || axis2_strstr(
+ if (tmp_header_val && (axutil_strstr(tmp_header_val,
+ AXIS2_HTTP_HEADER_ACCEPT_APPL_SOAP) || axutil_strstr(
tmp_header_val, AXIS2_HTTP_HEADER_ACCEPT_TEXT_XML)))
{
return axis2_http_sender_process_response(sender, env,
@@ -630,13 +630,13 @@
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 == axutil_strcmp(name, AXIS2_HTTP_HEADER_TRANSFER_ENCODING) &&
+ 0 == axutil_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, */
+/* axutil_strdup(AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED, */
/* env); */
/* property = axutil_property_create(env); */
/* axutil_property_set_scope(property, env, AXIS2_SCOPE_REQUEST); */
@@ -646,13 +646,13 @@
/* property); */
/* response_chunked = AXIS2_TRUE; */
transfer_encoding =
- axis2_strdup(env,
+ axutil_strdup(env,
AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED);
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 != axutil_strcmp(name, AXIS2_HTTP_HEADER_CONTENT_TYPE))
{
axis2_char_t *tmp_charset = NULL;
axis2_char_t *content_type = axis2_http_header_get_value(header,
@@ -660,7 +660,7 @@
tmp_charset = strstr(content_type, AXIS2_HTTP_CHAR_SET_ENCODING);
if (charset)
{
- charset = axis2_strdup(env, tmp_charset);
+ charset = axutil_strdup(env, tmp_charset);
break;
}
}
@@ -677,7 +677,7 @@
axis2_msg_ctx_get_op_ctx(msg_ctx, env), env);
property = axutil_property_create(env);
axutil_property_set_scope(property, env, AXIS2_SCOPE_REQUEST);
- axutil_property_set_value(property, env, axis2_strdup(env, content_type));
+ axutil_property_set_value(property, env, axutil_strdup(env, content_type));
axis2_ctx_set_property(axis_ctx, env, MTOM_RECIVED_CONTENT_TYPE,
property);
}
@@ -793,7 +793,7 @@
axis2_char_t *version)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- sender->http_version = axis2_strdup(env, version);
+ sender->http_version = axutil_strdup(env, version);
if (! sender->http_version)
{
return AXIS2_FAILURE;
@@ -1077,7 +1077,7 @@
memset (encoded_value, 0, strlen (value));
encoded_value = axutil_url_encode (env, encoded_value, value, strlen (value));
- axutil_array_list_add(param_list, env, axis2_strcat(env, name, "=",
+ axutil_array_list_add(param_list, env, axutil_strcat(env, name, "=",
encoded_value, NULL));
}
}
@@ -1089,9 +1089,9 @@
pair = axutil_array_list_get(param_list, env, i);
if(i ==0)
- tmp_string = axis2_stracat(env, param_string, pair);
+ tmp_string = axutil_stracat(env, param_string, pair);
else
- tmp_string = axis2_strcat(env, param_string, "&", pair, NULL);
+ tmp_string = axutil_strcat(env, param_string, "&", pair, NULL);
if (param_string)
{
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=525082&r1=525081&r2=525082
==============================================================================
--- 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 Tue Apr 3 01:25:12 2007
@@ -106,7 +106,7 @@
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- transport_sender_impl->http_version = axis2_strdup(env, AXIS2_HTTP_HEADER_PROTOCOL_11);
+ transport_sender_impl->http_version = axutil_strdup(env, AXIS2_HTTP_HEADER_PROTOCOL_11);
transport_sender_impl->chunked = AXIS2_TRUE;
transport_sender_impl->connection_timeout =
AXIS2_HTTP_DEFAULT_CONNECTION_TIMEOUT;
@@ -216,10 +216,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 != axutil_strcmp(
AXIS2_WSA_ANONYMOUS_URL_SUBMISSION,
axis2_endpoint_ref_get_address(ctx_epr, env)) &&
- 0 != axis2_strcmp(AXIS2_WSA_ANONYMOUS_URL,
+ 0 != axutil_strcmp(AXIS2_WSA_ANONYMOUS_URL,
axis2_endpoint_ref_get_address(ctx_epr, env)))
{
epr = ctx_epr;
@@ -254,8 +254,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 (axutil_strcmp(AXIS2_WSA_NONE_URL_SUBMISSION, axis2_endpoint_ref_get_address(epr, env)) == 0 ||
+ axutil_strcmp(AXIS2_WSA_NONE_URL, axis2_endpoint_ref_get_address(epr, env)) == 0)
{
epr = NULL;
}
@@ -434,7 +434,7 @@
}
if (version)
{
- if (0 == axis2_strcmp(version, AXIS2_HTTP_HEADER_PROTOCOL_11))
+ if (0 == axutil_strcmp(version, AXIS2_HTTP_HEADER_PROTOCOL_11))
{
axis2_char_t *encoding = NULL;
axutil_param_t *encoding_param = NULL;
@@ -443,7 +443,7 @@
AXIS2_FREE(env->allocator,
AXIS2_INTF_TO_IMPL(transport_sender)->http_version);
}
- AXIS2_INTF_TO_IMPL(transport_sender)->http_version = axis2_strdup(env, version);
+ AXIS2_INTF_TO_IMPL(transport_sender)->http_version = axutil_strdup(env, version);
encoding_param = axutil_param_container_get_param(
axis2_transport_out_desc_param_container(out_desc, env), env,
AXIS2_HTTP_HEADER_TRANSFER_ENCODING);
@@ -451,7 +451,7 @@
{
encoding = axutil_param_get_value(encoding_param, env);
}
- if (encoding && 0 == axis2_strcmp(encoding,
+ if (encoding && 0 == axutil_strcmp(encoding,
AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED))
{
AXIS2_INTF_TO_IMPL(transport_sender)->chunked = AXIS2_TRUE;
@@ -461,14 +461,14 @@
AXIS2_INTF_TO_IMPL(transport_sender)->chunked = AXIS2_FALSE;
}
}
- else if (0 == axis2_strcmp(version, AXIS2_HTTP_HEADER_PROTOCOL_10))
+ else if (0 == axutil_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(env, version);
+ AXIS2_INTF_TO_IMPL(transport_sender)->http_version = axutil_strdup(env, version);
AXIS2_INTF_TO_IMPL(transport_sender)->chunked = AXIS2_FALSE;
}
}
@@ -563,9 +563,9 @@
const axis2_char_t *mep = axis2_op_get_msg_exchange_pattern(op, env);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "OP name axutil_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 (axutil_strcmp(mep, AXIS2_MEP_URI_OUT_ONLY) == 0 ||
+ axutil_strcmp(mep, AXIS2_MEP_URI_ROBUST_OUT_ONLY) == 0 ||
+ axutil_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=525082&r1=525081&r2=525082
==============================================================================
--- 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 Tue Apr 3 01:25:12 2007
@@ -134,7 +134,7 @@
method_value = (axis2_char_t *) axutil_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 == axutil_strcmp(method_value, AXIS2_HTTP_HEADER_GET))
{
send_via_get = AXIS2_TRUE;
}
@@ -169,16 +169,16 @@
{
axis2_char_t *tmp_soap_action = NULL;
tmp_soap_action = AXIS2_MALLOC(env->allocator, (
- axis2_strlen(soap_action) + 5) * sizeof(axis2_char_t));
+ axutil_strlen(soap_action) + 5) * sizeof(axis2_char_t));
sprintf(tmp_soap_action, "\"%s\"", soap_action);
headers = curl_slist_append (headers,
- axis2_stracat (env, soap_action_header, tmp_soap_action));
+ axutil_stracat (env, soap_action_header, tmp_soap_action));
AXIS2_FREE(env->allocator, tmp_soap_action);
}
else
{
headers = curl_slist_append (headers,
- axis2_stracat (env, soap_action_header, soap_action));
+ axutil_stracat (env, soap_action_header, soap_action));
}
}
@@ -191,13 +191,13 @@
if (AXIS2_TRUE != axis2_msg_ctx_get_is_soap_11(msg_ctx, env))
{
/* handle SOAP action for SOAP 1.2 case */
- if (axis2_strcmp(soap_action, ""))
+ if (axutil_strcmp(soap_action, ""))
{
axis2_char_t *temp_content_type = NULL;
- temp_content_type = axis2_stracat(env, content_type, ";action=");
+ temp_content_type = axutil_stracat(env, content_type, ";action=");
AXIS2_FREE(env->allocator, content_type);
content_type = temp_content_type;
- temp_content_type = axis2_stracat(env, content_type, soap_action);
+ temp_content_type = axutil_stracat(env, content_type, soap_action);
AXIS2_FREE(env->allocator, content_type);
content_type = temp_content_type;
}
@@ -207,8 +207,8 @@
{
axis2_char_t *temp_content_type = NULL;
content_type = (axis2_char_t *)AXIS2_HTTP_HEADER_ACCEPT_TEXT_XML;
- content_type = axis2_stracat(env, content_type, ";charset=");
- temp_content_type = axis2_stracat(env, content_type, char_set_enc);
+ content_type = axutil_stracat(env, content_type, ";charset=");
+ temp_content_type = axutil_stracat(env, content_type, char_set_enc);
AXIS2_FREE(env->allocator, content_type);
content_type = temp_content_type;
}
@@ -216,20 +216,20 @@
{
axis2_char_t *temp_content_type = NULL;
content_type = (axis2_char_t *)AXIS2_HTTP_HEADER_ACCEPT_APPL_SOAP;
- content_type = axis2_stracat(env, content_type, ";charset=");
- temp_content_type = axis2_stracat(env, content_type, char_set_enc);
+ content_type = axutil_stracat(env, content_type, ";charset=");
+ temp_content_type = axutil_stracat(env, content_type, char_set_enc);
AXIS2_FREE(env->allocator, content_type);
content_type = temp_content_type;
- if (axis2_strcmp(soap_action, ""))
+ if (axutil_strcmp(soap_action, ""))
{
- temp_content_type = axis2_stracat(env, content_type, ";action=");
+ temp_content_type = axutil_stracat(env, content_type, ";action=");
AXIS2_FREE(env->allocator, content_type);
content_type = temp_content_type;
- temp_content_type = axis2_stracat(env, content_type, soap_action);
+ temp_content_type = axutil_stracat(env, content_type, soap_action);
AXIS2_FREE(env->allocator, content_type);
content_type = temp_content_type;
}
- temp_content_type = axis2_stracat(env, content_type, ";");
+ temp_content_type = axutil_stracat(env, content_type, ";");
AXIS2_FREE(env->allocator, content_type);
content_type = temp_content_type;
}
@@ -270,8 +270,8 @@
{
char tmp_buf[10];
sprintf (tmp_buf, "%d", buffer_size);
- headers = curl_slist_append (headers, axis2_stracat (env, content_len, tmp_buf));
- headers = curl_slist_append (headers, axis2_stracat (env, content,content_type));
+ headers = curl_slist_append (headers, axutil_stracat (env, content_len, tmp_buf));
+ headers = curl_slist_append (headers, axutil_stracat (env, content,content_type));
}
if (!doing_mtom)
{
@@ -290,7 +290,7 @@
axis2_char_t *request_param;
axis2_char_t *url_encode;
request_param = (axis2_char_t *) axis2_http_sender_get_param_string( NULL, env, msg_ctx);
- url_encode = axis2_strcat(env, str_url, "?",
+ url_encode = axutil_strcat(env, str_url, "?",
request_param, NULL);
curl_easy_setopt (handler, CURLOPT_HTTPGET, 1);
curl_easy_setopt (handler, CURLOPT_URL, url_encode);
@@ -346,7 +346,7 @@
memcpy(&(mem->memory[mem->size]), ptr, realsize);
mem->size += realsize;
mem->memory[mem->size] = 0;
- axutil_array_list_add (mem->alist, mem->env, axis2_strdup (mem->env, mem->memory));
+ axutil_array_list_add (mem->alist, mem->env, axutil_strdup (mem->env, mem->memory));
}
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=525082&r1=525081&r2=525082
==============================================================================
--- 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 Tue Apr 3 01:25:12 2007
@@ -109,7 +109,7 @@
{
AXIS2_FREE(env->allocator, info_impl->encoding);
}
- info_impl->encoding = axis2_strdup(env, encoding);
+ info_impl->encoding = axutil_strdup(env, encoding);
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=525082&r1=525081&r2=525082
==============================================================================
--- 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 Tue Apr 3 01:25:12 2007
@@ -83,8 +83,8 @@
if (info->encoding)
{
- tmp1 = axis2_stracat(env, content_type, ";charset=");
- tmp2 = axis2_stracat(env, tmp1, info->encoding);
+ tmp1 = axutil_stracat(env, content_type, ";charset=");
+ tmp2 = axutil_stracat(env, tmp1, info->encoding);
info->request->content_type = apr_pstrdup(info->request->pool,
tmp2);
AXIS2_FREE(env->allocator, tmp1);
@@ -113,7 +113,7 @@
{
AXIS2_FREE(env->allocator, info->encoding);
}
- info->encoding = axis2_strdup(env, encoding);
+ info->encoding = axutil_strdup(env, encoding);
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=525082&r1=525081&r2=525082
==============================================================================
--- 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 Tue Apr 3 01:25:12 2007
@@ -208,7 +208,7 @@
if (body_string)
{
- body_string_len = axis2_strlen(body_string);
+ body_string_len = axutil_strlen(body_string);
}
send_status = OK;
}
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=525082&r1=525081&r2=525082
==============================================================================
--- 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 Tue Apr 3 01:25:12 2007
@@ -153,7 +153,7 @@
return -1;
}
sprintf(tmp_buf, "%x%s", (unsigned int)count, AXIS2_HTTP_CRLF);
- len = axutil_stream_write(stream, env, tmp_buf, axis2_strlen(tmp_buf));
+ len = axutil_stream_write(stream, env, tmp_buf, axutil_strlen(tmp_buf));
len = axutil_stream_write(stream, env, buffer, count);
axutil_stream_write(stream, env, AXIS2_HTTP_CRLF, 2);
return len;
Modified: webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c Tue Apr 3 01:25:12 2007
@@ -238,7 +238,7 @@
{
axis2_char_t *encoding_value = NULL;
encoding_value = axis2_http_header_get_value(encoding_header, env);
- if (encoding_value && 0 == axis2_strcasecmp(encoding_value,
+ if (encoding_value && 0 == axutil_strcasecmp(encoding_value,
AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED))
{
callback_ctx->chunked_stream = axis2_http_chunked_stream_create(
@@ -259,7 +259,7 @@
/* check content encoding from msg ctx property */
axis2_char_t *value = axis2_msg_ctx_get_transfer_encoding(msg_ctx, env);
- if (value && axis2_strstr(value, AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED))
+ if (value && axutil_strstr(value, AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED))
{
/* this is an UGLY hack to get some of the trnaports working
e.g. PHP transport where it strips the chunking info in case of chunking
@@ -417,7 +417,7 @@
/* REST support */
axutil_param_t *rest_param = axis2_msg_ctx_get_parameter(msg_ctx, env
, AXIS2_ENABLE_REST);
- if (rest_param && 0 == axis2_strcmp(AXIS2_VALUE_TRUE,
+ if (rest_param && 0 == axutil_strcmp(AXIS2_VALUE_TRUE,
axutil_param_get_value(rest_param, env)))
{
/* TODO we have to check for NULLs */
@@ -445,7 +445,7 @@
* axiom_stax_builder_get_document(env om_builder),
* env);
*
- *if(0 != axis2_strcmp(char_set, xml_char_set))
+ *if(0 != axutil_strcmp(char_set, xml_char_set))
*{
* AXIS2_ERROR_SET(env->error, AXIS2_ERROR_CHARSET_MISMATCH,
* AXIS2_FAILURE);
@@ -620,7 +620,7 @@
if (value)
{
- return (axis2_strcmp(value, AXIS2_VALUE_TRUE) == 0);
+ return (axutil_strcmp(value, AXIS2_VALUE_TRUE) == 0);
}
return AXIS2_FALSE;*/
}
@@ -669,21 +669,21 @@
{
return NULL;
}
- query_str = axis2_strdup(env, tmp + 1);
+ query_str = axutil_strdup(env, tmp + 1);
for (tmp2 = tmp = query_str; *tmp != '\0'; ++tmp)
{
if ('=' == *tmp)
{
*tmp = '\0';
- tmp_name = axis2_strdup(env, tmp2);
+ tmp_name = axutil_strdup(env, tmp2);
axis2_http_transport_utils_strdecode(env, tmp_name, tmp_name);
tmp2 = tmp + 1;
}
if ('&' == *tmp)
{
*tmp = '\0';
- tmp_value = axis2_strdup(env, tmp2);
+ tmp_value = axutil_strdup(env, tmp2);
axis2_http_transport_utils_strdecode(env, tmp_value, tmp_value);
tmp2 = tmp + 1;
}
@@ -704,7 +704,7 @@
{
ret = axutil_hash_make(env);
}
- tmp_value = axis2_strdup(env, tmp2);
+ tmp_value = axutil_strdup(env, tmp2);
axis2_http_transport_utils_strdecode(env, tmp_value, tmp_value);
axutil_hash_set(ret, tmp_name, AXIS2_HASH_KEY_STRING, tmp_value);
}
@@ -792,21 +792,21 @@
axutil_hash_this(hi, NULL, NULL, &service);
sname = axutil_qname_get_localpart(axis2_svc_get_qname(
((axis2_svc_t *)service), env), env);
- ret = axis2_stracat(env, tmp2, "<h3><u>");
+ ret = axutil_stracat(env, tmp2, "<h3><u>");
tmp2 = ret;
- ret = axis2_stracat(env,tmp2, sname);
+ ret = axutil_stracat(env,tmp2, sname);
AXIS2_FREE(env->allocator, tmp2);
tmp2 = ret;
- ret = axis2_stracat(env, tmp2, "</u></h3>");
+ ret = axutil_stracat(env, tmp2, "</u></h3>");
tmp2 = ret;
- ret = axis2_stracat (env, tmp2, "<p>");
+ ret = axutil_stracat (env, tmp2, "<p>");
tmp2 = ret;
/**
*setting services description */
- ret = axis2_stracat (env, tmp2, axis2_svc_get_svc_desc(
+ ret = axutil_stracat (env, tmp2, axis2_svc_get_svc_desc(
(axis2_svc_t *)service, env));
tmp2 = ret;
- ret = axis2_stracat (env, tmp2, "</p>");
+ ret = axutil_stracat (env, tmp2, "</p>");
tmp2 = ret;
ops = axis2_svc_get_all_ops(((axis2_svc_t *)service), env);
if (ops && 0 != axutil_hash_count(ops))
@@ -815,7 +815,7 @@
void *op = NULL;
axis2_char_t *oname = NULL;
- ret = axis2_stracat(env, tmp2, "<i>Available Operations</i> <ul>");
+ ret = axutil_stracat(env, tmp2, "<i>Available Operations</i> <ul>");
AXIS2_FREE(env->allocator, tmp2);
tmp2 = ret;
for (hi2 = axutil_hash_first(ops, env); hi2;
@@ -824,24 +824,24 @@
axutil_hash_this(hi2, NULL, NULL, &op);
oname = axutil_qname_get_localpart(axis2_op_get_qname(
((axis2_op_t *)op), env), env);
- ret = axis2_stracat(env, tmp2, "<li>");
+ ret = axutil_stracat(env, tmp2, "<li>");
AXIS2_FREE(env->allocator, tmp2);
tmp2 = ret;
- ret = axis2_stracat(env, tmp2, oname);
+ ret = axutil_stracat(env, tmp2, oname);
AXIS2_FREE(env->allocator, tmp2);
tmp2 = ret;
- ret = axis2_stracat(env, tmp2, "</li>");
+ ret = axutil_stracat(env, tmp2, "</li>");
AXIS2_FREE(env->allocator, tmp2);
tmp2 = ret;
}
- ret = axis2_stracat(env, tmp2, "</ul>");
+ ret = axutil_stracat(env, tmp2, "</ul>");
AXIS2_FREE(env->allocator, tmp2);
tmp2 = ret;
}
else
{
- ret = axis2_stracat(env, tmp2, "No operations Available");
+ ret = axutil_stracat(env, tmp2, "No operations Available");
/*AXIS2_FREE(env->allocator, tmp);*/
tmp2 = ret;
}
@@ -851,7 +851,7 @@
{
void *fsname = NULL;
svcs_exists = AXIS2_TRUE;
- ret = axis2_stracat(env, tmp2, "<hr><h2><font color=\"red\">Faulty \
+ ret = axutil_stracat(env, tmp2, "<hr><h2><font color=\"red\">Faulty \
Services</font></h2>");
AXIS2_FREE(env->allocator, tmp2);
tmp2 = ret;
@@ -860,27 +860,27 @@
axutil_hash_next(env, hi))
{
axutil_hash_this(hi, (const void **)&fsname, NULL, NULL);
- ret = axis2_stracat(env, tmp2, "<h3><font color=\"red\">");
+ ret = axutil_stracat(env, tmp2, "<h3><font color=\"red\">");
AXIS2_FREE(env->allocator, tmp2);
tmp2 = ret;
- ret = axis2_stracat(env, tmp2, (axis2_char_t *)fsname);
+ ret = axutil_stracat(env, tmp2, (axis2_char_t *)fsname);
AXIS2_FREE(env->allocator, tmp2);
tmp2 = ret;
- ret = axis2_stracat(env, tmp2, "</font></h3>");
+ ret = axutil_stracat(env, tmp2, "</font></h3>");
AXIS2_FREE(env->allocator, tmp2);
tmp2 = ret;
}
}
if (AXIS2_FALSE == svcs_exists)
{
- ret = axis2_strdup(env, "<h2>There are no services deployed</h2>");
+ ret = axutil_strdup(env, "<h2>There are no services deployed</h2>");
}
- ret = axis2_stracat(env, "<html><head><title>Axis2C :: Services</title></head>"
+ ret = axutil_stracat(env, "<html><head><title>Axis2C :: Services</title></head>"
"<body><font face=\"courier\">"
, tmp2);
/*AXIS2_FREE(env->allocator, tmp2);*/
tmp2 = ret;
- ret = axis2_stracat(env, tmp2, "</font></body></html>\r\n");
+ ret = axutil_stracat(env, tmp2, "</font></body></html>\r\n");
/*AXIS2_FREE(env->allocator, tmp);*/
return ret;
@@ -924,7 +924,7 @@
axutil_hash_this(hi, NULL, NULL, &service);
sname = axutil_qname_get_localpart(axis2_svc_get_qname(
((axis2_svc_t *)service), env), env);
- if (!axis2_strcmp (svc_name, sname))
+ if (!axutil_strcmp (svc_name, sname))
{
wsdl_path = (axis2_char_t *)axis2_svc_get_svc_wsdl_path ((axis2_svc_t *)service, env);
break;
@@ -1148,7 +1148,7 @@
trans_enc = axis2_msg_ctx_get_transfer_encoding(msg_ctx, env);
- if (trans_enc && 0 == axis2_strcmp(trans_enc,
+ if (trans_enc && 0 == axutil_strcmp(trans_enc,
AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED))
{
callback_ctx->chunked_stream = axis2_http_chunked_stream_create(env,
@@ -1334,7 +1334,7 @@
AXIS2_PARAM_CHECK(env->error, content_type, NULL);
AXIS2_PARAM_CHECK(env->error, key, NULL);
- tmp_content_type = axis2_strdup(env, content_type);
+ tmp_content_type = axutil_strdup(env, content_type);
if (! tmp_content_type)
{
return NULL;
@@ -1358,13 +1358,13 @@
AXIS2_FREE(env->allocator, tmp_content_type);
return NULL;
}
- tmp2 = axis2_strdup(env, tmp + 1);
+ tmp2 = axutil_strdup(env, tmp + 1);
AXIS2_FREE(env->allocator, tmp_content_type);
if (*tmp2 == '"')
{
tmp = tmp2;
- tmp2 = axis2_strdup(env, tmp + 1);
+ tmp2 = axutil_strdup(env, tmp + 1);
tmp2[strlen(tmp2) - 1] = '\0';
}
return tmp2;
@@ -1438,8 +1438,8 @@
body_child = axiom_element_create_with_qname(env, NULL, bfc_qname,
&body_child_node);
axiom_soap_body_add_child(soap_body, env, body_child_node);
- if (0 == axis2_strcmp(method, AXIS2_HTTP_HEADER_GET) ||
- 0 == axis2_strcmp(method, AXIS2_HTTP_HEADER_POST))
+ if (0 == axutil_strcmp(method, AXIS2_HTTP_HEADER_GET) ||
+ 0 == axutil_strcmp(method, AXIS2_HTTP_HEADER_POST))
{
xml_schema_type_t *schema_type = NULL;
schema_type = XML_SCHEMA_ELEMENT_GET_SCHEMA_TYPE(schema_element,
Modified: webservices/axis2/trunk/c/modules/core/util/core_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/util/core_utils.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/util/core_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/util/core_utils.c Tue Apr 3 01:25:12 2007
@@ -183,16 +183,16 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, name, NULL);
- if (version && 0 != axis2_strlen(version))
+ if (version && 0 != axutil_strlen(version))
{
axis2_char_t * mod_name1 = NULL;
axis2_char_t * mod_name = NULL;
- mod_name1 = axis2_stracat(env, name, "-");
+ mod_name1 = axutil_stracat(env, name, "-");
if (!mod_name1)
{
return NULL;
}
- mod_name = axis2_stracat(env, mod_name1, version);
+ mod_name = axutil_stracat(env, mod_name1, version);
if (!mod_name)
{
AXIS2_FREE(env->allocator, mod_name1);
@@ -329,12 +329,12 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, module_name, NULL);
- name = axis2_strdup(env, module_name);
+ name = axutil_strdup(env, module_name);
if (!name)
{
return NULL;
}
- version_sep_loc = axis2_rindex(name, version_seperator);
+ version_sep_loc = axutil_rindex(name, version_seperator);
if (version_sep_loc)
{
*version_sep_loc = '\0';
@@ -351,10 +351,10 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, module_name, NULL);
- version_sep_loc = axis2_rindex(module_name, version_seperator);
+ version_sep_loc = axutil_rindex(module_name, version_seperator);
if (version_sep_loc)
{
- return axis2_strdup(env, version_sep_loc + sizeof(axis2_char_t));
+ return axutil_strdup(env, version_sep_loc + sizeof(axis2_char_t));
}
return NULL;
}
Modified: webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c Tue Apr 3 01:25:12 2007
@@ -142,7 +142,7 @@
addr_headers = axiom_soap_header_get_header_blocks_with_namespace_uri(soap_header, env, AXIS2_WSA_NAMESPACE_SUBMISSION);
if (addr_headers)
{
- addr_ns_str = axis2_strdup(env, AXIS2_WSA_NAMESPACE_SUBMISSION);
+ addr_ns_str = axutil_strdup(env, AXIS2_WSA_NAMESPACE_SUBMISSION);
status = axis2_addr_in_extract_addr_submission_info(env,
soap_header,
&msg_info_headers,
@@ -154,7 +154,7 @@
addr_headers = axiom_soap_header_get_header_blocks_with_namespace_uri(soap_header, env, AXIS2_WSA_NAMESPACE);
if (addr_headers)
{
- addr_ns_str = axis2_strdup(env, AXIS2_WSA_NAMESPACE);
+ addr_ns_str = axutil_strdup(env, AXIS2_WSA_NAMESPACE);
status = axis2_addr_in_extract_addr_final_info(env,
soap_header,
&msg_info_headers,
@@ -325,13 +325,13 @@
ele_localname = axiom_element_get_localname(header_block_ele, env);
role = axiom_soap_header_block_get_role(header_block, env);
- if (role && axis2_strcmp(role, AXIOM_SOAP12_SOAP_ROLE_NONE) == 0)
+ if (role && axutil_strcmp(role, AXIOM_SOAP12_SOAP_ROLE_NONE) == 0)
{
/* Role is none, no need of processing */
continue;
}
- if (axis2_strcmp(ele_localname, AXIS2_WSA_TO) == 0)
+ if (axutil_strcmp(ele_localname, AXIS2_WSA_TO) == 0)
{
/* here the addressing epr overidde what ever already there in the message context */
@@ -350,7 +350,7 @@
axiom_soap_header_block_set_processed(header_block, env);
to_found = AXIS2_TRUE;
}
- else if (axis2_strcmp(ele_localname, AXIS2_WSA_FROM) == 0)
+ else if (axutil_strcmp(ele_localname, AXIS2_WSA_FROM) == 0)
{
epr = axis2_msg_info_headers_get_from(msg_info_headers, env);
if (!epr)
@@ -365,7 +365,7 @@
axis2_addr_in_extract_epr_information(env, header_block, epr, addr_ns_str);
axiom_soap_header_block_set_processed(header_block, env);
}
- else if (axis2_strcmp(ele_localname, AXIS2_WSA_REPLY_TO) == 0)
+ else if (axutil_strcmp(ele_localname, AXIS2_WSA_REPLY_TO) == 0)
{
epr = axis2_msg_info_headers_get_reply_to(msg_info_headers, env);
@@ -387,7 +387,7 @@
axiom_soap_header_block_set_processed(header_block, env);
reply_to_found = AXIS2_TRUE;
}
- else if (axis2_strcmp(ele_localname, AXIS2_WSA_FAULT_TO) == 0)
+ else if (axutil_strcmp(ele_localname, AXIS2_WSA_FAULT_TO) == 0)
{
epr = axis2_msg_info_headers_get_fault_to(msg_info_headers , env);
@@ -410,7 +410,7 @@
axiom_soap_header_block_set_processed(header_block, env);
fault_to_found = AXIS2_TRUE;
}
- else if (axis2_strcmp(ele_localname, AXIS2_WSA_MESSAGE_ID) == 0)
+ else if (axutil_strcmp(ele_localname, AXIS2_WSA_MESSAGE_ID) == 0)
{
axis2_char_t *text = NULL;
@@ -428,7 +428,7 @@
axiom_soap_header_block_set_processed(header_block, env);
msg_id_found = AXIS2_TRUE;
}
- else if (axis2_strcmp(ele_localname, AXIS2_WSA_ACTION) == 0)
+ else if (axutil_strcmp(ele_localname, AXIS2_WSA_ACTION) == 0)
{
axis2_char_t *text = NULL;
@@ -446,7 +446,7 @@
axiom_soap_header_block_set_processed(header_block, env);
action_found = AXIS2_TRUE;
}
- else if (axis2_strcmp(ele_localname, AXIS2_WSA_RELATES_TO) == 0)
+ else if (axutil_strcmp(ele_localname, AXIS2_WSA_RELATES_TO) == 0)
{
axis2_char_t *address = NULL;
axutil_qname_t *rqn = NULL;
@@ -454,7 +454,7 @@
const axis2_char_t *relationship_type_default_value = NULL;
const axis2_char_t *relationship_type_value = NULL;
axis2_relates_to_t *relates_to = NULL;
- if (axis2_strcmp(AXIS2_WSA_NAMESPACE_SUBMISSION , addr_ns_str) == 0)
+ if (axutil_strcmp(AXIS2_WSA_NAMESPACE_SUBMISSION , addr_ns_str) == 0)
{
relationship_type_default_value =
AXIS2_WSA_RELATES_TO_RELATIONSHIP_TYPE_DEFAULT_VALUE_SUBMISSION;
@@ -606,7 +606,7 @@
if (om_attr)
{
attr_value = axiom_attribute_get_localname(om_attr, env);
- if (axis2_strcmp(attr_value, AXIS2_WSA_TYPE_ATTRIBUTE_VALUE) == 0)
+ if (axutil_strcmp(attr_value, AXIS2_WSA_TYPE_ATTRIBUTE_VALUE) == 0)
{
axis2_msg_info_headers_add_ref_param(msg_info_headers, env, header_block_node);
}
@@ -664,7 +664,7 @@
if (is_ref_param_attr)
{
attr_value = axiom_attribute_get_localname(is_ref_param_attr, env);
- if (axis2_strcmp("true", attr_value) == 0)
+ if (axutil_strcmp("true", attr_value) == 0)
{
axis2_endpoint_ref_add_ref_param(to_epr, env, header_block_node);
}
@@ -697,8 +697,8 @@
exp_qn_nsuri = axutil_qname_get_localpart(expected_qname, env);
act_qn_nsuri = axutil_qname_get_localpart(actual_qname, env);
- return ((axis2_strcmp(exp_qn_lpart, act_qn_lpart) == 0) &&
- (axis2_strcmp(exp_qn_nsuri, act_qn_nsuri) == 0));
+ return ((axutil_strcmp(exp_qn_lpart, act_qn_lpart) == 0) &&
+ (axutil_strcmp(exp_qn_nsuri, act_qn_nsuri) == 0));
}
void
Modified: webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c Tue Apr 3 01:25:12 2007
@@ -126,7 +126,7 @@
if (!msg_info_headers)
return AXIS2_SUCCESS; /* no addressing in use */
wsa_action = axis2_msg_info_headers_get_action (msg_info_headers, env);
- if (!wsa_action || !axis2_strcmp (wsa_action, ""))
+ if (!wsa_action || !axutil_strcmp (wsa_action, ""))
return AXIS2_SUCCESS; /* If no action present, assume no addressing in use */
@@ -142,7 +142,7 @@
if (addressing_version_from_msg_ctx)
{
- if (axis2_strcmp
+ if (axutil_strcmp
(AXIS2_WSA_NAMESPACE, addressing_version_from_msg_ctx) == 0)
{
addr_ns = AXIS2_WSA_NAMESPACE;
@@ -188,7 +188,7 @@
}
}
- if (!addr_ns || axis2_strcmp("", addr_ns) == 0)
+ if (!addr_ns || axutil_strcmp("", addr_ns) == 0)
{
addr_ns = AXIS2_WSA_NAMESPACE;
}
@@ -247,8 +247,8 @@
const axis2_char_t *fault_address = axis2_endpoint_ref_get_address(fault_epr, env);
if (fault_address)
{
- if (axis2_strcmp(AXIS2_WSA_NONE_URL, fault_address) != 0 &&
- axis2_strcmp(AXIS2_WSA_NONE_URL_SUBMISSION, fault_address) != 0)
+ if (axutil_strcmp(AXIS2_WSA_NONE_URL, fault_address) != 0 &&
+ axutil_strcmp(AXIS2_WSA_NONE_URL_SUBMISSION, fault_address) != 0)
{
axis2_endpoint_ref_set_address(epr, env, fault_address);
}
@@ -261,7 +261,7 @@
if (epr)
{
address = axis2_endpoint_ref_get_address(epr, env);
- if (address && axis2_strcmp(address, "") != 0)
+ if (address && axutil_strcmp(address, "") != 0)
{
axiom_node_t *to_header_block_node = NULL;
axiom_soap_header_block_t *to_header_block = NULL;
@@ -285,7 +285,7 @@
}
action = axis2_msg_info_headers_get_action(msg_info_headers, env);
- if (action && axis2_strcmp(action, ""))
+ if (action && axutil_strcmp(action, ""))
{
axis2_addr_out_handler_process_string_info(env, action,
AXIS2_WSA_ACTION,
@@ -299,7 +299,7 @@
const axis2_char_t *anonymous_uri = NULL;
axis2_bool_t anonymous = axis2_msg_info_headers_get_reply_to_anonymous(msg_info_headers, env);
axis2_bool_t none = axis2_msg_info_headers_get_reply_to_none(msg_info_headers, env);
- if (axis2_strcmp(addr_ns, AXIS2_WSA_NAMESPACE_SUBMISSION) == 0)
+ if (axutil_strcmp(addr_ns, AXIS2_WSA_NAMESPACE_SUBMISSION) == 0)
{
if (none)
anonymous_uri = AXIS2_WSA_NONE_URL_SUBMISSION;
@@ -354,7 +354,7 @@
const axis2_char_t *anonymous_uri = NULL;
axis2_bool_t anonymous = axis2_msg_info_headers_get_fault_to_anonymous(msg_info_headers, env);
axis2_bool_t none = axis2_msg_info_headers_get_fault_to_none(msg_info_headers, env);
- if (axis2_strcmp(addr_ns, AXIS2_WSA_NAMESPACE_SUBMISSION) == 0)
+ if (axutil_strcmp(addr_ns, AXIS2_WSA_NAMESPACE_SUBMISSION) == 0)
{
if (none)
anonymous_uri = AXIS2_WSA_NONE_URL_SUBMISSION;
@@ -407,7 +407,7 @@
{
const axis2_char_t *relationship_type = NULL;
relationship_type = axis2_relates_to_get_relationship_type(relates_to, env);
- if (axis2_strcmp(relationship_type, "") != 0)
+ if (axutil_strcmp(relationship_type, "") != 0)
{
axiom_attribute_t *om_attr = NULL;
axiom_namespace_t *addr_ns_obj = NULL;
@@ -483,7 +483,7 @@
soap_header = *(soap_header_p);
- if (value && axis2_strcmp(value, "") != 0)
+ if (value && axutil_strcmp(value, "") != 0)
{
axiom_namespace_t *addr_ns_obj = NULL;
addr_ns_obj =
@@ -551,7 +551,7 @@
}
address = axis2_endpoint_ref_get_address(endpoint_ref, env);
- if (address && axis2_strcmp("", address) != 0)
+ if (address && axutil_strcmp("", address) != 0)
{
axiom_node_t *hb_node = NULL;
axiom_element_t *hb_ele = NULL;
@@ -717,7 +717,7 @@
addr_ns_obj = axiom_namespace_create(env, addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
- if (axis2_strcmp(addr_ns, AXIS2_WSA_NAMESPACE_SUBMISSION) == 0)
+ if (axutil_strcmp(addr_ns, AXIS2_WSA_NAMESPACE_SUBMISSION) == 0)
{
element_localname = EPR_PORT_TYPE;
}
@@ -736,8 +736,8 @@
text =
AXIS2_MALLOC(env->allocator,
sizeof(axis2_char_t) *
- (axis2_strlen(qname_prefix) +
- axis2_strlen(qname_localpart) + 2));
+ (axutil_strlen(qname_prefix) +
+ axutil_strlen(qname_localpart) + 2));
sprintf(text, "%s:%s", qname_prefix, qname_localpart);
axiom_element_set_text(interface_ele, env, text, interface_node);
AXIS2_FREE(env->allocator, text);
@@ -796,7 +796,7 @@
&node);
if (ele)
{
- if (axis2_strcmp(AXIS2_WSA_NAMESPACE, addr_ns) == 0)
+ if (axutil_strcmp(AXIS2_WSA_NAMESPACE, addr_ns) == 0)
{
axiom_namespace_t *addr_ns_obj = NULL;
axiom_attribute_t *att = NULL;
Modified: webservices/axis2/trunk/c/samples/client/echo/echo.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/echo/echo.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/samples/client/echo/echo.c (original)
+++ webservices/axis2/trunk/c/samples/client/echo/echo.c Tue Apr 3 01:25:12 2007
@@ -46,7 +46,7 @@
address = "http://localhost:9090/axis2/services/echo";
if (argc > 1)
address = argv[1];
- if (axis2_strcmp(address, "-h") == 0)
+ if (axutil_strcmp(address, "-h") == 0)
{
printf("Usage : %s [endpoint_url]\n", argv[0]);
printf("use -h for help\n");
Modified: webservices/axis2/trunk/c/samples/client/google/google_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/google/google_client.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/samples/client/google/google_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/google/google_client.c Tue Apr 3 01:25:12 2007
@@ -54,7 +54,7 @@
/* Set end point reference of google service */
address = "http://api.google.com/search/beta2";
- if ((argc > 1) && (axis2_strcmp("-h", argv[1]) == 0))
+ if ((argc > 1) && (axutil_strcmp("-h", argv[1]) == 0))
{
printf("\nUsage : %s [google_key] [word_to_spell] \n", argv[0]);
printf("\tgoogle_key Your Google license key. Default value won't work. You must use your key here.\n");
@@ -138,7 +138,7 @@
axiom_node_t *ret_node1 = NULL;
result_ele = (axiom_element_t*)axiom_node_get_data_element(ret_node, env);
- if (axis2_strcmp(axiom_element_get_localname(result_ele, env), "doSpellingSuggestionResponse") != 0)
+ if (axutil_strcmp(axiom_element_get_localname(result_ele, env), "doSpellingSuggestionResponse") != 0)
{
print_invalid_om(env, ret_node);
return AXIS2_FAILURE;
Modified: webservices/axis2/trunk/c/samples/client/math/math_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/math/math_client.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/samples/client/math/math_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/math/math_client.c Tue Apr 3 01:25:12 2007
@@ -51,7 +51,7 @@
address = "http://localhost:9090/axis2/services/math";
if (argc > 1)
operation = argv[1];
- if (axis2_strcmp(operation, "-h") == 0)
+ if (axutil_strcmp(operation, "-h") == 0)
{
printf("Usage : %s [operation] [param1] [param2] [endpoint_url]\n", argv[0]);
printf("use -h for help\n");
Modified: webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c Tue Apr 3 01:25:12 2007
@@ -49,7 +49,7 @@
address = "http://localhost:9090/axis2/services/mtom";
if (argc > 1)
address = argv[1];
- if (axis2_strcmp(address, "-h") == 0)
+ if (axutil_strcmp(address, "-h") == 0)
{
printf("Usage : %s [endpoint_url] [image_name] [to_save_name] [do_not_optimize]\n", argv[0]);
printf("use -h for help\n");
Modified: webservices/axis2/trunk/c/samples/client/notify/notify_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/notify/notify_client.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/samples/client/notify/notify_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/notify/notify_client.c Tue Apr 3 01:25:12 2007
@@ -42,7 +42,7 @@
address = "http://localhost:9090/axis2/services/notify";
if (argc > 1)
address = argv[1];
- if (axis2_strcmp(address, "-h") == 0)
+ if (axutil_strcmp(address, "-h") == 0)
{
printf("Usage : %s [endpoint_url]\n", argv[0]);
printf("use -h for help\n");
Modified: webservices/axis2/trunk/c/samples/client/yahoo/yahoo_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/yahoo/yahoo_client.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/samples/client/yahoo/yahoo_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/yahoo/yahoo_client.c Tue Apr 3 01:25:12 2007
@@ -68,11 +68,11 @@
axis2_options_set_to(options, env, endpoint_ref);
rest_property = axutil_property_create(env);
- axutil_property_set_value(rest_property, env, axis2_strdup (env, AXIS2_VALUE_TRUE));
+ axutil_property_set_value(rest_property, env, axutil_strdup (env, AXIS2_VALUE_TRUE));
axis2_options_set_property(options, env, AXIS2_ENABLE_REST,
rest_property);
get_property = axutil_property_create(env);
- axutil_property_set_value(get_property, env, axis2_strdup(env, AXIS2_HTTP_HEADER_GET));
+ axutil_property_set_value(get_property, env, axutil_strdup(env, AXIS2_HTTP_HEADER_GET));
axis2_options_set_property(options, env, AXIS2_HTTP_METHOD, get_property);
client_home = AXIS2_GETENV("AXIS2C_HOME");
Modified: webservices/axis2/trunk/c/samples/server/Calculator/calc_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/Calculator/calc_skeleton.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/samples/server/Calculator/calc_skeleton.c (original)
+++ webservices/axis2/trunk/c/samples/server/Calculator/calc_skeleton.c Tue Apr 3 01:25:12 2007
@@ -107,13 +107,13 @@
axis2_char_t *op_name = axiom_element_get_localname(element, env);
if (op_name)
{
- if (axis2_strcmp(op_name, "add") == 0)
+ if (axutil_strcmp(op_name, "add") == 0)
return axis2_calc_add(env, node);
- if (axis2_strcmp(op_name, "sub") == 0)
+ if (axutil_strcmp(op_name, "sub") == 0)
return axis2_calc_sub(env, node);
- if (axis2_strcmp(op_name, "mul") == 0)
+ if (axutil_strcmp(op_name, "mul") == 0)
return axis2_calc_mul(env, node);
- if (axis2_strcmp(op_name, "div") == 0)
+ if (axutil_strcmp(op_name, "div") == 0)
return axis2_calc_div(env, node);
}
}
Modified: webservices/axis2/trunk/c/samples/server/math/math_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/math/math_skeleton.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/samples/server/math/math_skeleton.c (original)
+++ webservices/axis2/trunk/c/samples/server/math/math_skeleton.c Tue Apr 3 01:25:12 2007
@@ -107,13 +107,13 @@
axis2_char_t *op_name = axiom_element_get_localname(element, env);
if (op_name)
{
- if (axis2_strcmp(op_name, "add") == 0)
+ if (axutil_strcmp(op_name, "add") == 0)
return axis2_math_add(env, node);
- if (axis2_strcmp(op_name, "sub") == 0)
+ if (axutil_strcmp(op_name, "sub") == 0)
return axis2_math_sub(env, node);
- if (axis2_strcmp(op_name, "mul") == 0)
+ if (axutil_strcmp(op_name, "mul") == 0)
return axis2_math_mul(env, node);
- if (axis2_strcmp(op_name, "div") == 0)
+ if (axutil_strcmp(op_name, "div") == 0)
return axis2_math_div(env, node);
}
}
Modified: webservices/axis2/trunk/c/samples/server/sg_math/add.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/add.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/add.c (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/add.c Tue Apr 3 01:25:12 2007
@@ -144,7 +144,7 @@
prop = axutil_property_create(env);
if (prop)
{
- axutil_property_set_value(prop, env, axis2_strdup(env, result_str));
+ axutil_property_set_value(prop, env, axutil_strdup(env, result_str));
axis2_ctx_set_property(ctx, env, "ADD_RESULT", prop);
}
}
Modified: webservices/axis2/trunk/c/samples/server/sg_math/add_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/add_skeleton.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/add_skeleton.c (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/add_skeleton.c Tue Apr 3 01:25:12 2007
@@ -104,7 +104,7 @@
axis2_char_t *op_name = axiom_element_get_localname(element, env);
if (op_name)
{
- if (axis2_strcmp(op_name, "add") == 0)
+ if (axutil_strcmp(op_name, "add") == 0)
return axis2_add_add(env, node, msg_ctx);
}
}
Modified: webservices/axis2/trunk/c/samples/server/sg_math/div_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/div_skeleton.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/div_skeleton.c (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/div_skeleton.c Tue Apr 3 01:25:12 2007
@@ -104,7 +104,7 @@
axis2_char_t *op_name = axiom_element_get_localname(element, env);
if (op_name)
{
- if (axis2_strcmp(op_name, "div") == 0)
+ if (axutil_strcmp(op_name, "div") == 0)
return axis2_div_div(env, node);
}
}
Modified: webservices/axis2/trunk/c/samples/server/sg_math/mul_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/mul_skeleton.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/mul_skeleton.c (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/mul_skeleton.c Tue Apr 3 01:25:12 2007
@@ -104,7 +104,7 @@
axis2_char_t *op_name = axiom_element_get_localname(element, env);
if (op_name)
{
- if (axis2_strcmp(op_name, "mul") == 0)
+ if (axutil_strcmp(op_name, "mul") == 0)
return axis2_mul_mul(env, node);
}
}
Modified: webservices/axis2/trunk/c/samples/server/sg_math/sub_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/sub_skeleton.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/sub_skeleton.c (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/sub_skeleton.c Tue Apr 3 01:25:12 2007
@@ -103,7 +103,7 @@
axis2_char_t *op_name = axiom_element_get_localname(element, env);
if (op_name)
{
- if (axis2_strcmp(op_name, "sub") == 0)
+ if (axutil_strcmp(op_name, "sub") == 0)
return axis2_sub_sub(env, node);
}
}
Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking.c Tue Apr 3 01:25:12 2007
@@ -38,7 +38,7 @@
address = "http://localhost:9090/axis2/services/echo";
if (argc > 1)
address = argv[1];
- if (axis2_strcmp(address, "-h") == 0)
+ if (axutil_strcmp(address, "-h") == 0)
{
printf("Usage : %s [endpoint_url]\n", argv[0]);
printf("use -h for help\n");
Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_addr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_addr.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_addr.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_addr.c Tue Apr 3 01:25:12 2007
@@ -38,7 +38,7 @@
address = "http://localhost:9090/axis2/services/echo";
if (argc > 1)
address = argv[1];
- if (axis2_strcmp(address, "-h") == 0)
+ if (axutil_strcmp(address, "-h") == 0)
{
printf("Usage : %s [endpoint_url]\n", argv[0]);
printf("use -h for help\n");
Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_dual.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_dual.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_dual.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_dual.c Tue Apr 3 01:25:12 2007
@@ -39,7 +39,7 @@
address = "http://localhost:9090/axis2/services/echo";
if (argc > 1)
address = argv[1];
- if (axis2_strcmp(address, "-h") == 0)
+ if (axutil_strcmp(address, "-h") == 0)
{
printf("Usage : %s [endpoint_url]\n", argv[0]);
printf("use -h for help\n");
Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_soap11.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_soap11.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_soap11.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_soap11.c Tue Apr 3 01:25:12 2007
@@ -39,7 +39,7 @@
address = "http://localhost:9090/axis2/services/echo";
if (argc > 1)
address = argv[1];
- if (axis2_strcmp(address, "-h") == 0)
+ if (axutil_strcmp(address, "-h") == 0)
{
printf("Usage : %s [endpoint_url]\n", argv[0]);
printf("use -h for help\n");
Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking.c Tue Apr 3 01:25:12 2007
@@ -53,7 +53,7 @@
address = "http://localhost:9090/axis2/services/echo";
if (argc > 1)
address = argv[1];
- if (axis2_strcmp(address, "-h") == 0)
+ if (axutil_strcmp(address, "-h") == 0)
{
printf("Usage : %s [endpoint_url]\n", argv[0]);
printf("use -h for help\n");
Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking_dual.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking_dual.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking_dual.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking_dual.c Tue Apr 3 01:25:12 2007
@@ -56,7 +56,7 @@
address = "http://localhost:9090/axis2/services/echo";
if (argc > 1)
address = argv[1];
- if (axis2_strcmp(address, "-h") == 0)
+ if (axutil_strcmp(address, "-h") == 0)
{
printf("Usage : %s [endpoint_url]\n", argv[0]);
printf("use -h for help\n");
Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_rest.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_rest.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_rest.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_rest.c Tue Apr 3 01:25:12 2007
@@ -46,7 +46,7 @@
{
method_get = AXIS2_TRUE;
}
- else if (0 == axis2_strcmp(argv[1], "-h"))
+ else if (0 == axutil_strcmp(argv[1], "-h"))
{
printf("Usage : %s [endpoint_url]", argv[0]);
printf(" or %s -mGET for HTTP GET\n", argv[0]);
@@ -81,13 +81,13 @@
axis2_options_set_to(options, env, endpoint_ref);
/* Enable REST at the client side */
rest_property = axutil_property_create(env);
- axutil_property_set_value(rest_property, env, axis2_strdup (env, AXIS2_VALUE_TRUE));
+ axutil_property_set_value(rest_property, env, axutil_strdup (env, AXIS2_VALUE_TRUE));
axis2_options_set_property(options, env, AXIS2_ENABLE_REST,
rest_property);
if (AXIS2_TRUE == method_get)
{
get_property = axutil_property_create(env);
- axutil_property_set_value(get_property, env, axis2_strdup(env, AXIS2_HTTP_HEADER_GET));
+ axutil_property_set_value(get_property, env, axutil_strdup(env, AXIS2_HTTP_HEADER_GET));
axis2_options_set_property(options, env, AXIS2_HTTP_METHOD,
get_property);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org