From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Tue, 14 Nov 2023 15:57:45 +0000 (+0100)
Subject: [PATCH] lib-compression: istream-zlib - Use container_of() macro
X-Git-Tag: archive/raspbian/1%2.4.1+dfsg1-6+rpi1+deb13u7^2~88
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3a1caacf7e0f47756611e580e68bf2a5829444f6;p=dovecot.git

[PATCH] lib-compression: istream-zlib - Use container_of() macro


Gbp-Pq: Name 0001-lib-compression-istream-zlib-Use-container_of-macro.patch
---

diff --git a/src/lib-compression/istream-zlib.c b/src/lib-compression/istream-zlib.c
index 93b3473..0a1832a 100644
--- a/src/lib-compression/istream-zlib.c
+++ b/src/lib-compression/istream-zlib.c
@@ -40,7 +40,8 @@ static void i_stream_zlib_init(struct zlib_istream *zstream);
 static void i_stream_zlib_close(struct iostream_private *stream,
 				bool close_parent)
 {
-	struct zlib_istream *zstream = (struct zlib_istream *)stream;
+	struct zlib_istream *zstream =
+		container_of(stream, struct zlib_istream, istream.iostream);
 
 	if (!zstream->zs_closed) {
 		(void)inflateEnd(&zstream->zs);
@@ -160,7 +161,8 @@ static int i_stream_zlib_read_trailer(struct zlib_istream *zstream)
 
 static ssize_t i_stream_zlib_read(struct istream_private *stream)
 {
-	struct zlib_istream *zstream = (struct zlib_istream *)stream;
+	struct zlib_istream *zstream =
+		container_of(stream, struct zlib_istream, istream);
 	const unsigned char *data;
 	uoff_t high_offset;
 	size_t size, out_size;
@@ -362,7 +364,8 @@ static void i_stream_zlib_reset(struct zlib_istream *zstream)
 static void
 i_stream_zlib_seek(struct istream_private *stream, uoff_t v_offset, bool mark)
 {
-	struct zlib_istream *zstream = (struct zlib_istream *) stream;
+	struct zlib_istream *zstream =
+		container_of(stream, struct zlib_istream, istream);
 
 	if (i_stream_nonseekable_try_seek(stream, v_offset))
 		return;
@@ -378,7 +381,8 @@ i_stream_zlib_seek(struct istream_private *stream, uoff_t v_offset, bool mark)
 
 static void i_stream_zlib_sync(struct istream_private *stream)
 {
-	struct zlib_istream *zstream = (struct zlib_istream *) stream;
+	struct zlib_istream *zstream =
+		container_of(stream, struct zlib_istream, istream);
 	const struct stat *st;
 
 	if (i_stream_stat(stream->parent, FALSE, &st) == 0) {