You are viewing a plain text version of this content. The canonical link for it is here.
Posted to c-commits@axis.apache.org by sh...@apache.org on 2010/04/08 07:39:46 UTC
svn commit: r931785 - in /axis/axis2/c/core/trunk:
src/core/transport/http/server/CGI/axis2_cgi_stream.c
tools/tcpmon/src/tcpmon.c
Author: shankar
Date: Thu Apr 8 05:39:46 2010
New Revision: 931785
URL: http://svn.apache.org/viewvc?rev=931785&view=rev
Log:
Fixing 64bit compilation issue
Modified:
axis/axis2/c/core/trunk/src/core/transport/http/server/CGI/axis2_cgi_stream.c
axis/axis2/c/core/trunk/tools/tcpmon/src/tcpmon.c
Modified: axis/axis2/c/core/trunk/src/core/transport/http/server/CGI/axis2_cgi_stream.c
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/src/core/transport/http/server/CGI/axis2_cgi_stream.c?rev=931785&r1=931784&r2=931785&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/src/core/transport/http/server/CGI/axis2_cgi_stream.c (original)
+++ axis/axis2/c/core/trunk/src/core/transport/http/server/CGI/axis2_cgi_stream.c Thu Apr 8 05:39:46 2010
@@ -45,7 +45,7 @@ int AXIS2_CALL cgi_stream_write(
const void *buffer,
size_t count);
-size_t AXIS2_CALL cgi_stream_read(
+int AXIS2_CALL cgi_stream_read(
axutil_stream_t * stream,
const axutil_env_t * env,
void *buffer,
@@ -85,7 +85,7 @@ axutil_stream_create_cgi(
return &(stream_impl->stream);
}
-size_t AXIS2_CALL
+int AXIS2_CALL
cgi_stream_read(
axutil_stream_t * stream,
const axutil_env_t * env,
@@ -112,7 +112,7 @@ cgi_stream_read(
read_bytes = fread(buffer, sizeof(char), stream_impl->content_length, stdin);
}
- return read_bytes;
+ return (int)read_bytes;
}
int AXIS2_CALL
Modified: axis/axis2/c/core/trunk/tools/tcpmon/src/tcpmon.c
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/tools/tcpmon/src/tcpmon.c?rev=931785&r1=931784&r2=931785&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/tools/tcpmon/src/tcpmon.c (original)
+++ axis/axis2/c/core/trunk/tools/tcpmon/src/tcpmon.c Thu Apr 8 05:39:46 2010
@@ -517,7 +517,7 @@ resend_request(
FILE *file;
axis2_char_t *uuid = NULL;
axis2_char_t *buffer = NULL;
- int read_len = 0;
+ size_t read_len = 0;
if (status == 0)
{
@@ -573,10 +573,10 @@ resend_request(
axis2_char_t *tmp2 = NULL;
axis2_char_t *tmp3 = NULL;
axis2_char_t *uuid_match = NULL;
- int offset = 0;
+ size_t offset = 0;
int loop_state = 1;
int end_reached = 0;
- int rounds = 0;
+ size_t rounds = 0;
offset = (int)strlen(search);
tmp3 = buffer;
@@ -616,7 +616,7 @@ resend_request(
}
else
{
- rounds = (int)(tmp1 - tmp3) + offset + 36;
+ rounds = tmp1 - tmp3 + offset + 36;
tmp3 = tmp1 + offset + 36;
}
if (read_len - offset - 36 < (int)(tmp1 - buffer))
@@ -646,17 +646,17 @@ resend_request(
axis2_char_t *header_str = "*/\n---------------------\n";
axis2_char_t *footer_str =
"\n= = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =";
- int seek_len = 0;
+ size_t seek_len = 0;
int has_raw_binary = 0;
axis2_char_t *request_buffer = NULL;
AXIS2_FREE(env->allocator, uuid_match);
AXIS2_FREE(env->allocator, uuid);
end_reached = 1;
tmp2 += 36;
- offset = (int)strlen(header_str);
+ offset = strlen(header_str);
if (read_len - offset < (int)(tmp2 - buffer))
{
- seek_len = (int)(tmp2 - buffer) + offset - read_len;
+ seek_len = tmp2 - buffer + offset - read_len;
if (seek_len > 0)
{
read_len = fread(buffer, sizeof(char), seek_len, file);