e2fsck: avoid -Wtautological-constant-out-of-range-compare warnings

Fix two compiler warnings on 32-bit platforms that have mallinfo() but
not mallinfo2().  These showed up when building e2fsprogs for armv7a or
i686 Android using the Android NDK, targeting Android API level 32 or
lower and using the autotools-based build system.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/e2fsck/iscan.c b/e2fsck/iscan.c
index 33c6a4cdc442a1f1442f5059c9722524f5e0ae65..1253f52ffcfbb903cc8bd9a2a37b48640e506372 100644 (file)
--- a/e2fsck/iscan.c
+++ b/e2fsck/iscan.c
@@ -120,7 +120,8 @@ void print_resource_track(const char *desc,
        } else
 #elif defined HAVE_MALLINFO
        /* don't use mallinfo() if over 2GB used, since it returns "int" */
-       if ((char *)sbrk(0) - (char *)track->brk_start < 2LL << 30) {
+       if ((unsigned long)((char *)sbrk(0) - (char *)track->brk_start) <
+           2UL << 30) {
                struct mallinfo malloc_info = mallinfo();
 
                printf("Memory used: %lluk/%lluk (%lluk/%lluk), ",

diff --git a/e2fsck/util.c b/e2fsck/util.c
index 42740d9effaecd90892e1e34914c2369394eadc7..0fe4360311ea3dac0bb4b4a9d7338e798d8f4a2d 100644 (file)
--- a/e2fsck/util.c
+++ b/e2fsck/util.c
@@ -441,7 +441,8 @@ void print_resource_track(e2fsck_t ctx, const char *desc,
        } else
 #elif defined HAVE_MALLINFO
        /* don't use mallinfo() if over 2GB used, since it returns "int" */
-       if ((char *)sbrk(0) - (char *)track->brk_start < 2LL << 30) {
+       if ((unsigned long)((char *)sbrk(0) - (char *)track->brk_start) <
+           2UL << 30) {
                struct mallinfo malloc_info = mallinfo();
 
                log_out(ctx, _("Memory used: %lluk/%lluk (%lluk/%lluk), "),