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 sh...@apache.org on 2009/12/15 07:27:10 UTC
svn commit: r890663 - in
/webservices/axis2/trunk/c/src/core/transport/http/server/apache2:
apache2_stream.c apache2_worker.c
Author: shankar
Date: Tue Dec 15 06:27:10 2009
New Revision: 890663
URL: http://svn.apache.org/viewvc?rev=890663&view=rev
Log:
Fixing warnings for 64bit compilation
Modified:
webservices/axis2/trunk/c/src/core/transport/http/server/apache2/apache2_stream.c
webservices/axis2/trunk/c/src/core/transport/http/server/apache2/apache2_worker.c
Modified: webservices/axis2/trunk/c/src/core/transport/http/server/apache2/apache2_stream.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/server/apache2/apache2_stream.c?rev=890663&r1=890662&r2=890663&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/http/server/apache2/apache2_stream.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/http/server/apache2/apache2_stream.c Tue Dec 15 06:27:10 2009
@@ -46,7 +46,8 @@
void *buffer,
size_t count);
-int AXIS2_CALL apache2_stream_skip(
+static int
+apache2_stream_skip(
axutil_stream_t * stream,
const axutil_env_t * env,
int count);
@@ -55,7 +56,8 @@
axutil_stream_t * stream,
const axutil_env_t * env);
-long apache2_ap_get_client_block(
+static apr_size_t
+apache2_ap_get_client_block(
request_rec *r,
char* buffer,
apr_size_t bufsiz);
@@ -146,7 +148,7 @@
/* We are sure that the difference lies within the int range */
}
-int AXIS2_CALL
+static int
apache2_stream_skip(
axutil_stream_t * stream,
const axutil_env_t * env,
@@ -154,7 +156,7 @@
{
apache2_stream_impl_t *stream_impl = NULL;
axis2_char_t *tmp_buffer = NULL;
- int len = -1;
+ apr_size_t len = -1;
AXIS2_ENV_CHECK(env, AXIS2_CRITICAL_FAILURE);
stream_impl = AXIS2_INTF_TO_IMPL(stream);
@@ -166,7 +168,7 @@
}
len = apache2_ap_get_client_block(stream_impl->request, tmp_buffer, count);
AXIS2_FREE(env->allocator, tmp_buffer);
- return len;
+ return (int)len;
}
@@ -205,7 +207,8 @@
* Returns 0 on End-of-body, -1 on error or premature chunk end.
*
*/
-long apache2_ap_get_client_block(
+static apr_size_t
+apache2_ap_get_client_block(
request_rec *r,
char *buffer,
apr_size_t bufsiz)
@@ -213,7 +216,7 @@
apr_status_t rv;
apr_bucket_brigade *bb;
int loop = 1;
- int origBufSize = bufsiz;
+ apr_size_t origBufSize = bufsiz;
if (r->remaining < 0 || (!r->read_chunked && r->remaining == 0)) {
return 0;
@@ -285,5 +288,5 @@
}
- return bufsiz;
+ return (long)bufsiz;
}
Modified: webservices/axis2/trunk/c/src/core/transport/http/server/apache2/apache2_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/server/apache2/apache2_worker.c?rev=890663&r1=890662&r2=890663&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/http/server/apache2/apache2_worker.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/http/server/apache2/apache2_worker.c Tue Dec 15 06:27:10 2009
@@ -1342,7 +1342,7 @@
if((mime_part->type) == AXIOM_MIME_PART_BUFFER)
{
len = 0;
- len = ap_rwrite(mime_part->part, mime_part->part_size, request);
+ len = ap_rwrite(mime_part->part, (int)mime_part->part_size, request);
ap_rflush(request);
if(len == -1)
{
@@ -1369,7 +1369,7 @@
}
else
{
- output_buffer_size = mime_part->part_size;
+ output_buffer_size = (int)mime_part->part_size;
}
output_buffer = AXIS2_MALLOC(env->allocator, (output_buffer_size + 1)