From 38dba8cd72be4d47a5590dd4bb84845fd341869e Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sun, 27 Dec 2015 15:31:34 +0100 Subject: FileFdPrivate: Extract SimpleBuffer and mark it as hidden Gbp-Dch: ignore --- apt-pkg/contrib/fileutl.cc | 45 ++++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) (limited to 'apt-pkg') diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 99db66f03..b1f1c78a2 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -919,30 +919,33 @@ bool ChangeOwnerAndPermissionOfFile(char const * const requester, char const * c } /*}}}*/ +struct APT_HIDDEN simple_buffer { /*{{{*/ + static constexpr size_t buffersize_max = 4096; + unsigned long long bufferstart = 0; + unsigned long long bufferend = 0; + char buffer[buffersize_max]; + + char *get() { return buffer + bufferstart; } + bool empty() { return bufferend <= bufferstart; } + unsigned long long size() { return bufferend-bufferstart; } + void reset() { bufferend = bufferstart = 0; } + ssize_t read(void *to, unsigned long long requested_size) APT_MUSTCHECK + { + if (size() < requested_size) + requested_size = size(); + memcpy(to, buffer + bufferstart, requested_size); + bufferstart += requested_size; + if (bufferstart == bufferend) + bufferstart = bufferend = 0; + return requested_size; + } +}; + /*}}}*/ + class APT_HIDDEN FileFdPrivate { /*{{{*/ protected: FileFd * const filefd; - struct simple_buffer { - static constexpr size_t buffersize_max = 4096; - unsigned long long bufferstart = 0; - unsigned long long bufferend = 0; - char buffer[buffersize_max]; - - char *get() { return buffer + bufferstart; } - bool empty() { return bufferend <= bufferstart; } - unsigned long long size() { return bufferend-bufferstart; } - void reset() { bufferend = bufferstart = 0; } - ssize_t read(void *to, unsigned long long requested_size) APT_MUSTCHECK - { - if (size() < requested_size) - requested_size = size(); - memcpy(to, buffer + bufferstart, requested_size); - bufferstart += requested_size; - if (bufferstart == bufferend) - bufferstart = bufferend = 0; - return requested_size; - } - } buffer; + simple_buffer buffer; public: int compressed_fd; pid_t compressor_pid; -- cgit v1.2.3