[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Mon, 11 Oct 2021 05:31:41 +0800
From: Gao Xiang <xiang@...nel.org>
To: linux-erofs@...ts.ozlabs.org, LKML <linux-kernel@...r.kernel.org>
Cc: Lasse Collin <lasse.collin@...aani.org>, Chao Yu <chao@...nel.org>,
Andrew Morton <akpm@...ux-foundation.org>,
Greg KH <gregkh@...uxfoundation.org>,
Linus Torvalds <torvalds@...ux-foundation.org>,
Gao Xiang <hsiangkao@...ux.alibaba.com>
Subject: [PATCH 3/7] lib/xz: Move s->lzma.len = 0 initialization to lzma_reset()
From: Lasse Collin <lasse.collin@...aani.org>
It's a more logical place even if the resetting needs to be done
only once per LZMA2 stream (if lzma_reset() called in the middle
of an LZMA2 stream, .len will already be 0).
Signed-off-by: Lasse Collin <lasse.collin@...aani.org>
Signed-off-by: Gao Xiang <hsiangkao@...ux.alibaba.com>
---
lib/xz/xz_dec_lzma2.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/lib/xz/xz_dec_lzma2.c b/lib/xz/xz_dec_lzma2.c
index d548cf0e59fe..22b789645ce5 100644
--- a/lib/xz/xz_dec_lzma2.c
+++ b/lib/xz/xz_dec_lzma2.c
@@ -791,6 +791,7 @@ static void lzma_reset(struct xz_dec_lzma2 *s)
s->lzma.rep1 = 0;
s->lzma.rep2 = 0;
s->lzma.rep3 = 0;
+ s->lzma.len = 0;
/*
* All probabilities are initialized to the same value. This hack
@@ -1174,8 +1175,6 @@ XZ_EXTERN enum xz_ret xz_dec_lzma2_reset(struct xz_dec_lzma2 *s, uint8_t props)
}
}
- s->lzma.len = 0;
-
s->lzma2.sequence = SEQ_CONTROL;
s->lzma2.need_dict_reset = true;
--
2.20.1
Powered by blists - more mailing lists