Module Name: xsrc
Committed By: rin
Date: Mon Feb 20 14:55:47 UTC 2017
Modified Files:
xsrc/external/mit/libXfont/dist/src/fc: fserve.c
xsrc/external/mit/libXt/dist/src: Convert.c ResConfig.c
xsrc/external/mit/libxkbui/dist/src: XKBui.c
xsrc/external/mit/xtrans/dist: Xtranssock.c
Log Message:
appease clang -Wformat errors with MKDEBUG=yes
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libXfont/dist/src/fc/fserve.c
cvs rdiff -u -r1.1.1.3 -r1.2 xsrc/external/mit/libXt/dist/src/Convert.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libXt/dist/src/ResConfig.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libxkbui/dist/src/XKBui.c
cvs rdiff -u -r1.1.1.9 -r1.2 xsrc/external/mit/xtrans/dist/Xtranssock.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libXfont/dist/src/fc/fserve.c
diff -u xsrc/external/mit/libXfont/dist/src/fc/fserve.c:1.4 xsrc/external/mit/libXfont/dist/src/fc/fserve.c:1.5
--- xsrc/external/mit/libXfont/dist/src/fc/fserve.c:1.4 Wed Feb 25 19:59:36 2015
+++ xsrc/external/mit/libXfont/dist/src/fc/fserve.c Mon Feb 20 14:55:47 2017
@@ -223,8 +223,8 @@ _fs_add_rep_log (FSFpePtr conn, fsGeneri
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)
@@ -915,8 +915,8 @@ fs_read_query_info(FontPathElementPtr fp
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;
}
@@ -929,8 +929,8 @@ fs_read_query_info(FontPathElementPtr fp
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;
}
@@ -1063,8 +1063,8 @@ fs_read_extent_info(FontPathElementPtr f
/ 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;
@@ -1946,8 +1946,8 @@ fs_read_glyphs(FontPathElementPtr fpe, F
{
#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;
@@ -1960,8 +1960,8 @@ fs_read_glyphs(FontPathElementPtr fpe, F
{
#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;
@@ -2567,8 +2567,8 @@ fs_read_list_info(FontPathElementPtr fpe
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;
@@ -2579,8 +2579,8 @@ fs_read_list_info(FontPathElementPtr fpe
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;
Index: xsrc/external/mit/libXt/dist/src/Convert.c
diff -u xsrc/external/mit/libXt/dist/src/Convert.c:1.1.1.3 xsrc/external/mit/libXt/dist/src/Convert.c:1.2
--- xsrc/external/mit/libXt/dist/src/Convert.c:1.1.1.3 Sun Nov 21 05:48:35 2010
+++ xsrc/external/mit/libXt/dist/src/Convert.c Mon Feb 20 14:55:47 2017
@@ -514,7 +514,7 @@ void _XtConverterCacheStats(void)
}
(void) fprintf(stdout, "Index: %4d Entries: %d\n", i, entries);
for (p = cacheHashTable[i]; p; p = p->next) {
- (void) fprintf(stdout, " Size: %3d Refs: %3d '",
+ (void) fprintf(stdout, " Size: %3d Refs: %3ld '",
p->from.size,
p->has_ext ? CEXT(p)->ref_count : 0);
(void) fprintf(stdout, "'\n");
Index: xsrc/external/mit/libXt/dist/src/ResConfig.c
diff -u xsrc/external/mit/libXt/dist/src/ResConfig.c:1.3 xsrc/external/mit/libXt/dist/src/ResConfig.c:1.4
--- xsrc/external/mit/libXt/dist/src/ResConfig.c:1.3 Wed Jun 26 13:54:36 2013
+++ xsrc/external/mit/libXt/dist/src/ResConfig.c Mon Feb 20 14:55:47 2017
@@ -903,10 +903,10 @@ _XtResourceConfigurationEH (
XtPerDisplay pd;
#ifdef DEBUG
- fprintf (stderr, "in _XtResourceConfiguationEH atom = %d\n",event->xproperty.atom);
- fprintf (stderr, " window = %x\n", XtWindow (w));
+ fprintf (stderr, "in _XtResourceConfiguationEH atom = %u\n",(unsigned) event->xproperty.atom);
+ fprintf (stderr, " window = %x\n", (unsigned) XtWindow (w));
if (XtIsWidget (w))
- fprintf (stderr, " widget = %x name = %s\n", w, w->core.name);
+ fprintf (stderr, " widget = %zx name = %s\n", (size_t)w, w->core.name);
#endif
pd = _XtGetPerDisplay (XtDisplay (w));
@@ -981,7 +981,7 @@ _XtResourceConfigurationEH (
resource = XtNewString (data_ptr);
value = XtNewString (data_value);
#ifdef DEBUG
- fprintf (stderr, "resource_len=%d\n",
+ fprintf (stderr, "resource_len=%lu\n",
resource_len);
fprintf (stderr, "resource = %s\t value = %s\n",
resource, value);
Index: xsrc/external/mit/libxkbui/dist/src/XKBui.c
diff -u xsrc/external/mit/libxkbui/dist/src/XKBui.c:1.2 xsrc/external/mit/libxkbui/dist/src/XKBui.c:1.3
--- xsrc/external/mit/libxkbui/dist/src/XKBui.c:1.2 Thu Aug 11 22:13:37 2011
+++ xsrc/external/mit/libxkbui/dist/src/XKBui.c Mon Feb 20 14:55:47 2017
@@ -96,7 +96,7 @@ XkbDescPtr xkb;
if (XAllocNamedColor(view->dpy,view->opts.cmap,spec,&sdef,&xdef)) {
xkb->geom->colors[i].pixel= sdef.pixel;
#ifdef DEBUG
- fprintf(stderr,"got pixel %d for \"%s\"\n",sdef.pixel,spec);
+ fprintf(stderr,"got pixel %lu for \"%s\"\n",sdef.pixel,spec);
#endif
found= True;
}
@@ -108,7 +108,7 @@ XkbDescPtr xkb;
if (XAllocNamedColor(view->dpy,view->opts.cmap,buf,&sdef,&xdef)) {
xkb->geom->colors[i].pixel= sdef.pixel;
#ifdef DEBUG
- fprintf(stderr,"got pixel %d for \"%s\"\n",sdef.pixel,spec);
+ fprintf(stderr,"got pixel %lu for \"%s\"\n",sdef.pixel,spec);
#endif
found= True;
}
Index: xsrc/external/mit/xtrans/dist/Xtranssock.c
diff -u xsrc/external/mit/xtrans/dist/Xtranssock.c:1.1.1.9 xsrc/external/mit/xtrans/dist/Xtranssock.c:1.2
--- xsrc/external/mit/xtrans/dist/Xtranssock.c:1.1.1.9 Thu Feb 19 20:48:18 2015
+++ xsrc/external/mit/xtrans/dist/Xtranssock.c Mon Feb 20 14:55:47 2017
@@ -1654,7 +1654,7 @@ TRANS(SocketINETConnect) (XtransConnInfo
tmpaddr = INADDR_NONE;
}
- prmsg (4,"SocketINETConnect() inet_addr(%s) = %x\n", host, tmpaddr);
+ prmsg (4,"SocketINETConnect() inet_addr(%s) = %lx\n", host, tmpaddr);
if (tmpaddr == INADDR_NONE) {
if ((hostp = _XGethostbyname(host,hparams)) == NULL) {
