diff options
| author |  shankar | 2010-04-08 05:39:46 +0000 |
|---|---|---|
| committer | shankar | 2010-04-08 05:39:46 +0000 |
| commit | af99ae8bc38e960b31907e5d642c67d15a3ea8c9 (patch) | |
| tree | df7f365295691105885a8f295beff9d87ad24921 | |
| parent | 23cb842e50aa23e13ed8031820452e4a58a2e3bd (diff) | |
| download | axis2c-af99ae8bc38e960b31907e5d642c67d15a3ea8c9.tar.gz axis2c-af99ae8bc38e960b31907e5d642c67d15a3ea8c9.tar.bz2 | |
Fixing 64bit compilation issue
git-svn-id: http://svn.apache.org/repos/asf/axis/axis2/c/core/trunk@931785 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | src/core/transport/http/server/CGI/axis2_cgi_stream.c | 6 | ||||
| -rw-r--r-- | tools/tcpmon/src/tcpmon.c | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/core/transport/http/server/CGI/axis2_cgi_stream.c b/src/core/transport/http/server/CGI/axis2_cgi_stream.c index 15b3340..345b750 100644 --- a/src/core/transport/http/server/CGI/axis2_cgi_stream.c +++ b/src/core/transport/http/server/CGI/axis2_cgi_stream.c @@ -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 diff --git a/tools/tcpmon/src/tcpmon.c b/tools/tcpmon/src/tcpmon.c index 567bfc3..cb4afa6 100644 --- a/tools/tcpmon/src/tcpmon.c +++ b/tools/tcpmon/src/tcpmon.c @@ -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); |