1 files changed, 15 insertions, 14 deletions

diff --git a/app/xfs/difs/fonts.c b/app/xfs/difs/fonts.c
index 2ba7c4276..a3fe1a211 100644
--- a/app/xfs/difs/fonts.c
+++ b/app/xfs/difs/fonts.c
@@ -1,4 +1,3 @@
-/* $Xorg: fonts.c,v 1.5 2001/02/09 02:05:42 xorgcvs Exp $ */
 /*
  * font control
  */
@@ -47,6 +46,9 @@ in this Software without prior written authorization from The Open Group.
  * THIS SOFTWARE.
  */
 /*#define DEBUG*/
+
+#include	"xfs-config.h"
+
 #include        <X11/fonts/FS.h>
 #include        <X11/fonts/FSproto.h>
 #include	<stdio.h>
@@ -71,8 +73,6 @@ static int  num_slept_fpes = 0;
 static int  size_slept_fpes = 0;
 static FontPathElementPtr *slept_fpes = (FontPathElementPtr *) 0;
 
-extern FontPatternCachePtr fontPatternCache;
-
 #define	NUM_IDS_PER_CLIENT	5
 
 int
@@ -688,6 +688,7 @@ set_font_path_elements(
 	    {
 		NoticeF("ignoring font path element %s (bad font path descriptor)\n", name);
 		fsfree(name);
+		cp += len;
 		continue;
 	    }
 	    /* must be new -- make it */
@@ -863,7 +864,7 @@ do_list_fonts_and_aliases(ClientPtr client, pointer data)
 		    cPtr->current.list_started = TRUE;
 	    }
 	    if (err == Successful) {
-		name = 0;
+		name = NULL;
 		err = (*fpe_functions[fpe->type].list_next_font_or_alias)
 		    ((pointer) cPtr->client, fpe, &name, &namelen, &resolved,
 		     &resolvedlen, cPtr->current.private);
@@ -910,7 +911,7 @@ do_list_fonts_and_aliases(ClientPtr client, pointer data)
 		    char    *tmpname;
 		    int     tmpnamelen;
 
-		    tmpname = 0;
+		    tmpname = NULL;
 		    (void) (*fpe_functions[fpe->type].list_next_font_or_alias)
 			((pointer) cPtr->client, fpe, &tmpname, &tmpnamelen,
 			 &tmpname, &tmpnamelen, cPtr->current.private);
@@ -936,7 +937,7 @@ do_list_fonts_and_aliases(ClientPtr client, pointer data)
 		cPtr->current.patlen = resolvedlen;
 		cPtr->current.max_names = cPtr->names->nnames + 1;
 		cPtr->current.current_fpe = -1;
-		cPtr->current.private = 0;
+		cPtr->current.private = NULL;
 		err = BadFontName;
 	    }
 	}
@@ -1087,10 +1088,10 @@ ListFonts(
     c->current.current_fpe = 0;
     c->current.max_names = maxNames;
     c->current.list_started = FALSE;
-    c->current.private = 0;
+    c->current.private = NULL;
     c->haveSaved = FALSE;
     c->slept = FALSE;
-    c->savedName = 0;
+    c->savedName = NULL;
     do_list_fonts_and_aliases(client, (pointer) c);
     return TRUE;
 badAlloc:
@@ -1149,7 +1150,7 @@ do_list_fonts_with_info(ClientPtr client, pointer data)
 		cPtr->current.list_started = TRUE;
 	}
 	if (err == Successful) {
-	    name = 0;
+	    name = NULL;
 	    pFontInfo = &fontInfo;
 	    err = (*fpe_functions[fpe->type].list_next_font_with_info)
 		((pointer) cPtr->client, fpe, &name, &namelen,
@@ -1182,7 +1183,7 @@ do_list_fonts_with_info(ClientPtr client, pointer data)
 		int	tmpnamelen;
 		FontInfoPtr tmpFontInfo;
 
-	    	tmpname = 0;
+		tmpname = NULL;
 	    	tmpFontInfo = &fontInfo;
 	    	(void) (*fpe_functions[fpe->type].list_next_font_with_info)
 		    ((pointer) client, fpe, &tmpname, &tmpnamelen,
@@ -1209,7 +1210,7 @@ do_list_fonts_with_info(ClientPtr client, pointer data)
 	    cPtr->current.patlen = namelen;
 	    cPtr->current.max_names = 1;
 	    cPtr->current.current_fpe = 0;
-	    cPtr->current.private = 0;
+	    cPtr->current.private = NULL;
 	    cPtr->current.list_started = FALSE;
 	}
 	/*
@@ -1368,17 +1369,17 @@ StartListFontsWithInfo(
     }
     c->client = client;
     c->num_fpes = num_fpes;
-    c->reply = 0;
+    c->reply = NULL;
     c->length = 0;
     c->current.patlen = length;
     c->current.current_fpe = 0;
     c->current.max_names = maxNames;
     c->current.list_started = FALSE;
-    c->current.private = 0;
+    c->current.private = NULL;
     c->savedNumFonts = 0;
     c->haveSaved = FALSE;
     c->slept = FALSE;
-    c->savedName = 0;
+    c->savedName = NULL;
     do_list_fonts_with_info(client, (pointer) c);
     return TRUE;
 badAlloc: