aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--catgets/gencat.c6
-rw-r--r--elf/dl-load.c2
-rw-r--r--elf/dl-printf.c2
-rw-r--r--elf/dl-tunables.c2
-rw-r--r--elf/rtld.c6
-rw-r--r--elf/sprof.c12
-rw-r--r--elf/tst-dlmodcount.c2
-rw-r--r--elf/tst-tls-dlinfo.c2
-rw-r--r--gmon/tst-sprofil.c2
-rw-r--r--iconv/iconv_charmap.c2
-rw-r--r--libio/tst-ext.c8
-rw-r--r--libio/tst-widetext.c10
-rw-r--r--libio/tst_swprintf.c6
-rw-r--r--libio/tst_swscanf.c4
-rw-r--r--locale/programs/ld-collate.c8
-rw-r--r--locale/programs/ld-ctype.c4
-rw-r--r--localedata/bug-iconv-trans.c4
-rw-r--r--localedata/tst-iconv-math-trans.c4
-rw-r--r--math/test-tgmath-ret.c2
-rw-r--r--nptl/tst-rwlock6.c12
-rw-r--r--nptl/tst-rwlock7.c16
-rw-r--r--posix/runptests.c2
-rw-r--r--posix/wordexp-test.c4
-rw-r--r--rt/tst-aio.c2
-rw-r--r--rt/tst-aio64.c2
-rw-r--r--string/tester.c2
-rw-r--r--string/tst-strlen.c4
-rw-r--r--time/tst-strftime.c6
-rw-r--r--wcsmbs/wcsmbs-tst1.c2
29 files changed, 70 insertions, 70 deletions
diff --git a/catgets/gencat.c b/catgets/gencat.c
index cebf1fd435..dec4d936a7 100644
--- a/catgets/gencat.c
+++ b/catgets/gencat.c
@@ -1033,7 +1033,7 @@ write_out (struct catalog *catalog, const char *output_name,
/* If the current message set has a symbolic name write this
out first. */
if (set_run->symbol != NULL)
- fprintf (fp, "%s#define %sSet %#x\t/* %s:%Zu */\n",
+ fprintf (fp, "%s#define %sSet %#x\t/* %s:%zu */\n",
first ? "" : "\n", set_run->symbol, set_run->number - 1,
set_run->fname, set_run->line);
first = 0;
@@ -1047,12 +1047,12 @@ write_out (struct catalog *catalog, const char *output_name,
if (message_run->symbol != NULL)
{
if (set_run->symbol == NULL)
- fprintf (fp, "#define AutomaticSet%d%s %#x\t/* %s:%Zu */\n",
+ fprintf (fp, "#define AutomaticSet%d%s %#x\t/* %s:%zu */\n",
set_run->number, message_run->symbol,
message_run->number, message_run->fname,
message_run->line);
else
- fprintf (fp, "#define %s%s %#x\t/* %s:%Zu */\n",
+ fprintf (fp, "#define %s%s %#x\t/* %s:%zu */\n",
set_run->symbol, message_run->symbol,
message_run->number, message_run->fname,
message_run->line);
diff --git a/elf/dl-load.c b/elf/dl-load.c
index 1ad0868dad..911db4c906 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -1406,7 +1406,7 @@ cannot enable executable stack as shared object requires");
if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_FILES))
_dl_debug_printf ("\
- dynamic: 0x%0*lx base: 0x%0*lx size: 0x%0*Zx\n\
+ dynamic: 0x%0*lx base: 0x%0*lx size: 0x%0*zx\n\
entry: 0x%0*lx phdr: 0x%0*lx phnum: %*u\n\n",
(int) sizeof (void *) * 2,
(unsigned long int) l->l_ld,
diff --git a/elf/dl-printf.c b/elf/dl-printf.c
index d3264ba96c..429d2e80c2 100644
--- a/elf/dl-printf.c
+++ b/elf/dl-printf.c
@@ -113,7 +113,7 @@ _dl_debug_vdprintf (int fd, int tag_p, const char *fmt, va_list arg)
/* Recognize the l modifier. It is only important on some
platforms where long and int have a different size. We
can use the same code for size_t. */
- if (*fmt == 'l' || *fmt == 'Z')
+ if (*fmt == 'l' || *fmt == 'z')
{
#if LONG_MAX != INT_MAX
long_mod = 1;
diff --git a/elf/dl-tunables.c b/elf/dl-tunables.c
index 8e7ee9df10..a3e399fda2 100644
--- a/elf/dl-tunables.c
+++ b/elf/dl-tunables.c
@@ -380,7 +380,7 @@ __tunables_print (void)
(long int) cur->type.max);
break;
case TUNABLE_TYPE_SIZE_T:
- _dl_printf ("0x%Zx (min: 0x%Zx, max: 0x%Zx)\n",
+ _dl_printf ("0x%zx (min: 0x%zx, max: 0x%zx)\n",
(size_t) cur->val.numval,
(size_t) cur->type.min,
(size_t) cur->type.max);
diff --git a/elf/rtld.c b/elf/rtld.c
index 3e771a93d8..3b78f40562 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -2125,11 +2125,11 @@ dl_main (const ElfW(Phdr) *phdr,
else if (strcmp (l->l_libname->name, l->l_name) == 0)
/* Print vDSO like libraries without duplicate name. Some
consumers depend of this format. */
- _dl_printf ("\t%s (0x%0*Zx)\n", l->l_libname->name,
+ _dl_printf ("\t%s (0x%0*zx)\n", l->l_libname->name,
(int) sizeof l->l_map_start * 2,
(size_t) l->l_map_start);
else
- _dl_printf ("\t%s => %s (0x%0*Zx)\n",
+ _dl_printf ("\t%s => %s (0x%0*zx)\n",
DSO_FILENAME (l->l_libname->name),
DSO_FILENAME (l->l_name),
(int) sizeof l->l_map_start * 2,
@@ -2151,7 +2151,7 @@ dl_main (const ElfW(Phdr) *phdr,
loadbase = LOOKUP_VALUE_ADDRESS (result, false);
- _dl_printf ("%s found at 0x%0*Zd in object at 0x%0*Zd\n",
+ _dl_printf ("%s found at 0x%0*zd in object at 0x%0*zd\n",
_dl_argv[i],
(int) sizeof ref->st_value * 2,
(size_t) ref->st_value,
diff --git a/elf/sprof.c b/elf/sprof.c
index 405fbcbf38..da7d817b09 100644
--- a/elf/sprof.c
+++ b/elf/sprof.c
@@ -476,7 +476,7 @@ load_shobj (const char *name)
result->kcountsize = textsize / HISTFRACTION;
result->hashfraction = HASHFRACTION;
if (do_test)
- printf ("hashfraction = %d\ndivider = %Zu\n",
+ printf ("hashfraction = %d\ndivider = %zu\n",
result->hashfraction,
result->hashfraction * sizeof (struct here_fromstruct));
result->tossize = textsize / HASHFRACTION;
@@ -495,7 +495,7 @@ load_shobj (const char *name)
* sizeof (struct here_cg_arc_record)));
if (do_test)
- printf ("expected size: %Zd\n", result->expected_size);
+ printf ("expected size: %zd\n", result->expected_size);
#define SCALE_1_TO_1 0x10000L
@@ -1357,15 +1357,15 @@ generate_call_graph (struct profdata *profdata)
? sortsym[runp->idx]->name : "<UNKNOWN>"));
if (runp->idx != (size_t) -1l)
- printf (" [%Zd]", runp->idx);
+ printf (" [%zd]", runp->idx);
putchar_unlocked ('\n');
runp = runp->next;
}
/* Info about the function itself. */
- n = printf ("[%Zu]", cnt);
- printf ("%*s%5.1f%8.2f%8.2f%9" PRIdMAX " %s [%Zd]\n",
+ n = printf ("[%zu]", cnt);
+ printf ("%*s%5.1f%8.2f%8.2f%9" PRIdMAX " %s [%zd]\n",
(int) (7 - n), " ",
total_ticks ? (100.0 * sortsym[cnt]->ticks) / total_ticks : 0,
sortsym[cnt]->ticks * tick_unit,
@@ -1384,7 +1384,7 @@ generate_call_graph (struct profdata *profdata)
runp->count);
if (runp->idx != (size_t) -1l)
- printf ("%-9" PRIdMAX " %s [%Zd]\n",
+ printf ("%-9" PRIdMAX " %s [%zd]\n",
sortsym[runp->idx]->calls,
sortsym[runp->idx]->name,
runp->idx);
diff --git a/elf/tst-dlmodcount.c b/elf/tst-dlmodcount.c
index 8a96803d85..d5f89b8f79 100644
--- a/elf/tst-dlmodcount.c
+++ b/elf/tst-dlmodcount.c
@@ -32,7 +32,7 @@ callback (struct dl_phdr_info *info, size_t size, void *ptr)
static int last_adds = 0, last_subs = 0;
intptr_t cmd = (intptr_t) ptr;
- printf (" size = %Zu\n", size);
+ printf (" size = %zu\n", size);
if (size < (offsetof (struct dl_phdr_info, dlpi_subs)
+ sizeof (info->dlpi_subs)))
{
diff --git a/elf/tst-tls-dlinfo.c b/elf/tst-tls-dlinfo.c
index 7d2b42e2ab..6d032bdc53 100644
--- a/elf/tst-tls-dlinfo.c
+++ b/elf/tst-tls-dlinfo.c
@@ -33,7 +33,7 @@ do_test (void)
result = 1;
}
else
- printf ("dlinfo says TLS module ID %Zu\n", modid);
+ printf ("dlinfo says TLS module ID %zu\n", modid);
void *block;
if (dlinfo (h, RTLD_DI_TLS_DATA, &block))
diff --git a/gmon/tst-sprofil.c b/gmon/tst-sprofil.c
index a927e737b2..de5a4e5198 100644
--- a/gmon/tst-sprofil.c
+++ b/gmon/tst-sprofil.c
@@ -161,7 +161,7 @@ main (int argc, char **argv)
for (i = 0; i < NELEMS (taddr); ++i)
for (j = 0; j < 0x10000 / sizeof (int); ++j)
if (buf[i][j] != 0)
- printf ("%0*Zx\t%u\t(buffer %d)\n",
+ printf ("%0*zx\t%u\t(buffer %d)\n",
(int) (sizeof (size_t) * 2),
(taddr[i] + ((char *) &buf[i][j] - (char *) &buf[i][0])),
buf[i][j], i);
diff --git a/iconv/iconv_charmap.c b/iconv/iconv_charmap.c
index 1992937d6e..98c7649870 100644
--- a/iconv/iconv_charmap.c
+++ b/iconv/iconv_charmap.c
@@ -440,7 +440,7 @@ process_block (struct convtable *tbl, char *addr, size_t len, FILE *output)
ignoring errors. Otherwise punt. */
if (! omit_invalid)
{
- error (0, 0, _("illegal input sequence at position %Zd"), n);
+ error (0, 0, _("illegal input sequence at position %zd"), n);
return -1;
}
diff --git a/libio/tst-ext.c b/libio/tst-ext.c
index f69fbe6f21..c987b1bafc 100644
--- a/libio/tst-ext.c
+++ b/libio/tst-ext.c
@@ -25,8 +25,8 @@ main (void)
/* Get the buffer size. */
if (__fbufsize (fp) != sizeof buf)
{
- printf ("__fbusize() reported a buffer size of %Zd bytes;"
- " we installed a buffer with %Zd bytes\n",
+ printf ("__fbusize() reported a buffer size of %zd bytes;"
+ " we installed a buffer with %zd bytes\n",
__fbufsize (fp), sizeof buf);
result = 1;
}
@@ -91,7 +91,7 @@ main (void)
/* The string we wrote above should still be in the buffer. */
if (__fpending (fp) != strlen (teststring))
{
- printf ("__fpending() returned %Zd; expected %Zd\n",
+ printf ("__fpending() returned %zd; expected %zd\n",
__fpending (fp), strlen (teststring));
result = 1;
}
@@ -100,7 +100,7 @@ main (void)
/* And check again. */
if (__fpending (fp) != 0)
{
- printf ("__fpending() returned %Zd; expected 0\n",
+ printf ("__fpending() returned %zd; expected 0\n",
__fpending (fp));
result = 1;
}
diff --git a/libio/tst-widetext.c b/libio/tst-widetext.c
index f1616bfb28..df9e965029 100644
--- a/libio/tst-widetext.c
+++ b/libio/tst-widetext.c
@@ -59,7 +59,7 @@ do_test (void)
exit (1);
}
- printf ("INFO: input file has %Zd bytes\n", mbsize);
+ printf ("INFO: input file has %zd bytes\n", mbsize);
/* First convert the text to wide characters. We use iconv here. */
{
@@ -82,7 +82,7 @@ do_test (void)
nonr = iconv (cd, &inbuf, &inleft, &outbuf, &outleft);
if (nonr != 0 && nonr != (size_t) -1)
{
- printf ("%u: iconv performed %Zd nonreversible conversions\n",
+ printf ("%u: iconv performed %zd nonreversible conversions\n",
__LINE__, nonr);
exit (1);
}
@@ -90,7 +90,7 @@ do_test (void)
if (nonr == (size_t) -1)
{
printf ("\
-%u: iconv returned with %Zd and errno = %m (inleft: %Zd, outleft: %Zd)\n",
+%u: iconv returned with %zd and errno = %m (inleft: %zd, outleft: %zd)\n",
__LINE__, nonr, inleft, outleft);
exit (1);
}
@@ -163,7 +163,7 @@ do_test (void)
wint_t wch = fgetwc (fp);
if (wch == WEOF)
{
- printf ("%u: fgetwc failed (idx %Zd): %m\n", __LINE__, n);
+ printf ("%u: fgetwc failed (idx %zd): %m\n", __LINE__, n);
exit (1);
}
wc2buf[n] = wch;
@@ -290,7 +290,7 @@ do_test (void)
{
if (fgetws (wcp, &wc2buf[wcsize] - wcp + 1, fp) == NULL)
{
- printf ("%u: short read using fgetws (only %td of %Zd)\n",
+ printf ("%u: short read using fgetws (only %td of %zd)\n",
__LINE__, wcp - wc2buf, wcsize);
status = 1;
break;
diff --git a/libio/tst_swprintf.c b/libio/tst_swprintf.c
index 8a2ffe60ec..1f997b9393 100644
--- a/libio/tst_swprintf.c
+++ b/libio/tst_swprintf.c
@@ -42,18 +42,18 @@ do_test (void)
if (tests[n].exp < 0 && res >= 0)
{
support_record_failure ();
- printf ("swprintf (buf, %Zu, L\"%%s\", \"%s\") expected to fail\n",
+ printf ("swprintf (buf, %zu, L\"%%s\", \"%s\") expected to fail\n",
tests[n].n, tests[n].str);
}
else if (tests[n].exp >= 0 && tests[n].exp != res)
{
support_record_failure ();
printf ("\
-swprintf (buf, %Zu, L\"%%s\", \"%s\") expected to return %Zd, but got %Zd\n",
+swprintf (buf, %zu, L\"%%s\", \"%s\") expected to return %zd, but got %zd\n",
tests[n].n, tests[n].str, tests[n].exp, res);
}
else
- printf ("swprintf (buf, %Zu, L\"%%s\", \"%s\") OK\n",
+ printf ("swprintf (buf, %zu, L\"%%s\", \"%s\") OK\n",
tests[n].n, tests[n].str);
}
diff --git a/libio/tst_swscanf.c b/libio/tst_swscanf.c
index 372f0fc7d3..5d3582efd1 100644
--- a/libio/tst_swscanf.c
+++ b/libio/tst_swscanf.c
@@ -20,7 +20,7 @@ main (int argc, char *argv[])
n = swscanf (in, L"%d + %d is %d", &a, &b, &c);
if (n != 3 || a + b != c || c != 42)
{
- printf ("*** FAILED, n = %Zu, a = %d, b = %d, c = %d\n", n, a, b, c);
+ printf ("*** FAILED, n = %zu, a = %d, b = %d, c = %d\n", n, a, b, c);
result = 1;
}
@@ -30,7 +30,7 @@ main (int argc, char *argv[])
if (n != 5 || strcmp (buf1, "one") != 0 || wcscmp (wbuf2, L"two") != 0
|| strcmp (buf3, "three") != 0 || c4 != '!' || wc5 != L'!')
{
- printf ("*** FAILED, n = %Zu, buf1 = \"%s\", wbuf2 = L\"%S\", buf3 = \"%s\", c4 = '%c', wc5 = L'%C'\n",
+ printf ("*** FAILED, n = %zu, buf1 = \"%s\", wbuf2 = L\"%S\", buf3 = \"%s\", c4 = '%c', wc5 = L'%C'\n",
n, buf1, wbuf2, buf3, c4, (wint_t) wc5);
result = 1;
}
diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c
index 992814491d..c790623cbc 100644
--- a/locale/programs/ld-collate.c
+++ b/locale/programs/ld-collate.c
@@ -1059,7 +1059,7 @@ insert_value (struct linereader *ldfile, const char *symstr, size_t symlen,
/* Test whether this element is not already in the list. */
if (elem->next != NULL || elem == collate->cursor)
{
- lr_error (ldfile, _("order for `%.*s' already defined at %s:%Zu"),
+ lr_error (ldfile, _("order for `%.*s' already defined at %s:%zu"),
(int) symlen, symstr, elem->file, elem->line);
lr_ignore_rest (ldfile, 0);
return 1;
@@ -1235,7 +1235,7 @@ range is not lower than that of the last character"), "LC_COLLATE");
&& elem->next == collate->cursor))
{
lr_error (ldfile, _("\
-order for `%.*s' already defined at %s:%Zu"),
+order for `%.*s' already defined at %s:%zu"),
(int) namelen, seq->name,
elem->file, elem->line);
goto increment;
@@ -1378,7 +1378,7 @@ order for `%.*s' already defined at %s:%Zu"),
&& elem->next == collate->cursor))
{
lr_error (ldfile, _("\
-%s: order for `%.*s' already defined at %s:%Zu"),
+%s: order for `%.*s' already defined at %s:%zu"),
"LC_COLLATE", (int) lenfrom, buf,
elem->file, elem->line);
continue;
@@ -3728,7 +3728,7 @@ error while adding equivalent collating symbol"));
|| &collate->undefined == collate->cursor)
{
lr_error (ldfile,
- _("%s: order for `%.*s' already defined at %s:%Zu"),
+ _("%s: order for `%.*s' already defined at %s:%zu"),
"LC_COLLATE", 9, "UNDEFINED",
collate->undefined.file,
collate->undefined.line);
diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c
index c6749dbd82..e85820d335 100644
--- a/locale/programs/ld-ctype.c
+++ b/locale/programs/ld-ctype.c
@@ -526,7 +526,7 @@ internal error in %s, line %u"), __FUNCTION__, __LINE__);
{
char buf[17];
- snprintf (buf, sizeof buf, "\\%Zo", cnt);
+ snprintf (buf, sizeof buf, "\\%zo", cnt);
record_error (0, 0, _("\
character '%s' in class `%s' must be in class `%s'"),
@@ -541,7 +541,7 @@ character '%s' in class `%s' must be in class `%s'"),
{
char buf[17];
- snprintf (buf, sizeof buf, "\\%Zo", cnt);
+ snprintf (buf, sizeof buf, "\\%zo", cnt);
record_error (0, 0, _("\
character '%s' in class `%s' must not be in class `%s'"),
diff --git a/localedata/bug-iconv-trans.c b/localedata/bug-iconv-trans.c
index 3886247c38..f1a0416547 100644
--- a/localedata/bug-iconv-trans.c
+++ b/localedata/bug-iconv-trans.c
@@ -36,7 +36,7 @@ main (void)
if (n == (size_t) -1)
printf ("iconv() returned error: %m\n");
else
- printf ("iconv() returned %Zd, expected 7\n", n);
+ printf ("iconv() returned %zd, expected 7\n", n);
result = 1;
}
if (inlen != 0)
@@ -57,7 +57,7 @@ main (void)
}
else if (outlen != sizeof (outbuf) - sizeof (expected))
{
- printf ("outlen wrong: %Zd, expected %Zd\n", outlen,
+ printf ("outlen wrong: %zd, expected %zd\n", outlen,
sizeof (outbuf) - 15);
result = 1;
}
diff --git a/localedata/tst-iconv-math-trans.c b/localedata/tst-iconv-math-trans.c
index a2d01a7e34..34c62eb772 100644
--- a/localedata/tst-iconv-math-trans.c
+++ b/localedata/tst-iconv-math-trans.c
@@ -70,7 +70,7 @@ do_test (void)
if (n == (size_t) -1)
printf ("iconv() returned error: %m\n");
else
- printf ("iconv() returned %Zd, expected 24\n", n);
+ printf ("iconv() returned %zd, expected 24\n", n);
result = 1;
}
if (inlen != 0)
@@ -91,7 +91,7 @@ do_test (void)
}
else if (outlen != sizeof (outbuf) - sizeof (expected))
{
- printf ("outlen wrong: %Zd, expected %Zd\n", outlen,
+ printf ("outlen wrong: %zd, expected %zd\n", outlen,
sizeof (outbuf) - 15);
result = 1;
}
diff --git a/math/test-tgmath-ret.c b/math/test-tgmath-ret.c
index 8c1cce37bd..dd054bef7e 100644
--- a/math/test-tgmath-ret.c
+++ b/math/test-tgmath-ret.c
@@ -83,7 +83,7 @@ do_test (void)
check_return_fromfpx ();
check_return_ufromfpx ();
- printf ("%Zd\n", sizeof (carg (lx)));
+ printf ("%zd\n", sizeof (carg (lx)));
return errors != 0;
}
diff --git a/nptl/tst-rwlock6.c b/nptl/tst-rwlock6.c
index 8294868f3b..acf36098eb 100644
--- a/nptl/tst-rwlock6.c
+++ b/nptl/tst-rwlock6.c
@@ -104,16 +104,16 @@ do_test_clock (clockid_t clockid, const char *fnname)
pthread_rwlockattr_t a;
if (pthread_rwlockattr_init (&a) != 0)
- FAIL_EXIT1 ("round %Zu: rwlockattr_t failed\n", cnt);
+ FAIL_EXIT1 ("round %zu: rwlockattr_t failed\n", cnt);