diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-10-10 10:12:50 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-10-10 10:12:50 +0000 |
| commit | b1f67da8b1b0cc93ea54a5c4ae89e6e835657729 (patch) | |
| tree | 58a5112492c1b23d03a7bf341d52de37330c9883 /app/xfs/difs/fontinfo.c | |
| parent | ffd564eb05c09caff0dba3c4eb783739645a440e (diff) | |
update to xfs 1.1.0.
Diffstat (limited to 'app/xfs/difs/fontinfo.c')
| -rw-r--r-- | app/xfs/difs/fontinfo.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/app/xfs/difs/fontinfo.c b/app/xfs/difs/fontinfo.c index a5615d439..52080899a 100644 --- a/app/xfs/difs/fontinfo.c +++ b/app/xfs/difs/fontinfo.c @@ -1,4 +1,3 @@ -/* $Xorg: fontinfo.c,v 1.4 2001/02/09 02:05:42 xorgcvs Exp $ */ /* * font data query */ @@ -46,9 +45,8 @@ in this Software without prior written authorization from The Open Group. * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/difs/fontinfo.c,v 1.10 2001/12/14 20:01:34 dawes Exp $ */ -#include <xfs-config.h> +#include "xfs-config.h" #include <X11/fonts/FS.h> #include <X11/fonts/FSproto.h> @@ -290,7 +288,7 @@ do_query_extents(ClientPtr client, pointer data) pPtr->flags, pPtr->nranges, pPtr->range, &num_extents, &extents); if (err == Suspended) { if (!pPtr->slept) { - pPtr->pfont->unload_glyphs = 0; /* Not a safe call for this font */ + pPtr->pfont->unload_glyphs = NULL; /* Not a safe call for this font */ pPtr->slept = TRUE; ClientSleep(client, do_query_extents, (pointer) pPtr); } @@ -340,7 +338,7 @@ QueryExtents( &nranges, &all_glyphs, &cfp->font->info); if (!fixed_range && !all_glyphs) { - SendErrToClient(client, FSBadRange, 0); + SendErrToClient(client, FSBadRange, NULL); return FSBadRange; } c = (QEclosurePtr) fsalloc(sizeof(QEclosureRec)); @@ -378,7 +376,7 @@ do_query_bitmaps(ClientPtr client, pointer data) if (err == Suspended) { if (!pPtr->slept) { - pPtr->pfont->unload_glyphs = 0; /* Not a safe call for this font */ + pPtr->pfont->unload_glyphs = NULL; /* Not a safe call for this font */ pPtr->slept = TRUE; ClientSleep(client, do_query_bitmaps, (pointer) pPtr); } @@ -436,7 +434,7 @@ QueryBitmaps( &nranges, &all_glyphs, &cfp->font->info); if (!fixed_range && !all_glyphs) { - SendErrToClient(client, FSBadRange, 0); + SendErrToClient(client, FSBadRange, NULL); return FSBadRange; } c = (QBclosurePtr) fsalloc(sizeof(QBclosureRec)); |