summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRin Okuyama <rin@NetBSD.org>2017-02-21 06:18:37 +0000
committerAlan Coopersmith <alan.coopersmith@oracle.com>2018-03-24 18:21:15 -0700
commit099ed6fa9f293d283163b138830d43bbd47c5df1 (patch)
tree2519052826c0ac2edb27fe282d8943b938522836
parentcdb2f990348c3bd1407022f7e0e5fcba552d539f (diff)
avoid -Wformat errors from clang when building with -DDEBUG
https://bugs.freedesktop.org/show_bug.cgi?id=99882 Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--src/fc/fserve.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/fc/fserve.c b/src/fc/fserve.c
index 708fc35..acea577 100644
--- a/src/fc/fserve.c
+++ b/src/fc/fserve.c
@@ -223,8 +223,8 @@ _fs_add_rep_log (FSFpePtr conn, fsGenericReply *rep)
fprintf (stderr, "Error: %d Request: %s\n", \
((fsError *)rep)->request, #name); \
else \
- fprintf (stderr, "Bad Length for %s Reply: %d %s %d\n", \
- #name, rep->length, op, LENGTHOF(name)); \
+ fprintf (stderr, "Bad Length for %s Reply: %u %s %d\n", \
+ #name, (unsigned) rep->length, op, LENGTHOF(name));\
} \
} while (0)
@@ -933,8 +933,8 @@ fs_read_query_info(FontPathElementPtr fpe, FSBlockDataPtr blockrec)
ret = -1;
#ifdef DEBUG
fprintf(stderr,
- "fsQueryXInfo: bufleft (%ld) / SIZEOF(fsPropOffset) < %d\n",
- bufleft, pi->num_offsets);
+ "fsQueryXInfo: bufleft (%ld) / SIZEOF(fsPropOffset) < %u\n",
+ bufleft, (unsigned) pi->num_offsets);
#endif
goto bail;
}
@@ -947,8 +947,8 @@ fs_read_query_info(FontPathElementPtr fpe, FSBlockDataPtr blockrec)
ret = -1;
#ifdef DEBUG
fprintf(stderr,
- "fsQueryXInfo: bufleft (%ld) < data_len (%d)\n",
- bufleft, pi->data_len);
+ "fsQueryXInfo: bufleft (%ld) < data_len (%u)\n",
+ bufleft, (unsigned) pi->data_len);
#endif
goto bail;
}
@@ -1081,8 +1081,8 @@ fs_read_extent_info(FontPathElementPtr fpe, FSBlockDataPtr blockrec)
/ LENGTHOF(fsXCharInfo))) {
#ifdef DEBUG
fprintf(stderr,
- "fsQueryXExtents16: numExtents (%d) > (%d - %d) / %d\n",
- numExtents, rep->length,
+ "fsQueryXExtents16: numExtents (%d) > (%u - %d) / %d\n",
+ numExtents, (unsigned) rep->length,
LENGTHOF(fsQueryXExtents16Reply), LENGTHOF(fsXCharInfo));
#endif
pCI = NULL;
@@ -1957,8 +1957,8 @@ fs_read_glyphs(FontPathElementPtr fpe, FSBlockDataPtr blockrec)
{
#ifdef DEBUG
fprintf(stderr,
- "fsQueryXBitmaps16: num_chars (%d) > bufleft (%ld) / %d\n",
- rep->num_chars, bufleft, SIZEOF (fsOffset32));
+ "fsQueryXBitmaps16: num_chars (%u) > bufleft (%ld) / %d\n",
+ (unsigned) rep->num_chars, bufleft, SIZEOF (fsOffset32));
#endif
err = AllocError;
goto bail;
@@ -1971,8 +1971,8 @@ fs_read_glyphs(FontPathElementPtr fpe, FSBlockDataPtr blockrec)
{
#ifdef DEBUG
fprintf(stderr,
- "fsQueryXBitmaps16: nbytes (%d) > bufleft (%ld)\n",
- rep->nbytes, bufleft);
+ "fsQueryXBitmaps16: nbytes (%u) > bufleft (%ld)\n",
+ (unsigned) rep->nbytes, bufleft);
#endif
err = AllocError;
goto bail;
@@ -2573,8 +2573,8 @@ fs_read_list_info(FontPathElementPtr fpe, FSBlockDataPtr blockrec)
if (pi->num_offsets > (bufleft / SIZEOF (fsPropOffset))) {
#ifdef DEBUG
fprintf(stderr,
- "fsListFontsWithXInfo: offset length (%d * %d) > bufleft (%ld)\n",
- pi->num_offsets, (int) SIZEOF (fsPropOffset), bufleft);
+ "fsListFontsWithXInfo: offset length (%u * %d) > bufleft (%ld)\n",
+ (unsigned) pi->num_offsets, (int) SIZEOF (fsPropOffset), bufleft);
#endif
err = AllocError;
goto done;
@@ -2585,8 +2585,8 @@ fs_read_list_info(FontPathElementPtr fpe, FSBlockDataPtr blockrec)
if (pi->data_len > bufleft) {
#ifdef DEBUG
fprintf(stderr,
- "fsListFontsWithXInfo: data length (%d) > bufleft (%ld)\n",
- pi->data_len, bufleft);
+ "fsListFontsWithXInfo: data length (%u) > bufleft (%ld)\n",
+ (unsigned) pi->data_len, bufleft);
#endif
err = AllocError;
goto done;