You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by sa...@apache.org on 2007/04/01 14:52:59 UTC
svn commit: r524589 - in /webservices/axis2/trunk/c: axiom/src/om/
ides/vc/axis2c/axis2_engine/ modules/core/context/
modules/core/transport/http/common/ modules/core/transport/http/sender/
modules/core/transport/http/server/IIS/ modules/core/transport...
Author: samisa
Date: Sun Apr 1 05:52:58 2007
New Revision: 524589
URL: http://svn.apache.org/viewvc?view=rev&rev=524589
Log:
Removed macros form stream
Modified:
webservices/axis2/trunk/c/axiom/src/om/om_data_source.c
webservices/axis2/trunk/c/ides/vc/axis2c/axis2_engine/axis2_engine.vcproj
webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
webservices/axis2/trunk/c/modules/core/transport/http/common/http_response_writer.c
webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_request.c
webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_response.c
webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c
webservices/axis2/trunk/c/modules/core/transport/http/common/simple_http_svr_conn.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c
webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c
webservices/axis2/trunk/c/modules/core/transport/http/util/http_chunked_stream.c
webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c
webservices/axis2/trunk/c/util/include/axutil_stream.h
Modified: webservices/axis2/trunk/c/axiom/src/om/om_data_source.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_data_source.c?view=diff&rev=524589&r1=524588&r2=524589
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_data_source.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_data_source.c Sun Apr 1 05:52:58 2007
@@ -91,7 +91,7 @@
if (data_source->stream)
{
- AXIS2_STREAM_FREE(data_source->stream, env);
+ axutil_stream_free(data_source->stream, env);
}
AXIS2_FREE(env->allocator, data_source);
@@ -113,7 +113,7 @@
AXIS2_PARAM_CHECK(env->error, om_output, AXIS2_FAILURE);
data = axutil_stream_get_buffer(data_source->stream, env);
- data_len = AXIS2_STREAM_BASIC_GET_LEN(data_source->stream, env);
+ data_len = axutil_stream_get_len(data_source->stream, env);
if (data)
{
data[data_len] = '\0';
Modified: webservices/axis2/trunk/c/ides/vc/axis2c/axis2_engine/axis2_engine.vcproj
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/ides/vc/axis2c/axis2_engine/axis2_engine.vcproj?view=diff&rev=524589&r1=524588&r2=524589
==============================================================================
--- webservices/axis2/trunk/c/ides/vc/axis2c/axis2_engine/axis2_engine.vcproj (original)
+++ webservices/axis2/trunk/c/ides/vc/axis2c/axis2_engine/axis2_engine.vcproj Sun Apr 1 05:52:58 2007
@@ -529,6 +529,10 @@
>
</File>
<File
+ RelativePath="..\..\..\..\modules\core\transport\http\common\http_response_writer.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\modules\core\transport\http\common\http_simple_request.c"
>
</File>
@@ -542,6 +546,10 @@
</File>
<File
RelativePath="..\..\..\..\modules\core\transport\http\common\http_worker.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\modules\core\transport\http\common\simple_http_svr_conn.c"
>
</File>
</Filter>
Modified: webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/msg_ctx.c?view=diff&rev=524589&r1=524588&r2=524589
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/msg_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/msg_ctx.c Sun Apr 1 05:52:58 2007
@@ -340,7 +340,7 @@
if (msg_ctx->transport_out_stream)
{
- AXIS2_STREAM_FREE(msg_ctx->transport_out_stream, env);
+ axutil_stream_free(msg_ctx->transport_out_stream, env);
}
if (msg_ctx->http_out_transport_info)
@@ -1779,7 +1779,7 @@
{
if (msg_ctx->transport_out_stream)
{
- AXIS2_STREAM_FREE(msg_ctx->transport_out_stream, env);
+ axutil_stream_free(msg_ctx->transport_out_stream, env);
}
msg_ctx->transport_out_stream = stream;
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=524589&r1=524588&r2=524589
==============================================================================
--- 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 Sun Apr 1 05:52:58 2007
@@ -123,7 +123,7 @@
{
return AXIS2_FAILURE;
}
- write = AXIS2_STREAM_WRITE(response_writer->stream, env, &c, 1);
+ write = axutil_stream_write(response_writer->stream, env, &c, 1);
if (write < 0)
{
return AXIS2_FAILURE;
@@ -148,7 +148,7 @@
{
return AXIS2_FAILURE;
}
- write = AXIS2_STREAM_WRITE(response_writer->stream, env, buf, len);
+ write = axutil_stream_write(response_writer->stream, env, buf, len);
if (write < 0)
{
return AXIS2_FAILURE;
@@ -177,7 +177,7 @@
{
return AXIS2_FAILURE;
}
- write = AXIS2_STREAM_WRITE(response_writer->stream, env, str, len);
+ write = axutil_stream_write(response_writer->stream, env, str, len);
if (write < 0)
{
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=524589&r1=524588&r2=524589
==============================================================================
--- 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 Sun Apr 1 05:52:58 2007
@@ -94,7 +94,7 @@
if (AXIS2_TRUE == simple_request->owns_stream)
{
- AXIS2_STREAM_FREE(simple_request->stream, env);
+ axutil_stream_free(simple_request->stream, env);
}
/*
Don't free the stream since it belongs to the socket
@@ -390,11 +390,11 @@
if (length > 0)
{
*buf = (char*)AXIS2_MALLOC(env->allocator, length + 1);
- read_len = AXIS2_STREAM_READ(body, env, *buf, length + 1);
+ read_len = axutil_stream_read(body, env, *buf, length + 1);
return read_len;
}
tmp_buf2 = AXIS2_MALLOC(env->allocator, 128 * sizeof(char));
- while (AXIS2_STREAM_READ(body, env, tmp_buf2, 128) > 0)
+ while (axutil_stream_read(body, env, tmp_buf2, 128) > 0)
{
tmp_buf3 = axis2_stracat(env, tmp_buf, tmp_buf2);
if (tmp_buf)
@@ -438,6 +438,6 @@
simple_request->stream = body_stream;
simple_request->owns_stream = AXIS2_TRUE;
}
- AXIS2_STREAM_WRITE(body_stream, env, str, str_len);
+ axutil_stream_write(body_stream, env, str, str_len);
return AXIS2_SUCCESS;
}
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=524589&r1=524588&r2=524589
==============================================================================
--- 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 Sun Apr 1 05:52:58 2007
@@ -434,7 +434,7 @@
}
simple_response->stream = body_stream;
}
- AXIS2_STREAM_WRITE(body_stream, env, str, axis2_strlen(str));
+ axutil_stream_write(body_stream, env, str, axis2_strlen(str));
return AXIS2_SUCCESS;
}
@@ -485,27 +485,27 @@
int write = 0;
/* int AXIS2_HTTP_SIMPLE_RESPONSE_READ_SIZE = 32; */
char buf[AXIS2_HTTP_SIMPLE_RESPONSE_READ_SIZE];
- read = AXIS2_STREAM_READ(simple_response->stream, env, buf, AXIS2_HTTP_SIMPLE_RESPONSE_READ_SIZE);
+ read = axutil_stream_read(simple_response->stream, env, buf, AXIS2_HTTP_SIMPLE_RESPONSE_READ_SIZE);
if (read < 0)
{
break;
}
- write = AXIS2_STREAM_WRITE(tmp_stream, env, buf, read);
+ write = axutil_stream_write(tmp_stream, env, buf, read);
if (read < (AXIS2_HTTP_SIMPLE_RESPONSE_READ_SIZE - 1))
{
break;
}
}
- return_size = AXIS2_STREAM_BASIC_GET_LEN(tmp_stream, env);
+ return_size = axutil_stream_get_len(tmp_stream, env);
if (return_size > 0)
{
*buffer = (char *)AXIS2_MALLOC(env->allocator, sizeof(char) *
(return_size + 1));
- return_size = AXIS2_STREAM_READ(tmp_stream, env, *buffer,
+ return_size = axutil_stream_read(tmp_stream, env, *buffer,
return_size + 1);
}
- AXIS2_STREAM_FREE(tmp_stream, env);
+ axutil_stream_free(tmp_stream, env);
return return_size;
}
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=524589&r1=524588&r2=524589
==============================================================================
--- 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 Sun Apr 1 05:52:58 2007
@@ -359,7 +359,7 @@
AXIS2_HTTP_SIMPLE_RESPONSE_SET_BODY_STREAM(response, env,
out_stream);
axis2_http_worker_set_response_headers(http_worker, env, svr_conn,
- simple_request, response, AXIS2_STREAM_BASIC_GET_LEN(
+ simple_request, response, axutil_stream_get_len(
out_stream, env));
status = AXIS2_SIMPLE_HTTP_SVR_CONN_WRITE_RESPONSE(svr_conn, env,
@@ -382,7 +382,7 @@
AXIS2_HTTP_RESPONSE_ACK_CODE_VAL, "Accepted");
}
axis2_http_worker_set_response_headers(http_worker, env, svr_conn,
- simple_request, response, AXIS2_STREAM_BASIC_GET_LEN(
+ simple_request, response, axutil_stream_get_len(
out_stream, env));
status = AXIS2_SIMPLE_HTTP_SVR_CONN_WRITE_RESPONSE(svr_conn, env, response);
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=524589&r1=524588&r2=524589
==============================================================================
--- 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 Sun Apr 1 05:52:58 2007
@@ -83,7 +83,7 @@
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_STREAM_FREE(svr_conn->stream, env);
+ axutil_stream_free(svr_conn->stream, env);
if (-1 != svr_conn->socket)
{
axutil_network_handler_close_socket(env, svr_conn->socket);
@@ -174,7 +174,7 @@
end = strstr(tmp_buf, AXIS2_HTTP_CRLF);
if (end)
{
- read = AXIS2_STREAM_READ(svr_conn->stream, env, tmp_buf, end - start + 2);
+ read = axutil_stream_read(svr_conn->stream, env, tmp_buf, end - start + 2);
if (read > 0)
{
tmp_buf[read] = '\0';
@@ -188,7 +188,7 @@
}
else
{
- read = AXIS2_STREAM_READ(svr_conn->stream, env, tmp_buf, 2048);
+ read = axutil_stream_read(svr_conn->stream, env, tmp_buf, 2048);
if (read > 0)
{
tmp_buf[read] = '\0';
@@ -197,21 +197,6 @@
}
}
- /*while ((read = AXIS2_STREAM_READ(svr_conn->stream, env, tmp_buf,
- 1)) > 0)
- {
- tmp_buf[read] = '\0';
- strcat(str_line, tmp_buf);
- if (0 != strstr(str_line, AXIS2_HTTP_CRLF))
- {
- end_of_line = AXIS2_TRUE;
- }
- if (AXIS2_TRUE == end_of_line)
- {
- break;
- }
- }*/
-
if (str_line)
{
if (0 != axis2_strncasecmp(str_line, "GET", 3) && 0 !=
@@ -222,7 +207,7 @@
AXIS2_HTTP_HEADER_PROTOCOL_11,
AXIS2_HTTP_RESPONSE_BAD_REQUEST,
AXIS2_HTTP_HEADER_CONNECTION);
- AXIS2_STREAM_WRITE(svr_conn->stream, env, write_buf,
+ axutil_stream_write(svr_conn->stream, env, write_buf,
axis2_strlen(write_buf) + 1);
return NULL;
}
@@ -250,7 +235,7 @@
end = strstr(tmp_buf, AXIS2_HTTP_CRLF);
if (end)
{
- read = AXIS2_STREAM_READ(svr_conn->stream, env, tmp_buf, end - start + 2);
+ read = axutil_stream_read(svr_conn->stream, env, tmp_buf, end - start + 2);
if (read > 0)
{
tmp_buf[read] = '\0';
@@ -265,7 +250,7 @@
}
else
{
- read = AXIS2_STREAM_READ(svr_conn->stream, env, tmp_buf, 2048);
+ read = axutil_stream_read(svr_conn->stream, env, tmp_buf, 2048);
if (read > 0)
{
tmp_buf[read] = '\0';
@@ -274,7 +259,7 @@
}
}
- /*while ((read = AXIS2_STREAM_READ(svr_conn->stream, env, tmp_buf,
+ /*while ((read = axutil_stream_read(svr_conn->stream, env, tmp_buf,
1)) > 0)
{
tmp_buf[read] = '\0';
@@ -402,7 +387,7 @@
response_stream = AXIS2_HTTP_SIMPLE_RESPONSE_GET_BODY(response, env);
if (response_stream)
{
- body_size = AXIS2_STREAM_BASIC_GET_LEN(response_stream, env);
+ body_size = axutil_stream_get_len(response_stream, env);
response_body = axutil_stream_get_buffer(response_stream, env);
axutil_stream_flush_buffer(response_stream, env);
response_body[body_size] = '\0';
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=524589&r1=524588&r2=524589
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c Sun Apr 1 05:52:58 2007
@@ -304,11 +304,11 @@
str_header = NULL;
AXIS2_FREE(env->allocator, str_request_line);
str_request_line = NULL;
- written = AXIS2_STREAM_WRITE(client->data_stream, env, wire_format,
+ written = axutil_stream_write(client->data_stream, env, wire_format,
axis2_strlen(wire_format));
AXIS2_FREE(env->allocator, wire_format);
wire_format = NULL;
- written = AXIS2_STREAM_WRITE(client->data_stream, env, AXIS2_HTTP_CRLF,
+ written = axutil_stream_write(client->data_stream, env, AXIS2_HTTP_CRLF,
2);
if (body_size > 0 && str_body)
{
@@ -317,7 +317,7 @@
status = AXIS2_SUCCESS;
while (written < body_size)
{
- written = AXIS2_STREAM_WRITE(client->data_stream, env,
+ written = axutil_stream_write(client->data_stream, env,
str_body, body_size);
if (-1 == written)
{
@@ -394,7 +394,7 @@
do
{
memset(str_status_line, 0, 512);
- while ((read = AXIS2_STREAM_READ(client->data_stream, env, tmp_buf,
+ while ((read = axutil_stream_read(client->data_stream, env, tmp_buf,
1)) > 0)
{
tmp_buf[read] = '\0';
@@ -449,7 +449,7 @@
end_of_line = AXIS2_FALSE;
while (AXIS2_FALSE == end_of_headers)
{
- while ((read = AXIS2_STREAM_READ(client->data_stream, env, tmp_buf,
+ while ((read = axutil_stream_read(client->data_stream, env, tmp_buf,
1)) > 0)
{
tmp_buf[read] = '\0';
@@ -637,11 +637,11 @@
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,
+ axutil_stream_write(tmp_stream, env, connect_string,
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)
+ while ((read = axutil_stream_read(tmp_stream, env, tmp_buf, 1)) > 0)
{
tmp_buf[read] = '\0';
strcat(str_status_line, tmp_buf);
@@ -675,7 +675,7 @@
memset(str_status_line, 0, 512);
while (AXIS2_FALSE == end_of_response)
{
- while ((read = AXIS2_STREAM_READ(tmp_stream, env, tmp_buf, 1)) > 0)
+ while ((read = axutil_stream_read(tmp_stream, env, tmp_buf, 1)) > 0)
{
tmp_buf[read] = '\0';
strcat(str_status_line, tmp_buf);
@@ -693,7 +693,7 @@
}
}
}
- AXIS2_STREAM_FREE(tmp_stream, env);
+ axutil_stream_free(tmp_stream, env);
return AXIS2_SUCCESS;
}
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=524589&r1=524588&r2=524589
==============================================================================
--- 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 Sun Apr 1 05:52:58 2007
@@ -479,7 +479,7 @@
axutil_stream_t *stream = AXIS2_HTTP_SIMPLE_REQUEST_GET_BODY(request, env);
if (stream)
{
- AXIS2_STREAM_WRITE(stream, env, output_stream, output_stream_size);
+ axutil_stream_write(stream, env, output_stream, output_stream_size);
}
}
else
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=524589&r1=524588&r2=524589
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c Sun Apr 1 05:52:58 2007
@@ -372,7 +372,7 @@
buffer_size = AXIOM_XML_WRITER_GET_XML_SIZE(xml_writer, env);
}
}
- AXIS2_STREAM_WRITE(out_stream, env, buffer, buffer_size);
+ axutil_stream_write(out_stream, env, buffer, buffer_size);
/*AXIS2_FREE(env->allocator, buffer);*/
op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c?view=diff&rev=524589&r1=524588&r2=524589
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c Sun Apr 1 05:52:58 2007
@@ -262,7 +262,7 @@
if (out_stream)
{
body_string = axutil_stream_get_buffer(out_stream, env);
- body_str_len = AXIS2_STREAM_BASIC_GET_LEN(out_stream, env);
+ body_str_len = axutil_stream_get_len(out_stream, env);
}
send_status = HTTP_INTERNAL_SERVER_ERROR;
axis2_msg_ctx_free(fault_ctx, env);
@@ -277,7 +277,7 @@
if (out_stream)
{
body_string = axutil_stream_get_buffer(out_stream, env);
- body_str_len = AXIS2_STREAM_BASIC_GET_LEN(out_stream, env);
+ body_str_len = axutil_stream_get_len(out_stream, env);
}
send_status = OK;
}
@@ -323,7 +323,7 @@
if (request_body)
{
- AXIS2_STREAM_FREE(request_body, env);
+ axutil_stream_free(request_body, env);
request_body = NULL;
}
msg_ctx = NULL;
@@ -526,28 +526,28 @@
int write = 0;
char buf[READ_SIZE];
- read = AXIS2_STREAM_READ(stream, env, buf, READ_SIZE);
+ read = axutil_stream_read(stream, env, buf, READ_SIZE);
if (read < 0)
{
break;
}
- write = AXIS2_STREAM_WRITE(tmp_stream, env, buf, read);
+ write = axutil_stream_write(tmp_stream, env, buf, read);
if (read < (READ_SIZE - 1))
{
break;
}
}
- return_size = AXIS2_STREAM_BASIC_GET_LEN(tmp_stream, env);
+ return_size = axutil_stream_get_len(tmp_stream, env);
if (return_size > 0)
{
buffer = (char *)AXIS2_MALLOC(env->allocator, sizeof(char) *
(return_size + 2));
- return_size = AXIS2_STREAM_READ(tmp_stream, env, buffer,
+ return_size = axutil_stream_read(tmp_stream, env, buffer,
return_size + 1);
buffer[return_size + 1] = '\0';
}
- AXIS2_STREAM_FREE(tmp_stream, env);
+ axutil_stream_free(tmp_stream, env);
return buffer;
}
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=524589&r1=524588&r2=524589
==============================================================================
--- 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 Sun Apr 1 05:52:58 2007
@@ -235,7 +235,7 @@
if (out_stream)
{
body_string = axutil_stream_get_buffer(out_stream, env);
- body_string_len = AXIS2_STREAM_BASIC_GET_LEN(out_stream, env);
+ body_string_len = axutil_stream_get_len(out_stream, env);
}
send_status = HTTP_INTERNAL_SERVER_ERROR;
axis2_msg_ctx_free(fault_ctx, env);
@@ -250,7 +250,7 @@
if (out_stream)
{
body_string = axutil_stream_get_buffer(out_stream, env);
- body_string_len = AXIS2_STREAM_BASIC_GET_LEN(out_stream, env);
+ body_string_len = axutil_stream_get_len(out_stream, env);
}
}
else
@@ -268,7 +268,7 @@
if (request_body)
{
- AXIS2_STREAM_FREE(request_body, env);
+ axutil_stream_free(request_body, env);
request_body = NULL;
}
@@ -298,28 +298,28 @@
int write = 0;
char buf[READ_SIZE];
- read = AXIS2_STREAM_READ(stream, env, buf, READ_SIZE);
+ read = axutil_stream_read(stream, env, buf, READ_SIZE);
if (read < 0)
{
break;
}
- write = AXIS2_STREAM_WRITE(tmp_stream, env, buf, read);
+ write = axutil_stream_write(tmp_stream, env, buf, read);
if (read < (READ_SIZE - 1))
{
break;
}
}
- return_size = AXIS2_STREAM_BASIC_GET_LEN(tmp_stream, env);
+ return_size = axutil_stream_get_len(tmp_stream, env);
if (return_size > 0)
{
buffer = (char *)AXIS2_MALLOC(env->allocator, sizeof(char) *
(return_size + 2));
- return_size = AXIS2_STREAM_READ(tmp_stream, env, buffer,
+ return_size = axutil_stream_read(tmp_stream, env, buffer,
return_size + 1);
buffer[return_size + 1] = '\0';
}
- AXIS2_STREAM_FREE(tmp_stream, env);
+ axutil_stream_free(tmp_stream, env);
return buffer;
}
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=524589&r1=524588&r2=524589
==============================================================================
--- 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 Sun Apr 1 05:52:58 2007
@@ -108,7 +108,7 @@
{
if (chunked_stream->unread_len < yet_to_read)
{
- len = AXIS2_STREAM_READ(chunked_stream->stream, env,
+ len = axutil_stream_read(chunked_stream->stream, env,
(axis2_char_t *)buffer + count - yet_to_read,
chunked_stream->unread_len);
yet_to_read -= len;
@@ -120,7 +120,7 @@
}
else
{
- len = AXIS2_STREAM_READ(chunked_stream->stream, env,
+ len = axutil_stream_read(chunked_stream->stream, env,
(axis2_char_t *)buffer + count - yet_to_read,
yet_to_read);
yet_to_read -= len;
@@ -153,9 +153,9 @@
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, buffer, count);
- AXIS2_STREAM_WRITE(stream, env, AXIS2_HTTP_CRLF, 2);
+ len = axutil_stream_write(stream, env, tmp_buf, axis2_strlen(tmp_buf));
+ len = axutil_stream_write(stream, env, buffer, count);
+ axutil_stream_write(stream, env, AXIS2_HTTP_CRLF, 2);
return len;
}
@@ -183,11 +183,11 @@
/* remove the last CRLF of the previous chunk if any */
if (AXIS2_TRUE == chunked_stream->chunk_started)
{
- read = AXIS2_STREAM_READ(chunked_stream->stream, env, tmp_buf, 2);
+ read = axutil_stream_read(chunked_stream->stream, env, tmp_buf, 2);
chunked_stream->chunk_started = AXIS2_FALSE;
}
/* read the len and chunk extension */
- while ((read = AXIS2_STREAM_READ(chunked_stream->stream, env, tmp_buf,
+ while ((read = axutil_stream_read(chunked_stream->stream, env, tmp_buf,
1)) > 0)
{
tmp_buf[read] = '\0';
@@ -208,7 +208,7 @@
if (0 == chunked_stream->current_chunk_size)
{
/* Read the last CRLF */
- read = AXIS2_STREAM_READ(chunked_stream->stream, env, tmp_buf, 2);
+ read = axutil_stream_read(chunked_stream->stream, env, tmp_buf, 2);
chunked_stream->end_of_chunks = AXIS2_TRUE;
}
else
@@ -229,7 +229,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
stream = chunked_stream->stream;
- if (AXIS2_STREAM_WRITE(stream, env, "0\r\n\r\n", 5) == 5)
+ if (axutil_stream_write(stream, env, "0\r\n\r\n", 5) == 5)
{
return AXIS2_SUCCESS;
}
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=524589&r1=524588&r2=524589
==============================================================================
--- 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 Sun Apr 1 05:52:58 2007
@@ -299,7 +299,7 @@
stream = axutil_stream_create_basic(env);
if (stream)
{
- AXIS2_STREAM_WRITE(stream, env, soap_body_str, soap_body_len);
+ axutil_stream_write(stream, env, soap_body_str, soap_body_len);
/*AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"axis2_http_transport_utils_process_http_post_request soap_body_str = %s...%d soap_body_len=%d",
soap_body_str, strlen(soap_body_str), soap_body_len);*/
@@ -506,7 +506,7 @@
if (stream)
{
- AXIS2_STREAM_FREE(stream, env);
+ axutil_stream_free(stream, env);
}
if(char_set_str)
@@ -1078,33 +1078,11 @@
axutil_stream_t *in_stream = NULL;
int read_len = size;
in_stream = (axutil_stream_t *)((axis2_callback_info_t *)ctx)->in_stream;
- /* For managed streams such as Apache2 streams we do not need to
- * calculate lenghts
- */
- /*if(AXIS2_STREAM_MANAGED == AXIS2_STREAM_GET_TYPE(in_stream, env))
- {
- read_len = size;
- }
- else
- {
- if(size > ((axis2_callback_info_t *)ctx)->unread_len &&
- -1 != ((axis2_callback_info_t *)ctx)->unread_len)
- {
- read_len = ((axis2_callback_info_t *)ctx)->unread_len;
- }
- else
- {
- read_len = size;
- }
- }*/
- len = AXIS2_STREAM_READ(in_stream, env, buffer, read_len);
+ len = axutil_stream_read(in_stream, env, buffer, read_len);
if (len > 0)
{
buffer[len] = '\0';
- /*if(AXIS2_STREAM_MANAGED != AXIS2_STREAM_GET_TYPE(in_stream, env))
- {*/
((axis2_callback_info_t *)ctx)->unread_len -= len;
- /*}*/
}
return len;
}
@@ -1244,7 +1222,7 @@
stream = axutil_stream_create_basic(env);
if (stream)
{
- AXIS2_STREAM_WRITE(stream, env, soap_body_str, soap_body_len);
+ axutil_stream_write(stream, env, soap_body_str, soap_body_len);
callback_ctx->in_stream = stream;
callback_ctx->chunked_stream = NULL;
callback_ctx->content_length = soap_body_len;
Modified: webservices/axis2/trunk/c/util/include/axutil_stream.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_stream.h?view=diff&rev=524589&r1=524588&r2=524589
==============================================================================
--- webservices/axis2/trunk/c/util/include/axutil_stream.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_stream.h Sun Apr 1 05:52:58 2007
@@ -231,24 +231,6 @@
const axutil_env_t *env,
void *func);
-
-#define AXIS2_STREAM_FREE(stream, env) axutil_stream_free(stream, env)
-
-#define AXIS2_STREAM_FREE_VOID_ARG(stream, env) \
- axutil_stream_free_void_arg(stream, env)
-
-#define AXIS2_STREAM_READ(stream, env, buffer, count) \
- axutil_stream_read(stream, env, buffer, count)
-
-#define AXIS2_STREAM_WRITE(stream, env, buffer, count) \
- axutil_stream_write(stream, env, buffer, count)
-
-#define AXIS2_STREAM_SKIP(stream, env, count) \
- axutil_stream_write(stream, env, count)
-
-#define AXIS2_STREAM_BASIC_GET_LEN(stream, env) \
- axutil_stream_get_len(stream, env)
-
/** @} */
#ifdef __cplusplus
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org