Update.

	* libio/tst-freopen.c (main): Use correct formats for __LINE__.
	* libio/tst-mmap-setvbuf.c (main): Likewise.
	* libio/tst-widetext.c (main): Likewise.

	* libio/tst-mmap-eofsync.c (do_test): Use correct format in error
	message.
	* libio/tst-mmap-fflushsync.c (do_test): Likewise.
	* libio/tst-mmap2-eofsync.c (do_test): Likewise.

20 files changed, 38 insertions, 28 deletions

diff --git a/localedata/tests-mbwc/tst_mbrlen.c b/localedata/tests-mbwc/tst_mbrlen.c
index 5b31d32149..b8681b7215 100644
--- a/localedata/tests-mbwc/tst_mbrlen.c
+++ b/localedata/tests-mbwc/tst_mbrlen.c
@@ -66,7 +66,7 @@ tst_mbrlen (FILE * fp, int debug_flg)
 
 	if (debug_flg)
 	  {
-	    fprintf (stdout, "mbrlen() [ %s : %d : %d ] ret = %d\n",
+	    fprintf (stdout, "mbrlen() [ %s : %d : %d ] ret = %zd\n",
 		     locale, rec + 1, seq_num + 1, ret);
 	    fprintf (stdout, "			   errno = %d\n", errno_save);
 	  }
diff --git a/localedata/tests-mbwc/tst_mbrtowc.c b/localedata/tests-mbwc/tst_mbrtowc.c
index 8b8c07f947..3a6070a870 100644
--- a/localedata/tests-mbwc/tst_mbrtowc.c
+++ b/localedata/tests-mbwc/tst_mbrtowc.c
@@ -68,7 +68,7 @@ tst_mbrtowc (FILE * fp, int debug_flg)
 
 	if (debug_flg)
 	  {
-	    fprintf (stdout, "mbrtowc() [ %s : %d : %d ] ret = %d\n",
+	    fprintf (stdout, "mbrtowc() [ %s : %d : %d ] ret = %zd\n",
 		     locale, rec + 1, seq_num + 1, ret);
 	    fprintf (stdout, "			    errno = %hd\n",
 		     errno_save);
diff --git a/localedata/tests-mbwc/tst_mbsrtowcs.c b/localedata/tests-mbwc/tst_mbsrtowcs.c
index f9faeee196..3f3ea716b4 100644
--- a/localedata/tests-mbwc/tst_mbsrtowcs.c
+++ b/localedata/tests-mbwc/tst_mbsrtowcs.c
@@ -63,7 +63,7 @@ tst_mbsrtowcs (FILE * fp, int debug_flg)
 
 	if (debug_flg)
 	  {
-	    fprintf (stderr, "mbsrtowcs: [ %d ] : ret = %d\n", rec + 1, ret);
+	    fprintf (stderr, "mbsrtowcs: [ %d ] : ret = %zd\n", rec + 1, ret);
 	  }
 
 	TST_IF_RETURN (S_MBSRTOWCS)
@@ -82,7 +82,8 @@ tst_mbsrtowcs (FILE * fp, int debug_flg)
 	      {
 		fprintf (stderr,
 			 "mbsrtowcs: ws[%d] => 0x%lx : 0x%lx <= ws_ex[%d]\n",
-			 i, ws[i], ws_ex[i], i);
+			 i, (unsigned long int) ws[i],
+			 (unsigned long int) ws_ex[i], i);
 	      }
 
 	    if (ws[i] != ws_ex[i])
diff --git a/localedata/tests-mbwc/tst_mbstowcs.c b/localedata/tests-mbwc/tst_mbstowcs.c
index 56928bd7dd..878df6a960 100644
--- a/localedata/tests-mbwc/tst_mbstowcs.c
+++ b/localedata/tests-mbwc/tst_mbstowcs.c
@@ -51,7 +51,7 @@ tst_mbstowcs (FILE * fp, int debug_flg)
 
 	if (debug_flg)
 	  {
-	    fprintf (stderr, "mbstowcs: ret = %d\n", ret);
+	    fprintf (stderr, "mbstowcs: ret = %zd\n", ret);
 	  }
 
 	TST_IF_RETURN (S_MBSTOWCS)
@@ -71,7 +71,8 @@ tst_mbstowcs (FILE * fp, int debug_flg)
 	      {
 		fprintf (stderr,
 			 "mbstowcs: ws[%d] => 0x%lx : 0x%lx <= ws_ex[%d]\n",
-			 i, ws[i], ws_ex[i], i);
+			 i, (unsigned long int) ws[i],
+			 (unsigned long int) ws_ex[i], i);
 	      }
 
 	    if (ws[i] != ws_ex[i])
diff --git a/localedata/tests-mbwc/tst_strfmon.c b/localedata/tests-mbwc/tst_strfmon.c
index b6c13a3a5e..88e93167df 100644
--- a/localedata/tests-mbwc/tst_strfmon.c
+++ b/localedata/tests-mbwc/tst_strfmon.c
@@ -43,7 +43,7 @@ tst_strfmon (FILE * fp, int debug_flg)
 	  fprintf (stdout, "strfmon() [ %s : %d ]\n", locale, rec + 1);
 	  fprintf (stdout, "	  : err = %d | %s\n", errno_save,
 		   strerror (errno));
-	  fprintf (stdout, "	  : ret = %d; \t fmt = |%s|\n", ret, fmt);
+	  fprintf (stdout, "	  : ret = %zd; \t fmt = |%s|\n", ret, fmt);
 	  fprintf (stdout, "	  : buf = |%s|\n\n", buf);
 	}
 
diff --git a/localedata/tests-mbwc/tst_strxfrm.c b/localedata/tests-mbwc/tst_strxfrm.c
index 0a3789399c..fdfeffc892 100644
--- a/localedata/tests-mbwc/tst_strxfrm.c
+++ b/localedata/tests-mbwc/tst_strxfrm.c
@@ -54,7 +54,7 @@ tst_strxfrm (FILE * fp, int debug_flg)
 		   rec + 1);
 	  fprintf (stdout, "	  : err = %d | %s\n", errno_save,
 		   strerror (errno));
-	  fprintf (stdout, "	  : ret = %u\n", ret);
+	  fprintf (stdout, "	  : ret = %zu\n", ret);
 	  fprintf (stdout, "	  : org = %s\n", org1);
 	}
 
@@ -77,7 +77,7 @@ tst_strxfrm (FILE * fp, int debug_flg)
 	  fprintf (stderr, "	  ..............( 2nd call )\n");
 	  fprintf (stdout, "	  : err = %d | %s\n", errno,
 		   strerror (errno));
-	  fprintf (stdout, "	  : ret = %u\n", ret);
+	  fprintf (stdout, "	  : ret = %zu\n", ret);
 	  fprintf (stdout, "	  : org = %s\n", org2);
 	}
 
diff --git a/localedata/tests-mbwc/tst_swscanf.c b/localedata/tests-mbwc/tst_swscanf.c
index 8819a0ef94..76445d75f4 100644
--- a/localedata/tests-mbwc/tst_swscanf.c
+++ b/localedata/tests-mbwc/tst_swscanf.c
@@ -60,7 +60,7 @@ tst_swscanf (FILE * fp, int debug_flg)
 	  if (TST_INPUT (swscanf).wch)
 	    {
 	      fprintf (stdout, "			val_S[ 0 ] = 0x%lx\n",
-		       val_S[0]);
+		       (unsigned long int) val_S[0]);
 	    }
 	  else
 	    {
diff --git a/localedata/tests-mbwc/tst_wcscat.c b/localedata/tests-mbwc/tst_wcscat.c
index 7012a66218..3dc98091c2 100644
--- a/localedata/tests-mbwc/tst_wcscat.c
+++ b/localedata/tests-mbwc/tst_wcscat.c
@@ -52,7 +52,7 @@ tst_wcscat (FILE * fp, int debug_flg)
 	      if (debug_flg)
 		{
 		  fprintf (stdout, "tst_wcscat() : ws1[%d] = 0x%lx\n", i,
-			   ws1[i]);
+			   (unsigned long int) ws1[i]);
 		}
 
 	      if (ws1[i] != ws_ex[i])
diff --git a/localedata/tests-mbwc/tst_wcschr.c b/localedata/tests-mbwc/tst_wcschr.c
index 118baba304..b57a05a8f9 100644
--- a/localedata/tests-mbwc/tst_wcschr.c
+++ b/localedata/tests-mbwc/tst_wcschr.c
@@ -27,7 +27,8 @@ tst_wcschr (FILE * fp, int debug_flg)
 	{
 	  if (ret)
 	    {
-	      fprintf (stderr, "wcschr: ret = 0x%lx\n", *ret);
+	      fprintf (stderr, "wcschr: ret = 0x%lx\n",
+		       (unsigned long int) *ret);
 	    }
 	  else
 	    {
diff --git a/localedata/tests-mbwc/tst_wcscpy.c b/localedata/tests-mbwc/tst_wcscpy.c
index 3dc6406a38..d5705a55dc 100644
--- a/localedata/tests-mbwc/tst_wcscpy.c
+++ b/localedata/tests-mbwc/tst_wcscpy.c
@@ -47,7 +47,8 @@ tst_wcscpy (FILE * fp, int debug_flg)
 		{
 		  fprintf (stderr,
 			   "ws1[ %d ] = 0x%lx <-> wx_ex[ %d ] = 0x%lx\n", i,
-			   ws1[i], i, ws_ex[i]);
+			   (unsigned long int) ws1[i], i,
+			   (unsigned long int) ws_ex[i]);
 		}
 
 	      if (ws1[i] != ws_ex[i])
diff --git a/localedata/tests-mbwc/tst_wcscspn.c b/localedata/tests-mbwc/tst_wcscspn.c
index 5b55ac199f..e1c8892fee 100644
--- a/localedata/tests-mbwc/tst_wcscspn.c
+++ b/localedata/tests-mbwc/tst_wcscspn.c
@@ -25,7 +25,7 @@ tst_wcscspn (FILE * fp, int debug_flg)
 
       if (debug_flg)
 	{
-	  fprintf (stderr, "wcscspn: ret = %d\n", ret);
+	  fprintf (stderr, "wcscspn: ret = %zu\n", ret);
 	}
 
       TST_IF_RETURN (S_WCSCSPN)
diff --git a/localedata/tests-mbwc/tst_wcsncat.c b/localedata/tests-mbwc/tst_wcsncat.c
index 4665f72ced..a2f6ba020b 100644
--- a/localedata/tests-mbwc/tst_wcsncat.c
+++ b/localedata/tests-mbwc/tst_wcsncat.c
@@ -48,7 +48,8 @@ tst_wcsncat (FILE * fp, int debug_flg)
 	    {
 	      if (debug_flg)
 		{
-		  fprintf (stderr, "ws1[%d] = 0x%lx\n", i, ws1[i]);
+		  fprintf (stderr, "ws1[%d] = 0x%lx\n", i,
+			   (unsigned long int) ws1[i]);
 		}
 
 	      if (ws1[i] != ws_ex[i])
diff --git a/localedata/tests-mbwc/tst_wcsncpy.c b/localedata/tests-mbwc/tst_wcsncpy.c
index f2127d4a7d..814bbc0a8b 100644
--- a/localedata/tests-mbwc/tst_wcsncpy.c
+++ b/localedata/tests-mbwc/tst_wcsncpy.c
@@ -54,7 +54,7 @@ tst_wcsncpy (FILE *fp, int debug_flg)
 	{
 	  if (debug_flg)
 	    {
-	      fprintf (stderr, "\nwcsncpy: n = %d\n\n", n);
+	      fprintf (stderr, "\nwcsncpy: n = %zu\n\n", n);
 	    }
 
 	  ws_ex = TST_EXPECT (wcsncpy).ws;
@@ -64,7 +64,8 @@ tst_wcsncpy (FILE *fp, int debug_flg)
 	      if (debug_flg)
 		fprintf (stderr,
 			 "wcsncpy: ws1[ %d ] = 0x%lx <-> wx_ex[ %d ] = 0x%lx\n",
-			 i, ws1[i], i, ws_ex[i]);
+			 i, (unsigned long int) ws1[i], i,
+			 (unsigned long int) ws_ex[i]);
 
 	      if (ws1[i] != ws_ex[i])
 		{
diff --git a/localedata/tests-mbwc/tst_wcspbrk.c b/localedata/tests-mbwc/tst_wcspbrk.c
index 405c12531e..95c1c0fa69 100644
--- a/localedata/tests-mbwc/tst_wcspbrk.c
+++ b/localedata/tests-mbwc/tst_wcspbrk.c
@@ -33,7 +33,7 @@ tst_wcspbrk (FILE * fp, int debug_flg)
 	  if (ret)
 	    fprintf (stderr,
 		     "			      ret[0] = 0x%lx : 0x%lx = ws2[0]\n",
-		     ret[0], ws2[0]);
+		     (unsigned long int) ret[0], (unsigned long int) ws2[0]);
 	}
 
       TST_IF_RETURN (S_WCSPBRK)
@@ -59,7 +59,7 @@ tst_wcspbrk (FILE * fp, int debug_flg)
 	if (debug_flg)
 	  fprintf (stdout,
 		   "			    *ret = 0x%lx <-> 0x%lx = wc_ex\n",
-		   *ret, wc_ex);
+		   (unsigned long int) *ret, (unsigned long int) wc_ex);
 
 	if (*ret != wc_ex)
 	  {
diff --git a/localedata/tests-mbwc/tst_wcsrtombs.c b/localedata/tests-mbwc/tst_wcsrtombs.c
index 02a69a0fcc..3a8edccada 100644
--- a/localedata/tests-mbwc/tst_wcsrtombs.c
+++ b/localedata/tests-mbwc/tst_wcsrtombs.c
@@ -50,7 +50,7 @@ tst_wcsrtombs (FILE * fp, int debug_flg)
 
       if (debug_flg)
 	{
-	  fprintf (stderr, "wcsrtombs: ret	= %d\n", ret);
+	  fprintf (stderr, "wcsrtombs: ret	= %zu\n", ret);
 	}
 
       TST_IF_RETURN (S_WCSRTOMBS)
diff --git a/localedata/tests-mbwc/tst_wcsspn.c b/localedata/tests-mbwc/tst_wcsspn.c
index c80b8e8c05..02157eecaa 100644
--- a/localedata/tests-mbwc/tst_wcsspn.c
+++ b/localedata/tests-mbwc/tst_wcsspn.c
@@ -25,7 +25,7 @@ tst_wcsspn (FILE *fp, int debug_flg)
 
       if (debug_flg)
 	{
-	  fprintf (stderr, "wcsspn: ret = %d\n", ret);
+	  fprintf (stderr, "wcsspn: ret = %zu\n", ret);
 	}
 
       TST_IF_RETURN (S_WCSSPN)
diff --git a/localedata/tests-mbwc/tst_wcsstr.c b/localedata/tests-mbwc/tst_wcsstr.c
index 20ebecfafc..f8b00c4b75 100644
--- a/localedata/tests-mbwc/tst_wcsstr.c
+++ b/localedata/tests-mbwc/tst_wcsstr.c
@@ -32,7 +32,7 @@ tst_wcsstr (FILE * fp, int debug_flg)
 	    {
 	      fprintf (stderr,
 		       "	ret[ 0 ] = 0x%lx <-> 0x%lx = ws2[ 0 ]\n",
-		       ret[0], ws2[0]);
+		       (unsigned long int) ret[0], (unsigned long int) ws2[0]);
 	    }
 	}
 
@@ -60,7 +60,8 @@ tst_wcsstr (FILE * fp, int debug_flg)
 	      {
 		fprintf (stderr,
 			 "	: ret[ %d ] = 0x%lx <-> 0x%lx = ws2[ %d ]\n",
-			 i, ret[i], ws2[i], i);
+			 i, (unsigned long int) ret[i],
+			 (unsigned long int) ws2[i], i);
 	      }
 
 	    if (ret[i] != ws2[i])
diff --git a/localedata/tests-mbwc/tst_wcstod.c b/localedata/tests-mbwc/tst_wcstod.c
index 5ee151bd54..1648d35397 100644
--- a/localedata/tests-mbwc/tst_wcstod.c
+++ b/localedata/tests-mbwc/tst_wcstod.c
@@ -30,7 +30,8 @@ tst_wcstod (FILE * fp, int debug_flg)
 	{
 	  fprintf (stdout, "wcstod() [ %s : %d ] ret  = %f\n", locale,
 		   rec + 1, ret);
-	  fprintf (stdout, "			  *endp = 0x%lx\n", *endp);
+	  fprintf (stdout, "			  *endp = 0x%lx\n",
+		   (unsigned long int) *endp);
 	}
 
       TST_IF_RETURN (S_WCSTOD)
diff --git a/localedata/tests-mbwc/tst_wcstok.c b/localedata/tests-mbwc/tst_wcstok.c
index 3b80a61011..1222b97855 100644
--- a/localedata/tests-mbwc/tst_wcstok.c
+++ b/localedata/tests-mbwc/tst_wcstok.c
@@ -35,11 +35,11 @@ tst_wcstok (FILE * fp, int debug_flg)
 	if (debug_flg)
 	  {
 	    fprintf (stdout, "wcstok() [ %s : %d : %d ] *ret  = 0x%lx\n",
-		     locale, rec + 1, seq_num + 1, *ret);
+		     locale, rec + 1, seq_num + 1, (unsigned long int) *ret);
 	    if (pt && *pt)
 	      {
 		fprintf (stdout, "			 *pt   = 0x%lx\n",
-			 *pt);
+			 (unsigned long int) *pt);
 	      }
 	  }
 
@@ -63,7 +63,9 @@ tst_wcstok (FILE * fp, int debug_flg)
 		  {
 		    fprintf (stderr,
 			     "			      ret[%d] = 0x%lx <-> "
-			     "0x%lx = ws_ex[%d]\n", i, ret[i], ws_ex[i], i);
+			     "0x%lx = ws_ex[%d]\n",
+			     i, (unsigned long int) ret[i],
+			     (unsigned long int) ws_ex[i], i);
 		  }
 
 		if (ret[i] != ws_ex[i])
diff --git a/localedata/tests-mbwc/tst_wcstombs.c b/localedata/tests-mbwc/tst_wcstombs.c
index 64a327dadc..c0851a4305 100644
--- a/localedata/tests-mbwc/tst_wcstombs.c
+++ b/localedata/tests-mbwc/tst_wcstombs.c
@@ -38,7 +38,7 @@ tst_wcstombs (FILE * fp, int debug_flg)
 
       if (debug_flg)
 	{
-	  fprintf (stdout, "wcstombs: ret  = %d\n", ret);
+	  fprintf (stdout, "wcstombs: ret  = %zu\n", ret);
 	}
 
       TST_IF_RETURN (S_WCSTOMBS)