diff options
author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-11-14 09:27:28 +0000 |
---|---|---|
committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-11-14 09:27:28 +0000 |
commit | 2c7009b5200ff5b7462b56239c909daef8ed7910 (patch) | |
tree | 40b116d31a3c7f56540d12ed05a5b80f3e7c4ef3 /sca-cpp/trunk/modules/http/curl-connect.cpp | |
parent | efccdd821b68280ee3b73c8ef5cda121bc27f620 (diff) |
Port to Ubuntu server 10.10 64-bit. C++ code fixes required to compile and run on 64-bit. Update INSTALL doc and build scripts. Remove a few obsolete scripts.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1034963 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-cpp/trunk/modules/http/curl-connect.cpp')
-rw-r--r-- | sca-cpp/trunk/modules/http/curl-connect.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sca-cpp/trunk/modules/http/curl-connect.cpp b/sca-cpp/trunk/modules/http/curl-connect.cpp index 8957fb01b0..432ccc2000 100644 --- a/sca-cpp/trunk/modules/http/curl-connect.cpp +++ b/sca-cpp/trunk/modules/http/curl-connect.cpp @@ -60,8 +60,8 @@ const bool testConnect(const string& url, const string& ca = "", const string& c if (pollfds->rtnevents & APR_POLLIN) { char data[8192]; if (pollfds->desc.s == csock) { - const int rl = ::read(0, data, sizeof(data)); - if (rl == -1) + const size_t rl = ::read(0, data, sizeof(data)); + if (rl == (size_t)-1) return false; if (rl > 0) { const failable<bool> src = http::send(data, rl, cs); @@ -69,12 +69,12 @@ const bool testConnect(const string& url, const string& ca = "", const string& c } } else { - const failable<int> frl = http::recv(data, sizeof(data), cs); + const failable<size_t> frl = http::recv(data, sizeof(data), cs); assert(hasContent(frl)); - const int rl = content(frl); + const size_t rl = content(frl); if (rl == 0) return true; - const int wl = ::write(0, data, rl); + const size_t wl = ::write(0, data, rl); assert(wl == rl); } continue; |