head 1.3; access; symbols pkgsrc-2014Q3:1.2.0.20 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.18 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.16 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.14 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.12 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.10 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.8 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.6 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.4 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.2 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.1.0.70 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.68 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.66 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.64 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.62 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.60 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.58 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.56 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.54 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.52 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.50 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.48 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.46 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.44 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.42 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.40 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.38 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.36 pkgsrc-2008Q1:1.1.0.34 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.32 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.30 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.28 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.26 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.24 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.22 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.20 pkgsrc-2006Q2-base:1.1 pkgsrc-2006Q1:1.1.0.18 pkgsrc-2006Q1-base:1.1 pkgsrc-2005Q4:1.1.0.16 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.14 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.12 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.0.10 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.8 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.6 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.4 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.2 pkgsrc-2004Q1-base:1.1; locks; strict; comment @# @; 1.3 date 2014.11.12.15.24.16; author wiz; state dead; branches; next 1.2; commitid zd7VRuHrbVwkpUXx; 1.2 date 2012.06.13.08.15.14; author mef; state Exp; branches; next 1.1; 1.1 date 2004.02.14.22.27.30; author kristerw; state Exp; branches; next ; desc @@ 1.3 log @Remove gcc-2.95 patches. Remove patch-aa and replace with SUBST_SED in Makefile. @ text @$NetBSD: patch-af,v 1.2 2012/06/13 08:15:14 mef Exp $ Convert varargs-macros to old-style macros, to make the package compile when using gcc 2.95. --- src/xfstt.cc.orig 2012-03-21 02:23:17.000000000 +0900 +++ src/xfstt.cc 2012-06-13 11:47:32.000000000 +0900 @@@@ -436,7 +436,7 @@@@ } else mapIndex = 0; - debug("match\t\"%s\"\n", buf0 + 1); + debug1("match\t\"%s\"\n", buf0 + 1); *buf0 = buf - buf0; return *buf0 + 1; @@@@ -495,7 +495,7 @@@@ strncpy(buf, (char *)&fn, sizeof(fn)); strncpy(buf + sizeof(fn), fontName, ttfn->nameLen); buf[fn.nameLen] = 0; - debug("ListFont \"%s\"\n", buf); + debug1("ListFont \"%s\"\n", buf); return fn.nameLen + 1; } @@@@ -509,7 +509,7 @@@@ if (fid == xfs->fid) return xfs; - debug("fid = %ld not found!\n", fid); + debug1("fid = %ld not found!\n", fid); return 0; } @@@@ -529,7 +529,7 @@@@ openFont(TTFont *ttFont, FontParams *fp, Rasterizer *raster, int fid, Encoding *encoding) { - debug("point %d, pixel %d, res %d\n", + debug3("point %d, pixel %d, res %d\n", fp->point[0], fp->pixel[0], fp->resolution[0]); if (!ttFont) @@@@ -587,7 +587,7 @@@@ fp->point[3] = (fp->pixel[3] * 72 + 36) / fp->resolution[1]; } - debug("point %d, pixel %d, res %d\n", fp->point[0], fp->pixel[0], + debug3("point %d, pixel %d, res %d\n", fp->point[0], fp->pixel[0], fp->resolution[0]); // init rasterizer @@@@ -630,7 +630,7 @@@@ return 0; // parse attributes - debug("point %d, pixel %d, res %d\n", + debug3("point %d, pixel %d, res %d\n", fp->point[0], fp->pixel[0], fp->resolution[0]); int m_index = 0, p_index = 0, r_index = 0; @@@@ -769,8 +769,8 @@@@ if (!encoding) encoding = encodings[0]; - debug("\nopenXLFD(\"%s\"), %s\n", xlfdName, encoding->Name.c_str()); - debug("size %d, resx %d, resy %d\n", + debug2("\nopenXLFD(\"%s\"), %s\n", xlfdName, encoding->Name.c_str()); + debug3("size %d, resx %d, resy %d\n", fp->point[0], fp->resolution[0], fp->resolution[1]); TTFNdata* ttfn = (TTFNdata *)(infoBase + sizeof(TTFNheader)); @@@@ -1047,7 +1047,7 @@@@ conn.sd_max = conn.sd_list[n]; } - debug("connection setup (sockets = %d)\n", conn.sd_list_used); + debug1("connection setup (sockets = %d)\n", conn.sd_list_used); return 0; } @@@@ -1074,7 +1074,7 @@@@ } } - debug("accept(%d) = %d\n", conn.sd_list[n], sd); + debug2("accept(%d) = %d\n", conn.sd_list[n], sd); return sd; } @@@@ -1097,9 +1097,9 @@@@ return 0; } - debug("%s endian connection\n", + debug1("%s endian connection\n", (req->byteOrder == 'l') ? "little" : "big"); - debug("version %d.%d\n", req->major_version, req->minor_version); + debug2("version %d.%d\n", req->major_version, req->minor_version); if ((req->byteOrder == 'l' && (*(uint32_t *)req & 0xff) != 'l') || (req->byteOrder == 'B' && ((*(uint32_t *)req >> 24) & 0xff) != 'B')) @@@@ -1150,7 +1150,7 @@@@ register uint8_t *p, *end = fe->bitmaps + fe->bmplen; if ((fe->bmpFormat ^ hint) & BitmapFormatMaskByte) { - debug("slpswap SLP=%d\n", LOGSLP); + debug1("slpswap SLP=%d\n", LOGSLP); p = fe->bitmaps; switch (LOGSLP) { case 3: @@@@ -1182,7 +1182,7 @@@@ } if ((format != LOGSLP) && ((hint & BitmapFormatByteOrderMask) == 0)) { - debug("fmtswap SLP=%d -> fmt=%d\n", LOGSLP, format); + debug2("fmtswap SLP=%d -> fmt=%d\n", LOGSLP, format); p = fe->bitmaps; if (LOGSLP == 3 && format == 4) { for (; p < end; p += 2) @@@@ -1246,7 +1246,7 @@@@ int size = client.req.length << 2; if (size < expected_size) { - debug("packet size mismatch: %d received bytes, " + debug2("packet size mismatch: %d received bytes, " "%d expected bytes\n", size, expected_size); fs_client_error(client, FSBadLength); return 0; @@@@ -1277,14 +1277,14 @@@@ #ifdef DEBUG debug("===STARTREQ=========== %d\n", l); for (i = 0; i < sz_fsReq; ++i) - debug("%02X ", client.buf[i]); + debug1("%02X ", client.buf[i]); debug("\n"); sync(); #endif int size = client.req.length << 2; if (size > MAXREQSIZE) { - debug("too much data: %d bytes (max=%d)\n", + debug2("too much data: %d bytes (max=%d)\n", size, MAXREQSIZE); fs_client_error(client, FSBadLength); break; @@@@ -1298,13 +1298,13 @@@@ #ifdef DEBUG for (i = sz_fsReq; i < size; ++i) { - debug("%02X ", client.buf[i]); + debug1("%02X ", client.buf[i]); if ((i & 3) == 3) debug(" "); if ((i & 15) == (15 - sz_fsReq)) debug("\n"); } - debug("\n===ENDREQ============= %d\n", size); + debug1("\n===ENDREQ============= %d\n", size); sync(); #endif @@@@ -1382,12 +1382,12 @@@@ { fsSetEventMaskReq *req = (fsSetEventMaskReq *)client.buf; client.event_mask = req->event_mask; - debug("FS_SetEventMask %04X\n", client.event_mask); + debug1("FS_SetEventMask %04X\n", client.event_mask); } break; case FS_GetEventMask: - debug("FS_GetEventMask = %04X\n", client.event_mask); + debug1("FS_GetEventMask = %04X\n", client.event_mask); { fsGetEventMaskReply reply; reply.type = FS_Reply; @@@@ -1441,7 +1441,7 @@@@ fsResolution *res = (fsResolution *)(req + 1); - debug("FS_SetResolution * %d\n", numres); + debug1("FS_SetResolution * %d\n", numres); for (; --numres >= 0; ++res) { if (!defaultres) { fp0.resolution[0] = res->x_resolution; @@@@ -1450,7 +1450,7 @@@@ res->point_size /= 10; fp0.point[0] = fp0.point[1] = res->point_size; fp0.point[2] = fp0.point[3] = 0; - debug("xres = %d, yres = %d, size = %d\n", + debug3("xres = %d, yres = %d, size = %d\n", res->x_resolution, res->y_resolution, res->point_size / 10); } @@@@ -1489,7 +1489,7 @@@@ break; pattern[req->nbytes] = 0; - debug("FS_ListFonts \"%s\" * %ld\n", + debug2("FS_ListFonts \"%s\" * %ld\n", pattern, req->maxNames); fsListFontsReply reply; @@@@ -1523,7 +1523,7 @@@@ buf += len; ++reply.nFonts; } - debug("Found %ld fonts\n", reply.nFonts); + debug1("Found %ld fonts\n", reply.nFonts); reply.length = (sizeof(reply) + (buf - client.replybuf) + 3) >> 2; @@@@ -1562,7 +1562,7 @@@@ fsOpenBitmapFontReq *req = (fsOpenBitmapFontReq *)client.buf; char *fontName = (char *)(req + 1) + 1; fontName[*(uint8_t *)(req + 1)] = 0; - debug("FS_OpenBitmapFont \"%s\"", fontName); + debug1("FS_OpenBitmapFont \"%s\"", fontName); raster->format = (req->format_hint >> 8) & 3; if (req->format_hint & 0x0c) @@@@ -1585,7 +1585,7 @@@@ fs_client_error(client, FSBadName); debug(" not found\n"); } - debug("fhint = %04lX, fmask = %04lX, fid = %ld\n", + debug3("fhint = %04lX, fmask = %04lX, fid = %ld\n", req->format_hint, req->format_mask, req->fid); } break; @@@@ -1593,7 +1593,7 @@@@ case FS_QueryXInfo: { fsQueryXInfoReq *req = (fsQueryXInfoReq *)client.buf; - debug("FS_QueryXInfo fid = %ld\n", req->id); + debug1("FS_QueryXInfo fid = %ld\n", req->id); struct { fsQueryXInfoReply s1; @@@@ -1625,10 +1625,10 @@@@ reply.s1.font_hdr_char_range_max_char_low = (uint8_t)fi->lastChar; - debug("minchar = 0x%02X%02X, ", + debug2("minchar = 0x%02X%02X, ", reply.s1.font_hdr_char_range_min_char_high, reply.s1.font_hdr_char_range_min_char_low); - debug("maxchar = 0x%02X%02X\n", + debug2("maxchar = 0x%02X%02X\n", reply.s1.font_hdr_char_range_max_char_high, reply.s1.font_hdr_char_range_max_char_low); @@@@ -1652,11 +1652,11 @@@@ reply.s1.font_header_font_ascent = fe->yWinAscent; reply.s1.font_header_font_descent = fe->yWinDescent; - debug("FM= (asc= %d, dsc= %d, ", + debug2("FM= (asc= %d, dsc= %d, ", fe->yAscentMax, fe->yDescentMax); - debug("wasc= %d, wdsc= %d, ", + debug2("wasc= %d, wdsc= %d, ", fe->yWinAscent, fe->yWinDescent); - debug("wmin= %d, wmax= %d)\n", + debug2("wmin= %d, wmax= %d)\n", fe->xAdvanceMin, fe->xAdvanceMax); // we need to have some property data, otherwise @@@@ -1680,10 +1680,10 @@@@ { fsQueryXExtents16Req *req = (fsQueryXExtents16Req *)client.buf; - debug("FS_QueryXExtents%s fid = %ld, ", + debug2("FS_QueryXExtents%s fid = %ld, ", (req->reqType == FS_QueryXExtents8 ? "8" : "16"), req->fid); - debug("range=%d, nranges=%ld\n", + debug2("range=%d, nranges=%ld\n", req->range, req->num_ranges); int item_size = (req->reqType == FS_QueryXExtents8) @@@@ -1722,7 +1722,7 @@@@ for (; nranges > 0; nranges -= 2, ptr += 2) { ptr[0] = ntohs(ptr[0]); ptr[1] = ntohs(ptr[1]); - debug("rg %d..%d\n",ptr[0],ptr[1]); + debug2("rg %d..%d\n",ptr[0],ptr[1]); for (uint16_t j = ptr[0]; j <= ptr[1]; ++j) (ext++)->left = j; } @@@@ -1762,10 +1762,10 @@@@ } #if DEBUG & 2 - debug("GM[%3d = %3d] = ", ch, glyphNo); - debug("(l= %d, r= %d, ", + debug1("GM[%3d = %3d] = ", ch, glyphNo); + debug2("(l= %d, r= %d, ", ext->left, ext->right); - debug("w= %d, a= %d, d= %d);\n", + debug3("w= %d, a= %d, d= %d);\n", ext->width, ext->ascent, ext->descent); #endif } @@@@ -1780,9 +1780,9 @@@@ { fsQueryXBitmaps16Req *req = (fsQueryXBitmaps16Req *)client.buf; - debug("FS_QueryXBitmaps16 fid = %ld, fmt = %04lX\n", + debug2("FS_QueryXBitmaps16 fid = %ld, fmt = %04lX\n", req->fid, req->format); - debug("range=%d, nranges=%ld\n", + debug2("range=%d, nranges=%ld\n", req->range, req->num_ranges); int item_size = (req->reqType == FS_QueryXExtents8) @@@@ -1823,7 +1823,7 @@@@ for (; nranges > 0; nranges -= 2, ptr += 2) { ptr[0] = ntohs(ptr[0]); ptr[1] = ntohs(ptr[1]); - debug("rg %d..%d\n",ptr[0],ptr[1]); + debug2("rg %d..%d\n",ptr[0],ptr[1]); for (uint16_t j = ptr[0]; j <= ptr[1]; ++j) (ofs++)->position = j; } @@@@ -1868,7 +1868,7 @@@@ ofs->position = ci->tmpofs; #if DEBUG & 2 - debug("OFS[%3d = %3d] = %ld\n", + debug2("OFS[%3d = %3d] = %ld\n", ch, glyphNo, ofs->position); #endif } @@@@ -1905,7 +1905,7 @@@@ case FS_CloseFont: { fsCloseReq *req = (fsCloseReq *)client.buf; - debug("FS_CloseFont fid = %ld\n", req->id); + debug1("FS_CloseFont fid = %ld\n", req->id); XFSFont *xfs = fs_find_font(req->id, client); if (xfs) { @@@@ -1917,7 +1917,7 @@@@ break; default: - debug("Unknown FS request 0x%02X !\n", client.req.reqType); + debug1("Unknown FS request 0x%02X !\n", client.req.reqType); fs_client_error(client, FSBadRequest); break; } @ 1.2 log @(1) Bump version x11/xfstt 1.6 to 1.9 based on PR pkg/45478 (2) Some pkglint flags cleared, (comment on patches, INSTALATION_DIRS) (3) (No change) Consider dropping to support gcc-2.95 (huge patches). 1.9 (2012-05-02) Fix file descriptor leaks. Fix directory resource leaks and segfaults on opening errors. Reset the umask before creating the temporary directory. Rewrite showttf to use XCB instead of X11. 1.8 (2010-11-09) Remove the obsolete `--multi' option. Bump gettext dependency to 0.18. -- Use --previous in msgmerge to help translators. Blank unused fields of the fsError struct when sending an error. Fix segfaults on font open errors (thanks to Edward Welbourne). Handle mmap failures which might end up as segfaults otherwise. Fix crashes with fortify support when: -- Listing fonts (thanks to Erik Devriendt). -- Setting info file magic and type fields (thanks to Niall Creech). Fix segfault on fonts with unknown cmap format. Add SIGHUP handler to re-sync fonts cache. Do not hardcode any path component in the man page. Code cleanup: -- Fixed several compiler warnings. -- Constify types. -- Refactor client state into a new struct. -- Refactor font protocol error reply handling. -- Remove unused or duped includes. -- Switch more C `char *' strings to C++ strings. -- Use C++ algorithm instead of custom code. -- Always include "config.h" first. -- Use instead of our own types. Build system cleanup: -- Detect system endianness at build time. -- Enable silent rules by default if support is available. -- Do not use AM_MAINTAINER_MODE. -- Make X11 usage selectable at configure time (new `--with-x11'). -- Always build (but not install) extra tools. -- Use pkg-config to get fontsproto and x11 module flags. -- Fix `make distcheck'. 1.7 (2005-11-30) Made gettext external. Use autoreconf instead of `autogen.sh'. Changed mail address. Generate the manpage at build time, to use variable paths and version. Remove win32 obsolete code. Use new error, warning and info functions. Changed some data types names. Fix hyphen used as minus sign in manpage. Fix build failure on Irix with gcc 3.2 (thanks to Dirk Tilger). Add IPv6 support. Update FSF's address. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Convert varargs-macros to old-style macros, to make the package compile when using gcc 2.95. @ text @d3 6 a8 3 --- src/xfstt.cc.orig Thu Aug 7 08:31:47 2003 +++ src/xfstt.cc Sat Feb 14 23:04:55 2004 @@@@ -397,7 +397,7 @@@@ d17 1 a17 1 @@@@ -451,7 +451,7 @@@@ d26 1 a26 1 @@@@ -464,7 +464,7 @@@@ d33 3 a35 3 if (sd) { fsError reply; @@@@ -482,7 +482,7 @@@@ d43 2 a44 2 if (!ttFont || ttFont->badFont()) @@@@ -536,7 +536,7 @@@@ d53 1 a53 1 @@@@ -576,7 +576,7 @@@@ d62 1 a62 1 @@@@ -701,8 +701,8 @@@@ d66 1 a66 1 - debug("\nopenXLFD(\"%s\"), %s\n", xlfdName, encoding->strName); d68 1 a68 1 + debug2("\nopenXLFD(\"%s\"), %s\n", xlfdName, encoding->strName); d73 15 a87 6 @@@@ -876,7 +876,7 @@@@ sd = accept(sd_unix, (struct sockaddr *)&s_unix, &saLength); else if (!noTCP && FD_ISSET(sd_inet, &sdlist)) sd = accept(sd_inet, (struct sockaddr *)&s_inet, &saLength); - debug("accept(saLength = %d) = %d\n", saLength, sd); + debug2("accept(saLength = %d) = %d\n", saLength, sd); d91 1 a91 1 @@@@ -901,9 +901,9 @@@@ d101 3 a103 3 if ((req->byteOrder == 'l' && (*(U32 *)req & 0xff) != 'l') || (req->byteOrder == 'B' && ((*(U32 *)req >> 24) & 0xff) != 'B')) { @@@@ -955,7 +955,7 @@@@ d105 1 a105 1 register U8 *p, *end = fe->bitmaps + fe->bmplen; d112 1 a112 1 @@@@ -987,7 +987,7 @@@@ d115 1 a115 1 if ((format != LOGSLP) && (hint & BitmapFormatByteOrderMask == 0)) { d121 4 a124 4 @@@@ -1045,7 +1045,7 @@@@ check_length(int sd, int seqno, fsReq *req, int expected_size) { if (req->length < (expected_size >> 2)) { d127 2 a128 2 "%d expected bytes\n", req->length << 2, expected_size); send_fserror(sd, seqno); d130 12 a141 4 @@@@ -1080,7 +1080,7 @@@@ fsReq *fsreq = (fsReq *)buf; int length = fsreq->length << 2; if (length > MAXREQSIZE) { d144 2 a145 2 length, MAXREQSIZE); send_fserror(sd, seqno); d147 17 a163 1 @@@@ -1182,12 +1182,12 @@@@ d165 4 a168 4 fsSetEventMaskReq *req = (fsSetEventMaskReq *)buf; event_mask = req->event_mask; - debug("FS_SetEventMask %04X\n", event_mask); + debug1("FS_SetEventMask %04X\n", event_mask); d173 2 a174 2 - debug("FS_GetEventMask = %04X\n", event_mask); + debug1("FS_GetEventMask = %04X\n", event_mask); d178 1 a178 1 @@@@ -1241,7 +1241,7 @@@@ d187 1 a187 1 @@@@ -1250,7 +1250,7 @@@@ d196 1 a196 1 @@@@ -1289,7 +1289,7 @@@@ d205 1 a205 1 @@@@ -1323,7 +1323,7 @@@@ d211 1 a211 1 reply.length = (sizeof(reply) + (buf - replybuf) d214 2 a215 11 @@@@ -1358,7 +1358,7 @@@@ error.sequenceNumber = seqno; error.length = sizeof(error) >> 2; - debug(" fsError size = %u bytes, %u ints\n", + debug2(" fsError size = %u bytes, %u ints\n", sizeof(error), error.length); write(sd, (void *)&error, sizeof(error)); #endif @@@@ -1370,7 +1370,7 @@@@ fsOpenBitmapFontReq *req = (fsOpenBitmapFontReq *)buf; d217 1 a217 1 fontName[*(U8 *)(req + 1)] = 0; d223 2 a224 2 @@@@ -1399,7 +1399,7 @@@@ write(sd, (void *)&reply, sizeof(reply)); d232 1 a232 1 @@@@ -1407,7 +1407,7 @@@@ d235 1 a235 1 fsQueryXInfoReq *req = (fsQueryXInfoReq *)buf; d241 1 a241 1 @@@@ -1439,10 +1439,10 @@@@ d243 1 a243 1 = (U8)fi->lastChar; d254 1 a254 1 @@@@ -1466,11 +1466,11 @@@@ d269 1 a269 1 @@@@ -1494,10 +1494,10 @@@@ d271 1 a271 1 fsQueryXExtents16Req *req = (fsQueryXExtents16Req *)buf; d282 1 a282 1 @@@@ -1535,7 +1535,7 @@@@ d288 1 a288 1 for (U16 j = ptr[0]; j <= ptr[1]; ++j) d291 15 a305 1 @@@@ -1591,9 +1591,9 @@@@ d307 1 a307 1 fsQueryXBitmaps16Req *req = (fsQueryXBitmaps16Req *)buf; d317 1 a317 1 @@@@ -1633,7 +1633,7 @@@@ d323 1 a323 1 for (U16 j = ptr[0]; j <= ptr[1]; ++j) d326 10 a335 1 @@@@ -1713,7 +1713,7 @@@@ d338 1 a338 1 fsCloseReq *req = (fsCloseReq *)buf; d342 1 a342 1 XFSFont *xfs = findFont(req->id, sd, seqno); d344 1 a344 1 @@@@ -1725,7 +1725,7 @@@@ d348 5 a352 5 - debug("Unknown FS request 0x%02X !\n", fsreq->reqType); + debug1("Unknown FS request 0x%02X !\n", fsreq->reqType); { fsRequestError reply; reply.type = FS_Error; @