xserver: Branch 'master'

[Greg Kroah-Hartman]

 Xprint/ps/PsFonts.c |    4 +---
 1 files changed, 1 insertion(+), 3 deletions(-)

New commits:
diff-tree cf6169f9e99e6e8ab264f284cfa13cb379b36207 (from 1abc7f96edf37a1e2c766b9cdba7fc9b2cb06d19)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Thu Jun 8 11:09:56 2006 -0700

    fix compiler warnings in Xprint/ps/PsFonts.c

diff --git a/Xprint/ps/PsFonts.c b/Xprint/ps/PsFonts.c
index 515a318..c4d5b03 100644
--- a/Xprint/ps/PsFonts.c
+++ b/Xprint/ps/PsFonts.c
@@ -286,9 +286,8 @@ char *getFontFilename(FontPtr pFont)
   const char        *dlfnam;
   FILE              *file;
   struct stat        statb;
-  int                count, i, status;
   char               buf[512];
-  char              *front, *end, *fn;
+  char              *front, *fn;
   char               font_dir_fname[PATH_MAX],  /* Full path of fonts.dir */
                      font_file_fname[PATH_MAX]; /* Name of font file (excluding path) */
 
@@ -592,7 +591,6 @@ PsFontTypeInfoRec *PsCreateFontTypeInfoR
 {
   char              *dlfnam;
   PsFontTypeInfoRec *rec;
-  char              *psname;
   
   if (!(dlfnam = PsGetFontName(pFont)))
     return NULL;