From 171b31ae67f8668d5dd7142945600e64e19d2f5a Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 4 Jul 2022 10:04:23 +0200 Subject: [PATCH] lib/zlib/GzipOutputStream: rename Flush() to Finish() --- src/db/plugins/simple/SimpleDatabasePlugin.cxx | 2 +- src/lib/zlib/GzipOutputStream.cxx | 2 +- src/lib/zlib/GzipOutputStream.hxx | 2 +- test/run_gzip.cxx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/db/plugins/simple/SimpleDatabasePlugin.cxx b/src/db/plugins/simple/SimpleDatabasePlugin.cxx index 4b30c7ed8..b99687def 100644 --- a/src/db/plugins/simple/SimpleDatabasePlugin.cxx +++ b/src/db/plugins/simple/SimpleDatabasePlugin.cxx @@ -380,7 +380,7 @@ SimpleDatabase::Save() #ifdef ENABLE_ZLIB if (gzip != nullptr) { - gzip->Flush(); + gzip->Finish(); gzip.reset(); } #endif diff --git a/src/lib/zlib/GzipOutputStream.cxx b/src/lib/zlib/GzipOutputStream.cxx index 446bc8c22..a72811ed7 100644 --- a/src/lib/zlib/GzipOutputStream.cxx +++ b/src/lib/zlib/GzipOutputStream.cxx @@ -55,7 +55,7 @@ GzipOutputStream::~GzipOutputStream() } void -GzipOutputStream::Flush() +GzipOutputStream::Finish() { /* no more input */ z.next_in = nullptr; diff --git a/src/lib/zlib/GzipOutputStream.hxx b/src/lib/zlib/GzipOutputStream.hxx index 267d17c8a..0b61a9380 100644 --- a/src/lib/zlib/GzipOutputStream.hxx +++ b/src/lib/zlib/GzipOutputStream.hxx @@ -56,7 +56,7 @@ public: * Finish the file and write all data remaining in zlib's * output buffer. */ - void Flush(); + void Finish(); /* virtual methods from class OutputStream */ void Write(const void *data, size_t size) override; diff --git a/test/run_gzip.cxx b/test/run_gzip.cxx index 0c318480c..890a30c74 100644 --- a/test/run_gzip.cxx +++ b/test/run_gzip.cxx @@ -48,7 +48,7 @@ CopyGzip(OutputStream &_dest, int src) { GzipOutputStream dest(_dest); Copy(dest, src); - dest.Flush(); + dest.Finish(); } static void