From b5faca7a90e1aa25adb8ee69b979d1f4bd7e8d78 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 23 Jun 2020 16:12:41 +0200 Subject: Replace some magic 64*1024 with APT_BUFFER_SIZE --- cmdline/apt-dump-solver.cc | 5 ++--- methods/http.cc | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cmdline/apt-dump-solver.cc b/cmdline/apt-dump-solver.cc index 24a9f23eb..ab44b9fd1 100644 --- a/cmdline/apt-dump-solver.cc +++ b/cmdline/apt-dump-solver.cc @@ -134,11 +134,10 @@ int main(int argc,const char *argv[]) /*{{{*/ return WriteError("ERR_READ_ERROR", out, stdoutfd, Solver); } - constexpr size_t BufSize = 64 * 1024; - std::unique_ptr Buf(new char[BufSize]); + std::unique_ptr Buf(new char[APT_BUFFER_SIZE]); unsigned long long ToRead = 0; do { - if (input.Read(Buf.get(),BufSize, &ToRead) == false) + if (input.Read(Buf.get(), APT_BUFFER_SIZE, &ToRead) == false) { std::ostringstream out; out << "Writing EDSP solver input to file '" << filename << "' failed as reading from stdin failed!\n"; diff --git a/methods/http.cc b/methods/http.cc index 71aa56751..7036b743c 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -407,7 +407,7 @@ static ResultState UnwrapHTTPConnect(std::string Host, int Port, URI Proxy, std: /*}}}*/ // HttpServerState::HttpServerState - Constructor /*{{{*/ -HttpServerState::HttpServerState(URI Srv,HttpMethod *Owner) : ServerState(Srv, Owner), In(Owner, 64*1024), Out(Owner, 4*1024) +HttpServerState::HttpServerState(URI Srv, HttpMethod *Owner) : ServerState(Srv, Owner), In(Owner, APT_BUFFER_SIZE), Out(Owner, 4 * 1024) { TimeOut = Owner->ConfigFindI("Timeout", TimeOut); ServerFd = MethodFd::FromFd(-1); -- cgit v1.2.3