Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 14:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/lzo/lzo1x_compress.c: replace ternary operator with min() and min_t()

Browse Source 
Fix the following coccicheck warning:

lib/lzo/lzo1x_compress.c:54: WARNING opportunity for min().
lib/lzo/lzo1x_compress.c:329: WARNING opportunity for min().

min() and min_t() macro is defined in include/linux/minmax.h.  It avoids
multiple evaluations of the arguments when non-constant and performs
strict type-checking.

Link: https://lkml.kernel.org/r/20220714015441.1313036-1-13667453960@163.com
Signed-off-by: Jiangshan Yi <yijiangshan@kylinos.cn>
Tested-by: Dave Rodgman <dave.rodgman@arm.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Jiangshan Yi 2022-07-14 09:54:41 +08:00 committed by akpm
parent b09a7a036d
commit a10c9ede99
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/lzo/lzo1x_compress.c
View File

@ -50,9 +50,7 @@ next:
if (dv == 0 && bitstream_version) { if (dv == 0 && bitstream_version) {
const unsigned char *ir = ip + 4; const unsigned char *ir = ip + 4;
const unsigned char *limit = ip_end const unsigned char *limit = min(ip_end, ip + MAX_ZERO_RUN_LENGTH + 1);
< (ip + MAX_ZERO_RUN_LENGTH + 1)
? ip_end : ip + MAX_ZERO_RUN_LENGTH + 1;
#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && \ #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && \
defined(LZO_FAST_64BIT_MEMORY_ACCESS) defined(LZO_FAST_64BIT_MEMORY_ACCESS)
u64 dv64; u64 dv64;
@ -326,7 +324,7 @@ static int lzogeneric1x_1_compress(const unsigned char *in, size_t in_len,
data_start = op; data_start = op;
while (l > 20) { while (l > 20) {
size_t ll = l <= (m4_max_offset + 1) ? l : (m4_max_offset + 1); size_t ll = min_t(size_t, l, m4_max_offset + 1);
uintptr_t ll_end = (uintptr_t) ip + ll; uintptr_t ll_end = (uintptr_t) ip + ll;
if ((ll_end + ((t + ll) >> 5)) <= ll_end) if ((ll_end + ((t + ll) >> 5)) <= ll_end)
break; break;