From aea4d3c4b07aa407baa51b8332ec513fa089e42f Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 10 Jan 2022 16:56:54 +0100 Subject: [PATCH] lib/zlib/GunzipReader: use std::size_t --- src/lib/zlib/GunzipReader.cxx | 8 ++++---- src/lib/zlib/GunzipReader.hxx | 2 +- src/lib/zlib/GzipOutputStream.cxx | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lib/zlib/GunzipReader.cxx b/src/lib/zlib/GunzipReader.cxx index 846f482c3..eddc3d162 100644 --- a/src/lib/zlib/GunzipReader.cxx +++ b/src/lib/zlib/GunzipReader.cxx @@ -28,7 +28,7 @@ */ #include "GunzipReader.hxx" -#include "lib/zlib/Error.hxx" +#include "Error.hxx" GunzipReader::GunzipReader(Reader &_next) :next(_next) @@ -50,7 +50,7 @@ GunzipReader::FillBuffer() auto w = buffer.Write(); assert(!w.empty()); - size_t nbytes = next.Read(w.data, w.size); + std::size_t nbytes = next.Read(w.data, w.size); if (nbytes == 0) return false; @@ -58,8 +58,8 @@ GunzipReader::FillBuffer() return true; } -size_t -GunzipReader::Read(void *data, size_t size) +std::size_t +GunzipReader::Read(void *data, std::size_t size) { if (eof) return 0; diff --git a/src/lib/zlib/GunzipReader.hxx b/src/lib/zlib/GunzipReader.hxx index 0db56a602..fcaaadee2 100644 --- a/src/lib/zlib/GunzipReader.hxx +++ b/src/lib/zlib/GunzipReader.hxx @@ -60,7 +60,7 @@ public: } /* virtual methods from class Reader */ - size_t Read(void *data, size_t size) override; + std::size_t Read(void *data, std::size_t size) override; private: bool FillBuffer(); diff --git a/src/lib/zlib/GzipOutputStream.cxx b/src/lib/zlib/GzipOutputStream.cxx index 051582ae3..207d9548b 100644 --- a/src/lib/zlib/GzipOutputStream.cxx +++ b/src/lib/zlib/GzipOutputStream.cxx @@ -28,7 +28,7 @@ */ #include "GzipOutputStream.hxx" -#include "lib/zlib/Error.hxx" +#include "Error.hxx" GzipOutputStream::GzipOutputStream(OutputStream &_next) :next(_next)