| From: Yury Norov <yury.norov@gmail.com> |
| Subject: lib/zlib: drop EQUAL macro |
| Date: Wed, 5 Feb 2025 16:29:32 -0500 |
| |
| The macro is prehistoric, and only exists to help those readers who don't |
| know what memcmp() returns if memory areas differ. This is pretty well |
| documented, so the macro looks excessive. |
| |
| Now that the only user of the macro depends on DEBUG_ZLIB config, GCC |
| warns about unused macro if the library is built with W=2 against |
| defconfig. So drop it for good. |
| |
| Link: https://lkml.kernel.org/r/20250205212933.68695-1-yury.norov@gmail.com |
| Signed-off-by: Yury Norov <yury.norov@gmail.com> |
| Reviewed-by: Sergey Senozhatsky <senozhatsky@chromium.org> |
| Reviewed-by: Mikhail Zaslonko <zaslonko@linux.ibm.com> |
| Cc: Heiko Carsten <heiko.carstens@de.ibm.com> |
| Cc: Ilya Leoshkevich <iii@linux.ibm.com> |
| Cc: Joe Perches <joe@perches.com> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| --- |
| |
| lib/zlib_deflate/deflate.c | 6 +----- |
| 1 file changed, 1 insertion(+), 5 deletions(-) |
| |
| --- a/lib/zlib_deflate/deflate.c~lib-zlib-drop-equal-macro |
| +++ a/lib/zlib_deflate/deflate.c |
| @@ -151,9 +151,6 @@ static const config configuration_table[ |
| * meaning. |
| */ |
| |
| -#define EQUAL 0 |
| -/* result of memcmp for equal strings */ |
| - |
| /* =========================================================================== |
| * Update a hash value with the given input byte |
| * IN assertion: all calls to UPDATE_HASH are made with consecutive |
| @@ -713,8 +710,7 @@ static void check_match( |
| ) |
| { |
| /* check that the match is indeed a match */ |
| - if (memcmp((char *)s->window + match, |
| - (char *)s->window + start, length) != EQUAL) { |
| + if (memcmp((char *)s->window + match, (char *)s->window + start, length)) { |
| fprintf(stderr, " start %u, match %u, length %d\n", |
| start, match, length); |
| do { |
| _ |
