From: Joseph Sutton <josephsutton@catalyst.net.nz>
Date: Mon, 7 Mar 2022 07:21:32 +0000 (+1300)
Subject: compression: Simplify code by making indic_pos an index
X-Git-Tag: talloc-2.3.4~171
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2ea8d4c056a20a42c4168c816b858fd6b433ed0;p=thirdparty%2Fsamba.git

compression: Simplify code by making indic_pos an index

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
---

diff --git a/lib/compression/lzxpress.c b/lib/compression/lzxpress.c
index db3731c104d..c962ba03490 100644
--- a/lib/compression/lzxpress.c
+++ b/lib/compression/lzxpress.c
@@ -64,7 +64,7 @@ ssize_t lzxpress_compress(const uint8_t *uncompressed,
 	uint32_t max_len, len, best_len, match_len;
 	const uint8_t *str1, *str2;
 	uint32_t indic;
-	uint8_t *indic_pos;
+	uint32_t indic_pos;
 	uint32_t indic_bit, nibble_index;
 
 	uint16_t metadata;
@@ -77,7 +77,7 @@ ssize_t lzxpress_compress(const uint8_t *uncompressed,
 	indic = 0;
 	*(uint32_t *)compressed = 0;
 	compressed_pos = sizeof(uint32_t);
-	indic_pos = &compressed[0];
+	indic_pos = 0;
 
 	byte_left = uncompressed_size;
 	indic_bit = 0;
@@ -129,10 +129,10 @@ ssize_t lzxpress_compress(const uint8_t *uncompressed,
 			indic_bit += 1;
 
 			if (indic_bit == 32) {
-				PUSH_LE_U32(indic_pos, 0, indic);
+				PUSH_LE_U32(compressed, indic_pos, indic);
 				indic_bit = 0;
 				CHECK_OUTPUT_BYTES(sizeof(uint32_t));
-				indic_pos = &compressed[compressed_pos];
+				indic_pos = compressed_pos;
 				compressed_pos += sizeof(uint32_t);
 			}
 		} else {
@@ -200,9 +200,9 @@ ssize_t lzxpress_compress(const uint8_t *uncompressed,
 			indic_bit += 1;
 
 			if (indic_bit == 32) {
-				PUSH_LE_U32(indic_pos, 0, indic);
+				PUSH_LE_U32(compressed, indic_pos, indic);
 				indic_bit = 0;
-				indic_pos = &compressed[compressed_pos];
+				indic_pos = compressed_pos;
 				compressed_pos += sizeof(uint32_t);
 			}
 
@@ -213,7 +213,7 @@ ssize_t lzxpress_compress(const uint8_t *uncompressed,
 
 	indic <<= 32 - indic_bit;
 	indic |= (1 << (32 - indic_bit)) - 1;
-	PUSH_LE_U32(indic_pos, 0, indic);
+	PUSH_LE_U32(compressed, indic_pos, indic);
 
 	return compressed_pos;
 }