Don't use unnecessary braces in lzfse

eafer · eafer · commit be38209c0bc4 · 2025-04-15T19:20:22.000-03:00
Another checkpatch warning: remove all braces around blocks that have a
single statement, except for two cases where it makes more sense to
reorganize long comments so that the warnings stop.

Signed-off-by: Ernesto A. Fernández &lt;ernesto@corellium.com&gt;
diff --git a/lzfse/lzfse_decode_base.c b/lzfse/lzfse_decode_base.c
@@ -210,22 +210,18 @@ static int lzfse_decode_lmd(lzfse_decoder_state *s)
 		int res;
 		/* Decode the next L, M, D symbol from the input stream. */
 		res = fse_in_flush(&in, &src, src_start);
-		if (res) {
+		if (res)
 			return LZFSE_STATUS_ERROR;
-		}
 		L = fse_value_decode(&l_state, bs->l_decoder, &in);
-		if ((lit + L) >= (bs->literals + LZFSE_LITERALS_PER_BLOCK + 64)) {
+		if ((lit + L) >= (bs->literals + LZFSE_LITERALS_PER_BLOCK + 64))
 			return LZFSE_STATUS_ERROR;
-		}
 		res = fse_in_flush2(&in, &src, src_start);
-		if (res) {
+		if (res)
 			return LZFSE_STATUS_ERROR;
-		}
 		M = fse_value_decode(&m_state, bs->m_decoder, &in);
 		res = fse_in_flush2(&in, &src, src_start);
-		if (res) {
+		if (res)
 			return LZFSE_STATUS_ERROR;
-		}
 		new_d = fse_value_decode(&d_state, bs->d_decoder, &in);
 		D = new_d ? new_d : D;
 		symbols--;
@@ -487,9 +483,8 @@ int lzfse_decode(lzfse_decoder_state *s)
 					return LZFSE_STATUS_SRC_EMPTY; /* need all encoded block */
 
 				/* Sanity checks */
-				if (lzfse_check_block_header_v1(&header1) != 0) {
+				if (lzfse_check_block_header_v1(&header1) != 0)
 					return LZFSE_STATUS_ERROR;
-				}
 
 				/* Skip header */
 				s->src += header_size;
diff --git a/lzfse/lzfse_fse.c b/lzfse/lzfse_fse.c
@@ -46,9 +46,8 @@ int fse_init_decoder_table(int nstates, int nsymbols, const uint16_t *__restrict
 
 		sum_of_freq += f;
 
-		if (sum_of_freq > nstates) {
+		if (sum_of_freq > nstates)
 			return -1;
-		}
 
 		k = __builtin_clz(f) - n_clz; /* shift needed to ensure N <= (F<<K) < 2*N */
 		j0 = ((2 * nstates) >> k) - f;
diff --git a/lzfse/lzfse_fse.h b/lzfse/lzfse_fse.h
@@ -296,7 +296,11 @@ static __always_inline int fse_in_checked_init64(fse_in_stream64 *s, fse_bit_cou
 	}
 
 	if ((s->accum_nbits < 56 || s->accum_nbits >= 64) || ((s->accum >> s->accum_nbits) != 0)) {
-		return -1; /* the incoming input is wrong (encoder should have zeroed the upper bits) */
+		/*
+		 * the incoming input is wrong (encoder should have zeroed the
+		 * upper bits)
+		 */
+		return -1;
 	}
 
 	return 0; /* OK */
@@ -324,7 +328,11 @@ static __always_inline int fse_in_checked_init32(fse_in_stream32 *s, fse_bit_cou
 	}
 
 	if ((s->accum_nbits < 24 || s->accum_nbits >= 32) || ((s->accum >> s->accum_nbits) != 0)) {
-		return -1; /* the incoming input is wrong (encoder should have zeroed the upper bits) */
+		/*
+		 * the incoming input is wrong (encoder should have zeroed the
+		 * upper bits)
+		 */
+		return -1;
 	}
 
 	return 0; /* OK */
@@ -345,9 +353,8 @@ static __always_inline int fse_in_checked_flush64(fse_in_stream64 *s, const uint
 	const uint8_t *buf = (*pbuf) - (nbits >> 3);
 	uint64_t incoming;
 
-	if (buf < buf_start) {
+	if (buf < buf_start)
 		return -1; /* out of range */
-	}
 	*pbuf = buf;
 	memcpy(&incoming, buf, 8);
 	/* Update the state object and verify its validity (in DEBUG). */
@@ -371,9 +378,8 @@ static __always_inline int fse_in_checked_flush32(fse_in_stream32 *s, const uint
 		const uint8_t *buf = (*pbuf) - (nbits >> 3);
 		uint32_t incoming;
 
-		if (buf < buf_start) {
+		if (buf < buf_start)
 			return -1; /* out of range */
-		}
 
 		*pbuf = buf;
 
@@ -518,9 +524,8 @@ static __always_inline int fse_check_freq(const uint16_t *freq_table, const size
 	size_t sum_of_freq = 0;
 	int i;
 
-	for (i = 0; i < table_size; i++) {
+	for (i = 0; i < table_size; i++)
 		sum_of_freq += freq_table[i];
-	}
 	return (sum_of_freq > number_of_states) ? -1 : 0;
 }
 
