From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-170.mta1.migadu.com (out-170.mta1.migadu.com [95.215.58.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 08990378D9F for ; Mon, 8 Jun 2026 19:42:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780947747; cv=none; b=LTnW5FGcc1CtbxMJdjSxU40lV9aCacsorQElB/yFa5zrPVJjk+C9bOlN4Ieu7yOGRCLBU/SZbUGvh8JBr1u1UlAHoOX8p2OTfOODDCau0t2L7RmCxvZKCTCfoQnYIRYKvY9oMLxTfUUdWiuDs82hXxjndobaqqzrbucOhJq6VJE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780947747; c=relaxed/simple; bh=FDQ8WWIBZKbJnnHW/7diKUr9djwquvzaWHN4IiiS5vM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=jJJmBWP1pUlwwGLf5vc8j+aFNOSNKNqJ/XD8+QU6ipIhioaW7GWBL9HSxtbhVOP9ZPAeAQsp1qg2Jt5QDsNG6+sL0T4WCBxgVH03UOi9dezuHrZcMG4LDVHHffWLmv8znrdQPEov2XRTgU5Jyikoka47VN1co0CLL3HzXYdo2CA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=uKmHBSzx; arc=none smtp.client-ip=95.215.58.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="uKmHBSzx" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1780947743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=60iM+4tjGy9qmVL+AvBxmxYoknoKqUbLUCwS/mfLPSM=; b=uKmHBSzxlEKJAz5xqcPi5Uwr9nS/+xhT8IHkhRRZxTjzYJV6gI1Bpavlf+DytGOyriKXCP FkHRy1ufZo2u08sX4F36dMKQGZ2Ex3wz34bILcIvf88pfKcsdsZ1K7IUaHCDMfBrXlk/p+ JAexu+UdQ5MOzN8l64ladm8P1w4tdhA= From: Thorsten Blum To: Lasse Collin Cc: Thorsten Blum , linux-kernel@vger.kernel.org Subject: [PATCH] lib/xz: replace min_t with min Date: Mon, 8 Jun 2026 21:41:34 +0200 Message-ID: <20260608194134.164093-2-thorsten.blum@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2716; i=thorsten.blum@linux.dev; h=from:subject; bh=FDQ8WWIBZKbJnnHW/7diKUr9djwquvzaWHN4IiiS5vM=; b=owGbwMvMwCUWt7pQ4caZUj3G02pJDFnqUu9EWJcJHZg+7Znp/xBLj7QQE523LWtTtGYuYfmUd sd+//fpHaUsDGJcDLJiiiwPZv2Y4VtaU7nJJGInzBxWJpAhDFycAjAR/osMf4VCW3anHzK49avt 3lzpxs2bVG5ni77h4GgIkj3Isf7twnZGhqdmizZNVOIorcr5Xjb7UqiSQ31e4jyNOTeapvvtsKy WZgMA X-Developer-Key: i=thorsten.blum@linux.dev; a=openpgp; fpr=1D60735E8AEF3BE473B69D84733678FD8DFEEAD4 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT Use the simpler min() macro since the values are unsigned and compatible. Signed-off-by: Thorsten Blum --- lib/xz/xz_dec_bcj.c | 2 +- lib/xz/xz_dec_lzma2.c | 11 +++++------ lib/xz/xz_dec_stream.c | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/lib/xz/xz_dec_bcj.c b/lib/xz/xz_dec_bcj.c index cc49a300a5b2..88922323f96e 100644 --- a/lib/xz/xz_dec_bcj.c +++ b/lib/xz/xz_dec_bcj.c @@ -466,7 +466,7 @@ static void bcj_flush(struct xz_dec_bcj *s, struct xz_buf *b) { size_t copy_size; - copy_size = min_t(size_t, s->temp.filtered, b->out_size - b->out_pos); + copy_size = min(s->temp.filtered, b->out_size - b->out_pos); memcpy(b->out + b->out_pos, s->temp.buf, copy_size); b->out_pos += copy_size; diff --git a/lib/xz/xz_dec_lzma2.c b/lib/xz/xz_dec_lzma2.c index 4b783ac94e71..9d80342b9c6b 100644 --- a/lib/xz/xz_dec_lzma2.c +++ b/lib/xz/xz_dec_lzma2.c @@ -354,7 +354,7 @@ static bool dict_repeat(struct dictionary *dict, uint32_t *len, uint32_t dist) if (dist >= dict->full || dist >= dict->size) return false; - left = min_t(size_t, dict->limit - dict->pos, *len); + left = min(dict->limit - dict->pos, *len); *len -= left; back = dict->pos - dist - 1; @@ -1098,9 +1098,8 @@ enum xz_ret xz_dec_lzma2_run(struct xz_dec_lzma2 *s, struct xz_buf *b) * the output buffer yet, we may run this loop * multiple times without changing s->lzma2.sequence. */ - dict_limit(&s->dict, min_t(size_t, - b->out_size - b->out_pos, - s->lzma2.uncompressed)); + dict_limit(&s->dict, min(b->out_size - b->out_pos, + s->lzma2.uncompressed)); if (!lzma2_lzma(s, b)) return XZ_DATA_ERROR; @@ -1260,8 +1259,8 @@ enum xz_ret xz_dec_microlzma_run(struct xz_dec_microlzma *s_ptr, s->dict.end = b->out_size - b->out_pos; while (true) { - dict_limit(&s->dict, min_t(size_t, b->out_size - b->out_pos, - s->lzma2.uncompressed)); + dict_limit(&s->dict, min(b->out_size - b->out_pos, + s->lzma2.uncompressed)); if (!lzma2_lzma(s, b)) return XZ_DATA_ERROR; diff --git a/lib/xz/xz_dec_stream.c b/lib/xz/xz_dec_stream.c index 59bfd54ffee7..0bed6daefac2 100644 --- a/lib/xz/xz_dec_stream.c +++ b/lib/xz/xz_dec_stream.c @@ -155,8 +155,8 @@ static const uint8_t check_sizes[16] = { */ static bool fill_temp(struct xz_dec *s, struct xz_buf *b) { - size_t copy_size = min_t(size_t, - b->in_size - b->in_pos, s->temp.size - s->temp.pos); + size_t copy_size = min(b->in_size - b->in_pos, + s->temp.size - s->temp.pos); memcpy(s->temp.buf + s->temp.pos, b->in + b->in_pos, copy_size); b->in_pos += copy_size;