diff options
| author | Mike Morris <michael.patrick.morris@gmail.com> | 2014-08-27 15:58:06 -0400 |
|---|---|---|
| committer | Mike Morris <michael.patrick.morris@gmail.com> | 2014-08-27 15:58:06 -0400 |
| commit | 81c9615122ed2c7a8502e25008ccb9c5038427f7 (patch) | |
| tree | 69e8b000191fdf3c25ec025f7cc03b415407a5ab /test | |
| parent | 0c5ba67ac6a5a6dd61065c902241c723a9bf7e56 (diff) | |
| download | qtlocation-mapboxgl-81c9615122ed2c7a8502e25008ccb9c5038427f7.tar.gz | |
more fixes for libuv v0.10
Diffstat (limited to 'test')
| -rw-r--r-- | test/fixtures/fixture_request.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/test/fixtures/fixture_request.cpp b/test/fixtures/fixture_request.cpp index 7e351ecfac..11b308fce1 100644 --- a/test/fixtures/fixture_request.cpp +++ b/test/fixtures/fixture_request.cpp @@ -40,8 +40,8 @@ platform::request_http(const std::string &url, uv_fs_req_cleanup(&open_req); if (err < 0) { req->res->code = err; - req->res->error_message = uv_strerror(err); - Log::Warning(Event::HttpRequest, err, url + ": " + uv_strerror(err)); + req->res->error_message = uv_strerror(uv_last_error(l)); + Log::Warning(Event::HttpRequest, err, url + ": " + uv_strerror(uv_last_error(l))); req->complete(); return req; } @@ -53,13 +53,13 @@ platform::request_http(const std::string &url, err = uv_fs_fstat(l, &stat_req, fd, nullptr); if (err < 0) { req->res->code = err; - req->res->error_message = uv_strerror(err); - Log::Warning(Event::HttpRequest, err, url + ": " + uv_strerror(err)); + req->res->error_message = uv_strerror(uv_last_error(l)); + Log::Warning(Event::HttpRequest, err, url + ": " + uv_strerror(uv_last_error(l))); req->complete(); return req; } - const uint64_t size = static_cast<const uv_stat_t*>(stat_req.ptr)->st_size; + const uint64_t size = static_cast<const uv_statbuf_t*>(stat_req.ptr)->st_size; std::string body; @@ -71,8 +71,8 @@ platform::request_http(const std::string &url, uv_fs_req_cleanup(&read_req); if (err < 0) { req->res->code = err; - req->res->error_message = uv_strerror(err); - Log::Warning(Event::HttpRequest, err, url + ": " + uv_strerror(err)); + req->res->error_message = uv_strerror(uv_last_error(l)); + Log::Warning(Event::HttpRequest, err, url + ": " + uv_strerror(uv_last_error(l))); req->complete(); return req; } @@ -83,8 +83,8 @@ platform::request_http(const std::string &url, uv_fs_req_cleanup(&close_req); if (err < 0) { req->res->code = err; - req->res->error_message = uv_strerror(err); - Log::Warning(Event::HttpRequest, err, url + ": " + uv_strerror(err)); + req->res->error_message = uv_strerror(uv_last_error(l)); + Log::Warning(Event::HttpRequest, err, url + ": " + uv_strerror(uv_last_error(l))); req->complete(); return req; } |