diff mbox

string/stratcliff.c: Replace int with size_t [BZ #21982]

Message ID CAMe9rOrBY3HVR1Quzcrg_Exj1VZCqX21wiwwqybeesToqZ2L9g@mail.gmail.com
State New, archived
Headers show

Commit Message

H.J. Lu Aug. 21, 2017, 11:05 p.m. UTC
On Mon, Aug 21, 2017 at 8:41 AM, Stefan Liebler <stli@linux.vnet.ibm.com> wrote:
> On 08/21/2017 04:53 PM, H.J. Lu wrote:
>>
>> On Mon, Aug 21, 2017 at 6:48 AM, Stefan Liebler <stli@linux.vnet.ibm.com>
>> wrote:
>>>
>>> On 08/20/2017 07:17 PM, H.J. Lu wrote:
>>>>
>>>>
>>>> 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;
>>>>                  }
>>>>                  {
>>>> -                 printf ("%s flunked for outer = %d, middle = %d\n",
>>>> +                 printf ("%s flunked for outer = %Zd, middle = %Zd\n",
>>>>                            STRINGIFY (rawmemchr), outer, middle);
>>>>                    result = 1;
>>>>                  }
>>>> Hi H.J. Lu,
>>>
>>>
>>>
>>> I've applied your patch and the warnings does not occur anymore on s390.
>>
>>
>> Great.
>>
>>> The outer loops of the string tests are all using the following:
>>> size_t nchars, outer;
>>> for (outer = nchars - 1; outer >= MAX (0, nchars - 128); --outer)
>>>
>>> I think we can assume, that nchars is always > 128 as it is derived by
>>> the
>>> pagesize.
>>> But if nchars would be equal to 128, this would result in an infinite
>>> loop
>>> (outer >= 0)?
>>> If nchars would be less than 128, the tests would be skipped.
>>>
>>> Should we add a check that nchars > 128 at the beginning and replace the
>>> "MAX (0, nchars - 128)" with only "nchars - 128"?
>>
>>
>> This is a separate issue beyond BZ #21982.
>>
>>
> Your patch is introducing this behaviour.
> Before your patch, nchars and outer was an int and the for-loop-condition
> "outer >= MAX (0, nchars - 128)" does not lead to an infinite loop or to
> skipping the test if nchars <= 128.
>

How about this patch?

Comments

Stefan Liebler Aug. 22, 2017, 12:07 p.m. UTC | #1
On 08/22/2017 01:05 AM, H.J. Lu wrote:
> On Mon, Aug 21, 2017 at 8:41 AM, Stefan Liebler <stli@linux.vnet.ibm.com> wrote:
>> On 08/21/2017 04:53 PM, H.J. Lu wrote:
>>>
>>> On Mon, Aug 21, 2017 at 6:48 AM, Stefan Liebler <stli@linux.vnet.ibm.com>
>>> wrote:
>>>>
>>>> On 08/20/2017 07:17 PM, H.J. Lu wrote:
>>>>>
>>>>>
>>>>> 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;
>>>>>                   }
>>>>>                   {
>>>>> -                 printf ("%s flunked for outer = %d, middle = %d\n",
>>>>> +                 printf ("%s flunked for outer = %Zd, middle = %Zd\n",
>>>>>                             STRINGIFY (rawmemchr), outer, middle);
>>>>>                     result = 1;
>>>>>                   }
>>>>> Hi H.J. Lu,
>>>>
>>>>
>>>>
>>>> I've applied your patch and the warnings does not occur anymore on s390.
>>>
>>>
>>> Great.
>>>
>>>> The outer loops of the string tests are all using the following:
>>>> size_t nchars, outer;
>>>> for (outer = nchars - 1; outer >= MAX (0, nchars - 128); --outer)
>>>>
>>>> I think we can assume, that nchars is always > 128 as it is derived by
>>>> the
>>>> pagesize.
>>>> But if nchars would be equal to 128, this would result in an infinite
>>>> loop
>>>> (outer >= 0)?
>>>> If nchars would be less than 128, the tests would be skipped.
>>>>
>>>> Should we add a check that nchars > 128 at the beginning and replace the
>>>> "MAX (0, nchars - 128)" with only "nchars - 128"?
>>>
>>>
>>> This is a separate issue beyond BZ #21982.
>>>
>>>
>> Your patch is introducing this behaviour.
>> Before your patch, nchars and outer was an int and the for-loop-condition
>> "outer >= MAX (0, nchars - 128)" does not lead to an infinite loop or to
>> skipping the test if nchars <= 128.
>>
> 
> How about this patch?
> 
This solves the cases if nchars < 128.
But if nchars == 128, then the condition of the for-loop is "size_t 
outer >= 0", which is always true.

Could we check once if nchars > 128 and exit the test with an error if 
nchars is <= 128?
Are there architectures where the page size is < 4096?
Or where wchar_t > 4byte?

Bye
Stefan
diff mbox

Patch

From 13394356ebb7497a62fa756eac4d1a237fcbd921 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Sun, 20 Aug 2017 10:11:38 -0700
Subject: [PATCH] string/stratcliff.c: Replace int with size_t [BZ #21982]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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]

	[BZ #21982]
	* string/stratcliff.c (do_test): Declare size, nchars, inner,
	middle and outer with size_t instead of int.  Repleace %d and
	%Zd with %zu in printf.  Update "MAX (0, nchars - 128)" and
	"MAX (outer, nchars - 64)" to support unsigned outer and
	nchars.
---
 string/stratcliff.c | 150 ++++++++++++++++++++++++++++------------------------
 1 file changed, 80 insertions(+), 70 deletions(-)

diff --git a/string/stratcliff.c b/string/stratcliff.c
index e28b0c5058..a1ef18a1fd 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,17 @@  do_test (void)
     }
   else
     {
-      int inner, middle, outer;
+      size_t inner, middle, outer, nchars64, max128;
+
+      if (nchars > 64)
+	nchars64 = nchars - 64;
+      else
+	nchars64 = 0;
+
+      if (nchars > 128)
+	max128 = nchars - 128;
+      else
+	max128 = 0;
 
       mprotect (adr, size, PROT_NONE);
       mprotect (adr + 2 * nchars, size, PROT_NONE);
@@ -93,15 +103,15 @@  do_test (void)
       MEMSET (adr, L('T'), nchars);
 
       /* strlen/wcslen test */
-      for (outer = nchars - 1; outer >= MAX (0, nchars - 128); --outer)
+      for (outer = nchars - 1; outer >= max128; --outer)
 	{
-	  for (inner = MAX (outer, nchars - 64); inner < nchars; ++inner)
+	  for (inner = MAX (outer, nchars64); inner < nchars; ++inner)
 	    {
 	      adr[inner] = L('\0');
 
 	      if (STRLEN (&adr[outer]) != (size_t) (inner - outer))
 		{
-		  printf ("%s flunked for outer = %d, inner = %d\n",
+		  printf ("%s flunked for outer = %zu, inner = %zu\n",
 			  STRINGIFY (STRLEN), outer, inner);
 		  result = 1;
 		}
@@ -111,16 +121,16 @@  do_test (void)
 	}
 
       /* strnlen/wcsnlen test */
-      for (outer = nchars; outer >= MAX (0, nchars - 128); --outer)
+      for (outer = nchars; outer >= max128; --outer)
 	{
-	  for (inner = MAX (outer, nchars - 64); inner < nchars; ++inner)
+	  for (inner = MAX (outer, nchars64); inner < nchars; ++inner)
 	    {
 	      adr[inner] = L('\0');
 
 	      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 = %zu, inner = %zu\n",
 			  STRINGIFY (STRNLEN), outer, inner);
 		  result = 1;
 		}
@@ -128,14 +138,14 @@  do_test (void)
 	      adr[inner] = L('T');
 	    }
 	}
-      for (outer = nchars; outer >= MAX (0, nchars - 128); --outer)
+      for (outer = nchars; outer >= max128; --outer)
 	{
-	  for (inner = MAX (outer, nchars - 64); inner <= nchars; ++inner)
+	  for (inner = MAX (outer, nchars64); inner <= nchars; ++inner)
 	    {
 	      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 = %zu, inner = %zu\n",
 			  STRINGIFY (STRNLEN), outer, inner);
 		  result = 1;
 		}
@@ -143,9 +153,9 @@  do_test (void)
 	}
 
       /* strchr/wcschr test */
-      for (outer = nchars - 1; outer >= MAX (0, nchars - 128); --outer)
+      for (outer = nchars - 1; outer >= max128; --outer)
 	{
-	  for (middle = MAX (outer, nchars - 64); middle < nchars; ++middle)
+	  for (middle = MAX (outer, nchars64); middle < nchars; ++middle)
 	    {
 	      for (inner = middle; inner < nchars; ++inner)
 		{
@@ -158,8 +168,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 = %zu, middle = %zu, "
+			      "inner = %zu\n",
 			      STRINGIFY (STRCHR), outer, middle, inner);
 		      result = 1;
 		    }
@@ -180,9 +190,9 @@  do_test (void)
 	}
 
       /* strrchr/wcsrchr test */
-      for (outer = nchars - 1; outer >= MAX (0, nchars - 128); --outer)
+      for (outer = nchars - 1; outer >= max128; --outer)
 	{
-	  for (middle = MAX (outer, nchars - 64); middle < nchars; ++middle)
+	  for (middle = MAX (outer, nchars64); middle < nchars; ++middle)
 	    {
 	      for (inner = middle; inner < nchars; ++inner)
 		{
@@ -195,8 +205,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 = %zu, middle = %zu, "
+			      "inner = %zu\n",
 			      STRINGIFY (STRRCHR), outer, middle, inner);
 		      result = 1;
 		    }
@@ -208,9 +218,9 @@  do_test (void)
 	}
 
       /* memchr test */
-      for (outer = nchars - 1; outer >= MAX (0, nchars - 128); --outer)
+      for (outer = nchars - 1; outer >= max128; --outer)
 	{
-	  for (middle = MAX (outer, nchars - 64); middle < nchars; ++middle)
+	  for (middle = MAX (outer, nchars64); middle < nchars; ++middle)
 	    {
 	      adr[middle] = L('V');
 
@@ -218,7 +228,7 @@  do_test (void)
 
 	      if (cp - &adr[outer] != middle - outer)
 		{
-		  printf ("%s flunked for outer = %d, middle = %d\n",
+		  printf ("%s flunked for outer = %zu, middle = %zu\n",
 			  STRINGIFY (MEMCHR), outer, middle);
 		  result = 1;
 		}
@@ -226,13 +236,13 @@  do_test (void)
 	      adr[middle] = L('T');
 	    }
 	}
-      for (outer = nchars; outer >= MAX (0, nchars - 128); --outer)
+      for (outer = nchars; outer >= max128; --outer)
 	{
 	  CHAR *cp = MEMCHR (&adr[outer], L('V'), nchars - outer);
 
 	  if (cp != NULL)
 	    {
-	      printf ("%s flunked for outer = %d\n",
+	      printf ("%s flunked for outer = %zu\n",
 		      STRINGIFY (MEMCHR), outer);
 	      result = 1;
 	    }
@@ -241,9 +251,9 @@  do_test (void)
       /* These functions only exist for single-byte characters.  */
 #ifndef WCSTEST
       /* rawmemchr test */
-      for (outer = nchars - 1; outer >= MAX (0, nchars - 128); --outer)
+      for (outer = nchars - 1; outer >= max128; --outer)
 	{
-	  for (middle = MAX (outer, nchars - 64); middle < nchars; ++middle)
+	  for (middle = MAX (outer, nchars64); middle < nchars; ++middle)
 	    {
 	      adr[middle] = L('V');
 
@@ -251,7 +261,7 @@  do_test (void)
 
 	      if (cp - &adr[outer] != middle - outer)
 		{
-		  printf ("%s flunked for outer = %d, middle = %d\n",
+		  printf ("%s flunked for outer = %zu, middle = %zu\n",
 			  STRINGIFY (rawmemchr), outer, middle);
 		  result = 1;
 		}
@@ -261,9 +271,9 @@  do_test (void)
 	}
 
       /* memrchr test */
-      for (outer = nchars - 1; outer >= MAX (0, nchars - 128); --outer)
+      for (outer = nchars - 1; outer >= max128; --outer)
 	{
-	  for (middle = MAX (outer, nchars - 64); middle < nchars; ++middle)
+	  for (middle = MAX (outer, nchars64); middle < nchars; ++middle)
 	    {
 	      adr[middle] = L('V');
 
@@ -271,7 +281,7 @@  do_test (void)
 
 	      if (cp - &adr[outer] != middle - outer)
 		{
-		  printf ("%s flunked for outer = %d, middle = %d\n",
+		  printf ("%s flunked for outer = %zu, middle = %zu\n",
 			  STRINGIFY (memrchr), outer, middle);
 		  result = 1;
 		}
@@ -279,13 +289,13 @@  do_test (void)
 	      adr[middle] = L('T');
 	    }
 	}
-      for (outer = nchars; outer >= MAX (0, nchars - 128); --outer)
+      for (outer = nchars; outer >= max128; --outer)
 	{
 	  CHAR *cp = memrchr (&adr[outer], L('V'), nchars - outer);
 
 	  if (cp != NULL)
 	    {
-	      printf ("%s flunked for outer = %d\n",
+	      printf ("%s flunked for outer = %zu\n",
 		      STRINGIFY (memrchr), outer);
 	      result = 1;
 	    }
@@ -293,16 +303,16 @@  do_test (void)
 #endif
 
       /* strcpy/wcscpy test */
-      for (outer = nchars - 1; outer >= MAX (0, nchars - 128); --outer)
+      for (outer = nchars - 1; outer >= max128; --outer)
 	{
-	  for (inner = MAX (outer, nchars - 64); inner < nchars; ++inner)
+	  for (inner = MAX (outer, nchars64); inner < nchars; ++inner)
 	    {
 	      adr[inner] = L('\0');
 
 	      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 = %zu, inner = %zu\n",
 			  STRINGIFY (STRCPY), outer, inner);
 		  result = 1;
 		}
@@ -322,14 +332,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 = %zu, middle = %zu\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 = %zu, middle = %zu\n",
 			STRINGIFY (STRCMP), outer, middle);
 		result = 1;
 	      }
@@ -348,16 +358,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 = %zu, middle = %zu, "
+			    "inner = %zu\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 = %zu, middle = %zu, "
+			    "inner = %zu\n",
 			    STRINGIFY (STRNCMP), outer, middle, inner);
 		    result = 1;
 		  }
@@ -365,14 +375,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 = %zu, middle = %zu, 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 = %zu, middle = %zu, full\n",
 			STRINGIFY (STRNCMP), outer, middle);
 		result = 1;
 	      }
@@ -380,7 +390,7 @@  do_test (void)
 
       /* strncpy/wcsncpy tests */
       adr[nchars - 1] = L('T');
-      for (outer = nchars; outer >= MAX (0, nchars - 128); --outer)
+      for (outer = nchars; outer >= max128; --outer)
 	{
 	  size_t len;
 
@@ -389,7 +399,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 = %zu, len = %zu\n",
 			  STRINGIFY (STRNCPY), outer, len);
 		  result = 1;
 		}
@@ -397,9 +407,9 @@  do_test (void)
 	}
       adr[nchars - 1] = L('\0');
 
-      for (outer = nchars - 1; outer >= MAX (0, nchars - 128); --outer)
+      for (outer = nchars - 1; outer >= max128; --outer)
 	{
-	  for (inner = MAX (outer, nchars - 64); inner < nchars; ++inner)
+	  for (inner = MAX (outer, nchars64); inner < nchars; ++inner)
 	    {
 	      size_t len;
 
@@ -413,8 +423,8 @@  do_test (void)
 		      || (inner - outer < len
 			  && STRLEN (dest) != (inner - outer)))
 		    {
-		      printf ("%s flunked for outer = %d, inner = %d, "
-			      "len = %Zd\n",
+		      printf ("%s flunked for outer = %zu, inner = %zu, "
+			      "len = %zu\n",
 			      STRINGIFY (STRNCPY), outer, inner, len);
 		      result = 1;
 		    }
@@ -424,8 +434,8 @@  do_test (void)
 		      || (inner - outer < len
 			  && STRLEN (dest + 1) != (inner - outer)))
 		    {
-		      printf ("%s+1 flunked for outer = %d, inner = %d, "
-			      "len = %Zd\n",
+		      printf ("%s+1 flunked for outer = %zu, inner = %zu, "
+			      "len = %zu\n",
 			      STRINGIFY (STRNCPY), outer, inner, len);
 		      result = 1;
 		    }
@@ -436,15 +446,15 @@  do_test (void)
 	}
 
       /* stpcpy/wcpcpy test */
-      for (outer = nchars - 1; outer >= MAX (0, nchars - 128); --outer)
+      for (outer = nchars - 1; outer >= max128; --outer)
 	{
-	  for (inner = MAX (outer, nchars - 64); inner < nchars; ++inner)
+	  for (inner = MAX (outer, nchars64); inner < nchars; ++inner)
 	    {
 	      adr[inner] = L('\0');
 
 	      if ((STPCPY (dest, &adr[outer]) - dest) != inner - outer)
 		{
-		  printf ("%s flunked for outer = %d, inner = %d\n",
+		  printf ("%s flunked for outer = %zu, inner = %zu\n",
 			  STRINGIFY (STPCPY), outer, inner);
 		  result = 1;
 		}
@@ -455,7 +465,7 @@  do_test (void)
 
       /* stpncpy/wcpncpy test */
       adr[nchars - 1] = L('T');
-      for (outer = nchars; outer >= MAX (0, nchars - 128); --outer)
+      for (outer = nchars; outer >= max128; --outer)
 	{
 	  size_t len;
 
@@ -464,7 +474,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 = %zu, len = %zu\n",
 			  STRINGIFY (STPNCPY), outer, len);
 		  result = 1;
 		}
@@ -472,9 +482,9 @@  do_test (void)
 	}
       adr[nchars - 1] = L('\0');
 
-      for (outer = nchars - 1; outer >= MAX (0, nchars - 128); --outer)
+      for (outer = nchars - 1; outer >= max128; --outer)
 	{
-	  for (middle = MAX (outer, nchars - 64); middle < nchars; ++middle)
+	  for (middle = MAX (outer, nchars64); middle < nchars; ++middle)
 	    {
 	      adr[middle] = L('\0');
 
@@ -483,8 +493,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 = %zu, middle = %zu, "
+			      "inner = %zu\n",
 			      STRINGIFY (STPNCPY), outer, middle, inner);
 		      result = 1;
 		    }
@@ -495,21 +505,21 @@  do_test (void)
 	}
 
       /* memcpy/wmemcpy test */
-      for (outer = nchars; outer >= MAX (0, nchars - 128); --outer)
+      for (outer = nchars; outer >= max128; --outer)
 	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 = %zu, inner = %zu\n",
 		      STRINGIFY (MEMCPY), outer, inner);
 	      result = 1;
 	    }
 
       /* mempcpy/wmempcpy test */
-      for (outer = nchars; outer >= MAX (0, nchars - 128); --outer)
+      for (outer = nchars; outer >= max128; --outer)
 	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 = %zu, inner = %zu\n",
 		      STRINGIFY (MEMPCPY), outer, inner);
 	      result = 1;
 	    }
@@ -518,15 +528,15 @@  do_test (void)
 #ifndef WCSTEST
       /* memccpy test */
       memset (adr, '\0', nchars);
-      for (outer = nchars; outer >= MAX (0, nchars - 128); --outer)
+      for (outer = nchars; outer >= max128; --outer)
 	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 = %zu, inner = %zu\n",
 		      outer, inner);
 	      result = 1;
 	    }
-      for (outer = nchars - 1; outer >= MAX (0, nchars - 128); --outer)
+      for (outer = nchars - 1; outer >= max128; --outer)
 	for (middle = 0; middle < nchars - outer; ++middle)
 	  {
 	    memset (dest, L('\2'), middle + 1);
@@ -538,14 +548,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 = %zu, middle = %zu, inner = %zu\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 = %zu, middle = %zu, inner = %zu\n",
 			    outer, middle, inner);
 		    result = 1;
 		  }
-- 
2.13.5