From patchwork Sun Aug 20 17:17:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 22245 Received: (qmail 106286 invoked by alias); 20 Aug 2017 17:17:20 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 104922 invoked by uid 89); 20 Aug 2017 17:17:19 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=4647 X-HELO: mail-pf0-f169.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-disposition:content-transfer-encoding:user-agent; bh=ZgyX6mi28550wicVfmSt+lnbkjYHzql7dJepFBArAmM=; b=AhbsfW+3plGpN8Wa7YmY2Yuxmkuk5qk/4NP6lsiYwOCKZOJ9CIaEggA/Y9xR5fTPK/ dESRMHLOODGa+Cu3SjVeBCHGXAYbIuQi9XS7r6oSDTQuUtBHa90S/0alv/m3LC2WgGoP WeptcCOdEsrQ3OYf/MPSmEz3b/tCrEpRbf+uGqnYmIC5GP+sM4wbGVWY8HVJBq5n4TBn Mf0Fz0ULlaPQRhDyIyw8Mv+YCt8qQ8AHQ6Q66wwkTT0I/ReOUvUYSJxhiQPWTXXZvei+ PLbUjl1X1bKjQWBE0EN0A8KpK8I3OAJtaghmT43dBrqfzVwj8bQLnx6d4Vekmf7vQaGp AfgQ== X-Gm-Message-State: AHYfb5iD1lCm0ESOkyTBDKAllz/g3anCHiOyqIds5HV6UtjrIpn6PV/0 17n1aSH1T26hTHXQ X-Received: by 10.84.233.199 with SMTP id m7mr16593775pln.292.1503249434974; Sun, 20 Aug 2017 10:17:14 -0700 (PDT) Date: Sun, 20 Aug 2017 10:17:13 -0700 From: "H.J. Lu" To: GNU C Library Subject: [PATCH] string/stratcliff.c: Replace int with size_t [BZ #21982] Message-ID: <20170820171713.GA19531@gmail.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.8.3 (2017-05-23) Fix GCC 7 errors when string/stratcliff.c is compiled with -O3: stratcliff.c: In function ‘do_test’: cc1: error: assuming signed overflow does not occur when assuming that (X - c) <= X is always true [-Werror=strict-overflow] OK for master? H.J. --- [BZ #21982] * string/stratcliff.c (do_test): Declare size, nchars, inner, middle and outer with size_t instead of int. Repleace %d with %Zd in printf. --- string/stratcliff.c | 72 ++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/string/stratcliff.c b/string/stratcliff.c index e28b0c5058..ae780379cb 100644 --- a/string/stratcliff.c +++ b/string/stratcliff.c @@ -58,8 +58,8 @@ int do_test (void) { - int size = sysconf (_SC_PAGESIZE); - int nchars = size / sizeof (CHAR); + size_t size = sysconf (_SC_PAGESIZE); + size_t nchars = size / sizeof (CHAR); CHAR *adr; CHAR *dest; int result = 0; @@ -80,7 +80,7 @@ do_test (void) } else { - int inner, middle, outer; + size_t inner, middle, outer; mprotect (adr, size, PROT_NONE); mprotect (adr + 2 * nchars, size, PROT_NONE); @@ -101,7 +101,7 @@ do_test (void) if (STRLEN (&adr[outer]) != (size_t) (inner - outer)) { - printf ("%s flunked for outer = %d, inner = %d\n", + printf ("%s flunked for outer = %Zd, inner = %Zd\n", STRINGIFY (STRLEN), outer, inner); result = 1; } @@ -120,7 +120,7 @@ do_test (void) if (STRNLEN (&adr[outer], inner - outer + 1) != (size_t) (inner - outer)) { - printf ("%s flunked for outer = %d, inner = %d\n", + printf ("%s flunked for outer = %Zd, inner = %Zd\n", STRINGIFY (STRNLEN), outer, inner); result = 1; } @@ -135,7 +135,7 @@ do_test (void) if (STRNLEN (&adr[outer], inner - outer) != (size_t) (inner - outer)) { - printf ("%s flunked bounded for outer = %d, inner = %d\n", + printf ("%s flunked bounded for outer = %Zd, inner = %Zd\n", STRINGIFY (STRNLEN), outer, inner); result = 1; } @@ -158,8 +158,8 @@ do_test (void) || (inner != middle && (cp - &adr[outer]) != middle - outer)) { - printf ("%s flunked for outer = %d, middle = %d, " - "inner = %d\n", + printf ("%s flunked for outer = %Zd, middle = %Zd, " + "inner = %Zd\n", STRINGIFY (STRCHR), outer, middle, inner); result = 1; } @@ -195,8 +195,8 @@ do_test (void) || (inner != middle && (cp - &adr[outer]) != middle - outer)) { - printf ("%s flunked for outer = %d, middle = %d, " - "inner = %d\n", + printf ("%s flunked for outer = %Zd, middle = %Zd, " + "inner = %Zd\n", STRINGIFY (STRRCHR), outer, middle, inner); result = 1; } @@ -218,7 +218,7 @@ do_test (void) if (cp - &adr[outer] != middle - outer) { - printf ("%s flunked for outer = %d, middle = %d\n", + printf ("%s flunked for outer = %Zd, middle = %Zd\n", STRINGIFY (MEMCHR), outer, middle); result = 1; } @@ -232,7 +232,7 @@ do_test (void) if (cp != NULL) { - printf ("%s flunked for outer = %d\n", + printf ("%s flunked for outer = %Zd\n", STRINGIFY (MEMCHR), outer); result = 1; } @@ -251,7 +251,7 @@ do_test (void) if (cp - &adr[outer] != middle - outer) { - printf ("%s flunked for outer = %d, middle = %d\n", + printf ("%s flunked for outer = %Zd, middle = %Zd\n", STRINGIFY (rawmemchr), outer, middle); result = 1; } @@ -271,7 +271,7 @@ do_test (void) if (cp - &adr[outer] != middle - outer) { - printf ("%s flunked for outer = %d, middle = %d\n", + printf ("%s flunked for outer = %Zd, middle = %Zd\n", STRINGIFY (memrchr), outer, middle); result = 1; } @@ -285,7 +285,7 @@ do_test (void) if (cp != NULL) { - printf ("%s flunked for outer = %d\n", + printf ("%s flunked for outer = %Zd\n", STRINGIFY (memrchr), outer); result = 1; } @@ -302,7 +302,7 @@ do_test (void) if (STRCPY (dest, &adr[outer]) != dest || STRLEN (dest) != (size_t) (inner - outer)) { - printf ("%s flunked for outer = %d, inner = %d\n", + printf ("%s flunked for outer = %Zd, inner = %Zd\n", STRINGIFY (STRCPY), outer, inner); result = 1; } @@ -322,14 +322,14 @@ do_test (void) if (STRCMP (adr + middle, dest + nchars - outer) <= 0) { - printf ("%s 1 flunked for outer = %d, middle = %d\n", + printf ("%s 1 flunked for outer = %Zd, middle = %Zd\n", STRINGIFY (STRCMP), outer, middle); result = 1; } if (STRCMP (dest + nchars - outer, adr + middle) >= 0) { - printf ("%s 2 flunked for outer = %d, middle = %d\n", + printf ("%s 2 flunked for outer = %Zd, middle = %Zd\n", STRINGIFY (STRCMP), outer, middle); result = 1; } @@ -348,16 +348,16 @@ do_test (void) { if (STRNCMP (adr + middle, dest + nchars - outer, inner) != 0) { - printf ("%s 1 flunked for outer = %d, middle = %d, " - "inner = %d\n", + printf ("%s 1 flunked for outer = %Zd, middle = %Zd, " + "inner = %Zd\n", STRINGIFY (STRNCMP), outer, middle, inner); result = 1; } if (STRNCMP (dest + nchars - outer, adr + middle, inner) != 0) { - printf ("%s 2 flunked for outer = %d, middle = %d, " - "inner = %d\n", + printf ("%s 2 flunked for outer = %Zd, middle = %Zd, " + "inner = %Zd\n", STRINGIFY (STRNCMP), outer, middle, inner); result = 1; } @@ -365,14 +365,14 @@ do_test (void) if (STRNCMP (adr + middle, dest + nchars - outer, outer) >= 0) { - printf ("%s 1 flunked for outer = %d, middle = %d, full\n", + printf ("%s 1 flunked for outer = %Zd, middle = %Zd, full\n", STRINGIFY (STRNCMP), outer, middle); result = 1; } if (STRNCMP (dest + nchars - outer, adr + middle, outer) <= 0) { - printf ("%s 2 flunked for outer = %d, middle = %d, full\n", + printf ("%s 2 flunked for outer = %Zd, middle = %Zd, full\n", STRINGIFY (STRNCMP), outer, middle); result = 1; } @@ -389,7 +389,7 @@ do_test (void) if (STRNCPY (dest, &adr[outer], len) != dest || MEMCMP (dest, &adr[outer], len) != 0) { - printf ("outer %s flunked for outer = %d, len = %Zd\n", + printf ("outer %s flunked for outer = %Zd, len = %Zd\n", STRINGIFY (STRNCPY), outer, len); result = 1; } @@ -413,7 +413,7 @@ do_test (void) || (inner - outer < len && STRLEN (dest) != (inner - outer))) { - printf ("%s flunked for outer = %d, inner = %d, " + printf ("%s flunked for outer = %Zd, inner = %Zd, " "len = %Zd\n", STRINGIFY (STRNCPY), outer, inner, len); result = 1; @@ -424,7 +424,7 @@ do_test (void) || (inner - outer < len && STRLEN (dest + 1) != (inner - outer))) { - printf ("%s+1 flunked for outer = %d, inner = %d, " + printf ("%s+1 flunked for outer = %Zd, inner = %Zd, " "len = %Zd\n", STRINGIFY (STRNCPY), outer, inner, len); result = 1; @@ -444,7 +444,7 @@ do_test (void) if ((STPCPY (dest, &adr[outer]) - dest) != inner - outer) { - printf ("%s flunked for outer = %d, inner = %d\n", + printf ("%s flunked for outer = %Zd, inner = %Zd\n", STRINGIFY (STPCPY), outer, inner); result = 1; } @@ -464,7 +464,7 @@ do_test (void) if (STPNCPY (dest, &adr[outer], len) != dest + len || MEMCMP (dest, &adr[outer], len) != 0) { - printf ("outer %s flunked for outer = %d, len = %Zd\n", + printf ("outer %s flunked for outer = %Zd, len = %Zd\n", STRINGIFY (STPNCPY), outer, len); result = 1; } @@ -483,8 +483,8 @@ do_test (void) if ((STPNCPY (dest, &adr[outer], inner) - dest) != MIN (inner, middle - outer)) { - printf ("%s flunked for outer = %d, middle = %d, " - "inner = %d\n", + printf ("%s flunked for outer = %Zd, middle = %Zd, " + "inner = %Zd\n", STRINGIFY (STPNCPY), outer, middle, inner); result = 1; } @@ -499,7 +499,7 @@ do_test (void) for (inner = 0; inner < nchars - outer; ++inner) if (MEMCPY (dest, &adr[outer], inner) != dest) { - printf ("%s flunked for outer = %d, inner = %d\n", + printf ("%s flunked for outer = %Zd, inner = %Zd\n", STRINGIFY (MEMCPY), outer, inner); result = 1; } @@ -509,7 +509,7 @@ do_test (void) for (inner = 0; inner < nchars - outer; ++inner) if (MEMPCPY (dest, &adr[outer], inner) != dest + inner) { - printf ("%s flunked for outer = %d, inner = %d\n", + printf ("%s flunked for outer = %Zd, inner = %Zd\n", STRINGIFY (MEMPCPY), outer, inner); result = 1; } @@ -522,7 +522,7 @@ do_test (void) for (inner = 0; inner < nchars - outer; ++inner) if (memccpy (dest, &adr[outer], L('\1'), inner) != NULL) { - printf ("memccpy flunked full copy for outer = %d, inner = %d\n", + printf ("memccpy flunked full copy for outer = %Zd, inner = %Zd\n", outer, inner); result = 1; } @@ -538,14 +538,14 @@ do_test (void) != dest + inner + 1) { printf ("\ -memccpy flunked partial copy for outer = %d, middle = %d, inner = %d\n", +memccpy flunked partial copy for outer = %Zd, middle = %Zd, inner = %Zd\n", outer, middle, inner); result = 1; } else if (dest[inner + 1] != L('\2')) { printf ("\ -memccpy copied too much for outer = %d, middle = %d, inner = %d\n", +memccpy copied too much for outer = %Zd, middle = %Zd, inner = %Zd\n", outer, middle, inner); result = 1; }