diff options
author | Christopher Wiley <wiley@google.com> | 2016-04-18 18:02:58 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-04-18 18:02:58 +0000 |
commit | f11c2765a2a60b830cf099680488d727237a5af9 (patch) | |
tree | 28db218fe8be9217bd2ad53f4b6bde9062ce14a5 | |
parent | ea66d41d95d089724dff511356b9d36163ba9df0 (diff) | |
parent | 07bc213376c1db1db568574b7a23767dd46e8df6 (diff) | |
download | webservd-f11c2765a2a60b830cf099680488d727237a5af9.tar.gz |
Revert "Replace ScopedFd with unique_fd"
am: 07bc213
* commit '07bc213376c1db1db568574b7a23767dd46e8df6':
Revert "Replace ScopedFd with unique_fd"
Change-Id: Ib8c44c8564e3d83b806d6a73d038e5cef5b85775
-rw-r--r-- | libwebserv/binder_request_handler.cc | 2 | ||||
-rw-r--r-- | libwebserv/binder_request_impl.cc | 2 | ||||
-rw-r--r-- | libwebserv/binder_request_impl.h | 6 | ||||
-rw-r--r-- | libwebserv/binder_response.cc | 2 | ||||
-rw-r--r-- | webservd/binder_request.cc | 6 | ||||
-rw-r--r-- | webservd/binder_request.h | 8 |
6 files changed, 13 insertions, 13 deletions
diff --git a/libwebserv/binder_request_handler.cc b/libwebserv/binder_request_handler.cc index 9dd4325..3891135 100644 --- a/libwebserv/binder_request_handler.cc +++ b/libwebserv/binder_request_handler.cc @@ -33,7 +33,7 @@ Status BinderRequestHandler::ProcessRequest(const sp<IHttpRequest>& request) { vector<string> headers; vector<string> query_params; vector<string> post_params; - android::base::unique_fd body; + ScopedFd body; // TODO(b/27407721): Fewer binder calls here status = request->GetUrl(&url); diff --git a/libwebserv/binder_request_impl.cc b/libwebserv/binder_request_impl.cc index e93ce27..2a81e29 100644 --- a/libwebserv/binder_request_impl.cc +++ b/libwebserv/binder_request_impl.cc @@ -24,7 +24,7 @@ BinderRequestImpl::BinderRequestImpl(const string& url, const vector<string>& headers, const vector<string>& query_params, const vector<string>& post_params, - android::base::unique_fd&& body) + ScopedFd&& body) : Request(url, method), body_(std::move(body)) { CHECK(!(headers.size() % 2)); diff --git a/libwebserv/binder_request_impl.h b/libwebserv/binder_request_impl.h index eae2b78..f8e2a0f 100644 --- a/libwebserv/binder_request_impl.h +++ b/libwebserv/binder_request_impl.h @@ -20,7 +20,7 @@ #include <brillo/streams/file_stream.h> -#include <android-base/unique_fd.h> +#include <nativehelper/ScopedFd.h> #include "libwebserv/request.h" @@ -33,12 +33,12 @@ class BinderRequestImpl : public Request { const std::vector<std::string>& headers, const std::vector<std::string>& query_params, const std::vector<std::string>& post_params, - android::base::unique_fd&& body); + ScopedFd&& body); brillo::StreamPtr GetDataStream() override; private: - android::base::unique_fd body_; + ScopedFd body_; DISALLOW_COPY_AND_ASSIGN(BinderRequestImpl); }; diff --git a/libwebserv/binder_response.cc b/libwebserv/binder_response.cc index 4f497f8..ddcffab 100644 --- a/libwebserv/binder_response.cc +++ b/libwebserv/binder_response.cc @@ -44,7 +44,7 @@ void BinderResponse::Reply(int status_code, const std::string& mime_type) { vector<string> headers; AddHeader(brillo::http::response_header::kContentType, mime_type); - android::base::unique_fd data_out; + ScopedFd data_out; for (const auto& header : headers_) { headers.emplace_back(header.first); diff --git a/webservd/binder_request.cc b/webservd/binder_request.cc index 4b7d1ea..96c0a86 100644 --- a/webservd/binder_request.cc +++ b/webservd/binder_request.cc @@ -33,7 +33,7 @@ namespace android { namespace webservd { namespace { -Status DupToScopedFd(int fd, android::base::unique_fd* target) { +Status DupToScopedFd(int fd, ScopedFd* target) { do { target->reset(dup(fd)); @@ -51,7 +51,7 @@ Status DupToScopedFd(int fd, android::base::unique_fd* target) { } // namespace -Status HttpRequest::GetBody(android::base::unique_fd* body) { +Status HttpRequest::GetBody(ScopedFd* body) { return DupToScopedFd(request_->GetBodyDataFileDescriptor(), body); } @@ -93,7 +93,7 @@ Status HttpRequest::GetHeaders(vector<string>* headers) { Status HttpRequest::Respond(int32_t status_code, const vector<string>& response_headers, int32_t data_size, - android::base::unique_fd* response_stream) { + ScopedFd* response_stream) { if (response_headers.size() % 2) { return Status::fromExceptionCode(Status::EX_ILLEGAL_ARGUMENT, String8("Header array contained unmatched key.")); diff --git a/webservd/binder_request.h b/webservd/binder_request.h index 9fe7f28..1e8e74a 100644 --- a/webservd/binder_request.h +++ b/webservd/binder_request.h @@ -19,7 +19,7 @@ #include <string> #include <vector> -#include <android-base/unique_fd.h> +#include <nativehelper/ScopedFd.h> #include "android/webservd/BnHttpRequest.h" @@ -33,7 +33,7 @@ class HttpRequest final : public android::webservd::BnHttpRequest { public: explicit HttpRequest(::webservd::Request* request) : request_(request) {} - android::binder::Status GetBody(android::base::unique_fd* body) override; + android::binder::Status GetBody(ScopedFd* body) override; android::binder::Status GetUrl(std::string* url) override; android::binder::Status GetMethod(std::string* method) override; android::binder::Status GetQueryParams(std::vector<std::string>* params) @@ -46,11 +46,11 @@ class HttpRequest final : public android::webservd::BnHttpRequest { int32_t status_code, const std::vector<std::string>& response_headers, int32_t data_size, - android::base::unique_fd* response_stream) override; + ScopedFd* response_stream) override; private: ::webservd::Request* request_; - android::base::unique_fd body_; + ScopedFd body_; DISALLOW_COPY_AND_ASSIGN(HttpRequest); }; |