XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16

21 files changed, 54 insertions, 129 deletions

diff --git a/Xprint/Init.c b/Xprint/Init.c
index a022c31c7..c936f4542 100644
--- a/Xprint/Init.c
+++ b/Xprint/Init.c
@@ -50,7 +50,7 @@ copyright holders.
 **    *********************************************************
 ** 
 ********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/Init.c,v 1.13 2001/12/21 21:02:04 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/Init.c,v 1.15 2003/10/29 22:11:54 tsi Exp $ */
 
 #include <unistd.h>
 #include <stdlib.h>
@@ -325,11 +325,6 @@ typedef struct _driverMapping {
     int screenNum;
 } DriverMapEntry, *DriverMapPtr;
 
-static const char configFilePath[] =
-"/etc/dt/config/print:/usr/dt/config/print";
-
-static const char printServerConfigDir[] = "XPSERVERCONFIGDIR";
-
 static char *configFileName = (char *)NULL;
 static Bool freeDefaultFontPath = FALSE;
 static char *origFontPath = (char *)NULL;
@@ -1511,57 +1506,6 @@ GenericScreenInit(
 }
 
 /*
- * QualifyName - takes an unqualified file name such as X6printers and
- * a colon-separated list of directory path names such as 
- * /etc/opt/dt:/opt/dt/config.
- * 
- * Returns a fully qualified file path name such as /etc/opt/dt/X6printers.
- * The returned value is malloc'd, and the caller is responsible for 
- * freeing the associated memory.
- */
-static char *
-QualifyName(
-    char *fileName,
-    char *searchPath)
-{
-    char * curPath = searchPath;
-    char * nextPath;
-    char * chance;
-    FILE *pFile;
-
-    if (fileName == NULL || searchPath == NULL)
-      return NULL;
-
-    while (1) {
-      if ((nextPath = strchr(curPath, ':')) != NULL)
-        *nextPath = 0;
-  
-      chance = (char *)xalloc(strlen(curPath) + strlen(fileName) + 2);
-      sprintf(chance,"%s/%s",curPath,fileName);
-  
-      /* see if we can read from the file */
-      if((pFile = fopen(chance, "r")) != (FILE *)NULL)
-      {
-	fclose(pFile);
-        /* ... restore the colon, .... */
-        if (nextPath)
-	  *nextPath = ':';
-  
-        return chance;
-      }
-  
-      xfree(chance);
-
-      if (nextPath == NULL) /* End of path list? */
-        break;
-  
-      /* try the next path */
-      curPath = nextPath + 1;
-    }
-    return NULL;
-}
-
-/*
  * FillPrinterListEntry fills in a single XpDiListEntry element with data
  * derived from the supplied PrinterDbPtr element.
  *
diff --git a/Xprint/Oid.c b/Xprint/Oid.c
index ac0e54434..4c23a6e09 100644
--- a/Xprint/Oid.c
+++ b/Xprint/Oid.c
@@ -30,7 +30,7 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/Oid.c,v 1.5 2001/10/28 03:32:53 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/Oid.c,v 1.6 2003/10/29 22:11:54 tsi Exp $ */
 
 #include "attributes.h"
 
@@ -274,7 +274,7 @@ XpOidParse(const char* value_string,
      */
     if(ptr_return != (const char**)NULL)
 	*ptr_return = ptr+length;
-    return i;
+    return (XpOid)i;
 }
 
 /*
diff --git a/Xprint/ValTree.c b/Xprint/ValTree.c
index 73aa27a36..327cb468c 100644
--- a/Xprint/ValTree.c
+++ b/Xprint/ValTree.c
@@ -30,6 +30,8 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
+/* $XFree86: xc/programs/Xserver/Xprint/ValTree.c,v 1.2 2003/11/10 18:21:44 tsi Exp $ */
+
 #include    "X.h"
 #include    "scrnintstr.h"
 #include    "validate.h"
@@ -116,7 +118,7 @@ XpValidateTree (pParent, pChild, kind)
      * borderSize.
      */
     origPrntClip = pParent->clipList;
-    REGION_INIT(pScreen, &tmpPrntClip, NullBox, 0);
+    REGION_NULL(pScreen, &tmpPrntClip);
     REGION_SUBRACT(pScreen, &tmpPrntClip, &pParent->winSize,
 		   &pChild->borderSize);
     pParent->clipList = tmpPrntClip;
@@ -149,7 +151,7 @@ XpValidateTree (pParent, pChild, kind)
      * Compute pParent's AfterValidate structure by subracting the original
      * clipList from the newly computed clipList.
      */
-    REGION_INIT(pScreen, &pParent->valdata->after.exposed, NullBox, 0);
+    REGION_NULL(pScreen, &pParent->valdata->after.exposed);
     REGION_SUBTRACT(pScreen, &pParent->valdata->after.exposed, 
 		    &pParent->clipList, &origPrntClip);
 
diff --git a/Xprint/attributes.c b/Xprint/attributes.c
index 7d71760be..ec60f3032 100644
--- a/Xprint/attributes.c
+++ b/Xprint/attributes.c
@@ -44,7 +44,7 @@ copyright holders.
 **    *********************************************************
 ** 
 ********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/attributes.c,v 1.18 2002/05/31 18:45:53 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/attributes.c,v 1.20 2003/10/29 22:11:54 tsi Exp $ */
 
 #include <X11/Xproto.h>
 #include <string.h>
@@ -61,6 +61,9 @@ copyright holders.
 #include <X11/extensions/Printstr.h>
 
 #include "attributes.h"
+
+#include "Xlib.h"
+#include "Xresource.h"
 #include "Xrm.c"
 
 static XrmDatabase CopyDb(XrmDatabase inDb);
@@ -1116,9 +1119,7 @@ SendFileToCommand(
 	 */
 	if(userName)
 	{
-	    uid_t myUid;
-
-	    if((myUid = geteuid()) == (uid_t)0)
+	    if(geteuid() == (uid_t)0)
 	    {
 	        struct passwd *pPasswd;
 
@@ -1366,12 +1367,11 @@ VectorizeCommand(
     XpContextPtr pContext)
 {
     char *cmdName;
-    int numChars;
 
     if(command == (char *)NULL)
 	return (char *)NULL;
     
-    numChars = GetToken(command, &cmdName);
+    (void) GetToken(command, &cmdName);
 
     if(cmdName == (char *)NULL)
 	return (char *)NULL;
diff --git a/Xprint/ddxInit.c b/Xprint/ddxInit.c
index a96a766f8..3d29fd1b1 100644
--- a/Xprint/ddxInit.c
+++ b/Xprint/ddxInit.c
@@ -30,7 +30,7 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/ddxInit.c,v 1.14 2001/10/28 03:32:53 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/ddxInit.c,v 1.15 2003/06/23 17:35:44 eich Exp $ */
 
 #include "X.h"
 #include "Xproto.h"
@@ -39,8 +39,6 @@ copyright holders.
 #include "Xos.h"
 #include "DiPrint.h"
 
-static void Exit(int);
-
 /*-
  *-----------------------------------------------------------------------
  * InitOutput --
@@ -240,12 +238,6 @@ void ddxUseMsg(void)
 	/* Right now, let's just do nothing */
 }
 
-static void Exit (code)
-    int	code;
-{
-    exit (code);
-}
-
 void AbortDDX (void)
 {
 }
diff --git a/Xprint/pcl/Pcl.h b/Xprint/pcl/Pcl.h
index 0532e1fcc..2af1b2c41 100644
--- a/Xprint/pcl/Pcl.h
+++ b/Xprint/pcl/Pcl.h
@@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/pcl/Pcl.h,v 1.12 2001/12/21 21:02:05 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/Pcl.h,v 1.13 2003/07/16 01:38:34 dawes Exp $ */
 
 #ifndef _PCL_H_
 #define _PCL_H_
@@ -59,7 +59,7 @@ copyright holders.
 #include <X11/extensions/Print.h>
 #include <X11/extensions/Printstr.h>
 
-#include "miscstruct.h"
+#include "regionstr.h"
 #include "fontstruct.h"
 #include "dixfontstr.h"
 #include "gcstruct.h"
diff --git a/Xprint/pcl/PclColor.c b/Xprint/pcl/PclColor.c
index 807e711de..c279c8024 100644
--- a/Xprint/pcl/PclColor.c
+++ b/Xprint/pcl/PclColor.c
@@ -45,7 +45,7 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclColor.c,v 1.9 2001/10/28 03:32:54 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclColor.c,v 1.10 2003/10/29 22:11:00 tsi Exp $ */
 
 #include <stdio.h>
 #include <string.h>
@@ -396,7 +396,7 @@ PclUpdateColormap(DrawablePtr pDrawable,
     
     PclContextPrivPtr cPriv;
     PclPaletteMapPtr pMap;
-    PclCmapToContexts *pCmap, *tCmap;
+    PclCmapToContexts *pCmap;
     PclContextListPtr new;
     char t[80];
     Colormap c;
@@ -437,13 +437,8 @@ PclUpdateColormap(DrawablePtr pDrawable,
 	  sPriv = (PclScreenPrivPtr)cmap->pScreen
 	    ->devPrivates[PclScreenPrivateIndex].ptr;
 	  pCmap = sPriv->colormaps;
-	  while( pCmap )
-	    {
-		if( pCmap->colormapId == cmap->mid )
-		  break;
-		tCmap = pCmap;
+	  while( pCmap && ( pCmap->colormapId != cmap->mid ) )
 		pCmap = pCmap->next;
-	    }
 	  new = (PclContextListPtr)xalloc( sizeof( PclContextList ) );
 	  new->context = pCon;
 	  new->next = pCmap->contexts;
diff --git a/Xprint/pcl/PclFonts.c b/Xprint/pcl/PclFonts.c
index ef4554a12..f2141f9ff 100644
--- a/Xprint/pcl/PclFonts.c
+++ b/Xprint/pcl/PclFonts.c
@@ -13,6 +13,7 @@
 **    *********************************************************
 ** 
 ********************************************************************/
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclFonts.c,v 1.2 2003/07/16 01:38:34 dawes Exp $ */
 /*
 (c) Copyright 1996 Hewlett-Packard Company
 (c) Copyright 1996 International Business Machines Corp.
@@ -45,7 +46,7 @@ dealings in this Software without prior written authorization from said
 copyright holders.
 */
 
-#include "miscstruct.h"
+#include "regionstr.h"
 #include "fontstruct.h"
 #include "dixfontstr.h"
 #include "scrnintstr.h"
diff --git a/Xprint/pcl/PclMisc.c b/Xprint/pcl/PclMisc.c
index f5d36a263..5b0939df2 100644
--- a/Xprint/pcl/PclMisc.c
+++ b/Xprint/pcl/PclMisc.c
@@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclMisc.c,v 1.10 2001/12/02 13:35:28 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclMisc.c,v 1.11 2003/10/29 22:11:00 tsi Exp $ */
 
 #include <stdlib.h>
 #include <signal.h>
@@ -153,14 +153,14 @@ GetPropString(
 static void SigchldHndlr (
     int dummy)
 {
-    int   status, w;
+    int   status;
     int olderrno = errno;
     struct sigaction act;
     sigfillset(&act.sa_mask);
     act.sa_flags = 0;
     act.sa_handler = SigchldHndlr;
 
-    w = wait (&status);
+    (void) wait (&status);
 
     /*
      * Is this really necessary?
diff --git a/Xprint/pcl/PclPixel.c b/Xprint/pcl/PclPixel.c
index b9685fd1b..238a159ab 100644
--- a/Xprint/pcl/PclPixel.c
+++ b/Xprint/pcl/PclPixel.c
@@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPixel.c,v 1.6 2001/10/28 03:32:55 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPixel.c,v 1.7 2003/10/29 22:11:00 tsi Exp $ */
 
 #include <stdio.h>
 
@@ -66,9 +66,11 @@ PclPolyPoint( pDrawable, pGC, mode, nPoints, pPoints )
     int xoffset, yoffset;
     BoxRec box;
     int xloc, yloc, i;
+#if 0
     XpContextPtr pCon;
     PclContextPrivPtr cPriv;
     PclPixmapPrivPtr pPriv;
+#endif
     
     if( PclUpdateDrawableGC( pGC, pDrawable, &outFile ) == FALSE )
       return;
@@ -113,6 +115,7 @@ PclPolyPoint( pDrawable, pGC, mode, nPoints, pPoints )
 	    }
       }
     
+#if 0
     /*
      * Change the line style and width back to what they were before
      * this routine was called.  No, this isn't pretty...
@@ -121,18 +124,15 @@ PclPolyPoint( pDrawable, pGC, mode, nPoints, pPoints )
       {
 	  pCon = PclGetContextFromWindow( (WindowPtr)pDrawable );
 	  cPriv = pCon->devPrivates[PclContextPrivateIndex].ptr;
-/*
 	  cPriv->changeMask = GCLineWidth | GCLineStyle;
-*/
       }
     else
       {
 	  pPriv =
 	    ((PixmapPtr)pDrawable)->devPrivates[PclPixmapPrivateIndex].ptr;
-/*
 	  pPriv->changeMask = GCLineWidth | GCLineStyle;
-*/
       }
+#endif
     
     PclUpdateDrawableGC( pGC, pDrawable, &outFile );
 
diff --git a/Xprint/pcl/PclPrint.c b/Xprint/pcl/PclPrint.c
index f21d6c22a..aa2164c92 100644
--- a/Xprint/pcl/PclPrint.c
+++ b/Xprint/pcl/PclPrint.c
@@ -43,7 +43,7 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPrint.c,v 1.7 2001/10/28 03:32:55 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPrint.c,v 1.8 2003/10/29 22:11:00 tsi Exp $ */
 
 #include <stdio.h>
 #include <string.h>
@@ -137,7 +137,6 @@ PclEndJob(
     int retVal;
     char *fileName, *trailer;
     struct stat statBuf;
-    int n;
     PclPaletteMapPtr p;
 
     trailer = "\033%-12345X@PJL RESET\n";
@@ -199,14 +198,14 @@ PclEndJob(
      * purposes.
      */
     rewind( priv->pJobFile );
-    n = stat( priv->jobFileName, &statBuf );
+    stat( priv->jobFileName, &statBuf );
     
 #ifdef CCP_DEBUG
     unlink( "/users/prince/XpOutput" );
     xpoutput = fopen( "/users/prince/XpOutput", "w" );
     
     rewind( priv->pJobFile );
-    n = TransferBytes( priv->pJobFile, xpoutput,
+    TransferBytes( priv->pJobFile, xpoutput,
 		      (int)statBuf.st_size );
     fclose( xpoutput );
 #endif
diff --git a/Xprint/pcl/PclSFonts.c b/Xprint/pcl/PclSFonts.c
index 2f33ab857..d1ad8dc29 100644
--- a/Xprint/pcl/PclSFonts.c
+++ b/Xprint/pcl/PclSFonts.c
@@ -45,7 +45,7 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclSFonts.c,v 1.6 2001/10/28 03:32:55 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclSFonts.c,v 1.7 2003/10/29 22:11:00 tsi Exp $ */
 
 
 #include <stdio.h>
@@ -151,7 +151,7 @@ PclDestroySoftFontInfo( PclSoftFontInfoPtr pSoftFontInfo )
 PclFontHead8Ptr  pfh8,  pfh8_next;
 PclFontHead16Ptr pfh16, pfh16_next;
 PclInternalFontPtr pin, pin_next;
-unsigned char nindex_row, nindex_col;
+unsigned char nindex_row;
 int i;
 
     if ( pSoftFontInfo == (PclSoftFontInfoPtr) NULL )
@@ -169,7 +169,6 @@ int i;
     pfh16 = pSoftFontInfo->phead16;
     while (pfh16 != (PclFontHead16Ptr) NULL) {
 	xfree(pfh16->fontname);
-	nindex_col = pfh16->lastCol - pfh16->firstCol + 1;
 	nindex_row = pfh16->lastRow - pfh16->firstRow + 1;
 	for (i=0; i<nindex_row; i++)
 	    xfree(pfh16->index[i]);
diff --git a/Xprint/pcl/PclText.c b/Xprint/pcl/PclText.c
index ae5446a85..48b468427 100644
--- a/Xprint/pcl/PclText.c
+++ b/Xprint/pcl/PclText.c
@@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclText.c,v 1.10 2001/12/19 21:55:58 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclText.c,v 1.11 2003/10/29 22:11:00 tsi Exp $ */
 
 #ifdef DO_TWO_BYTE_PCL
 #include "iconv.h"
@@ -673,7 +673,7 @@ FontPropPtr props;
 FontInfoPtr pfi;
 char *fontname;
 Atom xa_pcl_font_name, xa_res, xa_ave_width, xa_spacing;
-int res, width = 1;
+int width = 1;
 int mask;
 int i;
 
@@ -723,7 +723,6 @@ int i;
 	    pin->height = (float) props->value / 10.0;
 	    mask |= 0x2;
 	} else if ( (Atom) props->name == xa_res ) {
-	    res = (int) props->value;
 	    mask |= 0x4;
 	} else if ( (Atom) props->name == xa_ave_width ) {
 	    width = (int) props->value / 10;
diff --git a/Xprint/pcl/PclWindow.c b/Xprint/pcl/PclWindow.c
index b58bd43a1..27d8ea97d 100644
--- a/Xprint/pcl/PclWindow.c
+++ b/Xprint/pcl/PclWindow.c
@@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclWindow.c,v 1.10 2001/12/19 21:55:58 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclWindow.c,v 1.11 2003/10/29 22:11:00 tsi Exp $ */
 
 
 #include <stdio.h>
@@ -208,7 +208,6 @@ PclPaintWindow(
     RegionPtr	pRegion,
     int		what)
 {
-    WindowPtr pRoot;
 	
 #define FUNCTION	0
 #define FOREGROUND	1
@@ -292,7 +291,6 @@ PclPaintWindow(
     gcmask |= GCFunction | GCClipMask;
 
     i = pScreen->myNum;
-    pRoot = WindowTable[i];
 
     pBgWin = pWin;
     if (what == PW_BORDER)
diff --git a/Xprint/ps/Ps.h b/Xprint/ps/Ps.h
index 9c65dc26f..7b0aaeb39 100644
--- a/Xprint/ps/Ps.h
+++ b/Xprint/ps/Ps.h
@@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group.
 **    *********************************************************
 ** 
 ********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/ps/Ps.h,v 1.13 2001/12/21 21:02:05 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/ps/Ps.h,v 1.14 2003/07/16 01:38:34 dawes Exp $ */
 
 #ifndef _PS_H_
 #define _PS_H_
@@ -93,7 +93,7 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/extensions/Print.h>
 #include <X11/extensions/Printstr.h>
 
-#include "miscstruct.h"
+#include "regionstr.h"
 #include "fontstruct.h"
 #include "dixfontstr.h"
 #include "gcstruct.h"
diff --git a/Xprint/ps/PsFonts.c b/Xprint/ps/PsFonts.c
index 15abc4b88..9792dae4d 100644
--- a/Xprint/ps/PsFonts.c
+++ b/Xprint/ps/PsFonts.c
@@ -57,7 +57,7 @@ in this Software without prior written authorization from The Open Group.
  * or other dealings in this Software without prior written authorization
  * from said copyright holders.
  */
-/* $XFree86: xc/programs/Xserver/Xprint/ps/PsFonts.c,v 1.6 2001/12/19 21:55:59 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/ps/PsFonts.c,v 1.7 2003/07/16 01:38:34 dawes Exp $ */
 
 /*******************************************************************
 **
@@ -75,7 +75,7 @@ in this Software without prior written authorization from The Open Group.
 ** 
 ********************************************************************/
 
-#include "miscstruct.h"
+#include "regionstr.h"
 #include "fontstruct.h"
 #include "dixfontstr.h"
 #include "scrnintstr.h"
diff --git a/Xprint/ps/PsGC.c b/Xprint/ps/PsGC.c
index c1e12f57c..1c2877231 100644
--- a/Xprint/ps/PsGC.c
+++ b/Xprint/ps/PsGC.c
@@ -57,7 +57,7 @@ in this Software without prior written authorization from The Open Group.
  * or other dealings in this Software without prior written authorization
  * from said copyright holders.
  */
-/* $XFree86: xc/programs/Xserver/Xprint/ps/PsGC.c,v 1.6 2001/12/14 19:59:15 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/ps/PsGC.c,v 1.7 2003/10/29 22:11:55 tsi Exp $ */
 
 /*******************************************************************
 **
@@ -181,7 +181,6 @@ PsUpdateDrawableGC(
   GC               dGC;
   unsigned long    valid;
   int              i;
-  PsContextPrivPtr cPriv;
   BoxPtr           boxes;
 
   if (!PsGetDrawablePrivateStuff(pDrawable, &dGC, &valid, psOut, cMap))
@@ -233,8 +232,6 @@ PsUpdateDrawableGC(
         PsOut_Offset(*psOut, pDrawable->x, pDrawable->y);
         PsOut_Clip(*psOut, pGC->clientClipType, (PsClipPtr)pGC->clientClip);
       }
-      cPriv = ( PsGetContextFromWindow( (WindowPtr)pDrawable ) )
-             ->devPrivates[PsContextPrivateIndex].ptr;
       break;
   }
   return TRUE;
diff --git a/Xprint/ps/PsInit.c b/Xprint/ps/PsInit.c
index fe2471185..193fc0518 100644
--- a/Xprint/ps/PsInit.c
+++ b/Xprint/ps/PsInit.c
@@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group.
 **    *********************************************************
 **
 ********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/ps/PsInit.c,v 1.13 2002/10/16 21:13:33 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/ps/PsInit.c,v 1.14 2003/10/29 22:11:55 tsi Exp $ */
 
 #include <stdio.h>
 #include <string.h>
@@ -108,7 +108,9 @@ InitializePsDriver(ndx, pScreen, argc, argv)
   int         argc;
   char      **argv;
 {
+#if 0
   PsScreenPrivPtr   pPriv;
+#endif
   int               nVisuals;
   int               nDepths;
   VisualPtr         visuals;
@@ -125,8 +127,10 @@ InitializePsDriver(ndx, pScreen, argc, argv)
  */
   AllocatePsPrivates(pScreen);
 
+#if 0
   pPriv = (PsScreenPrivPtr)pScreen->devPrivates[PsScreenPrivateIndex].ptr;
-/*pPriv->resDB = rmdb;*/
+  pPriv->resDB = rmdb;
+#endif
 
   pScreen->defColormap            = (Colormap) FakeClientID(0);
   pScreen->blackPixel             = 1;
diff --git a/Xprint/ps/PsText.c b/Xprint/ps/PsText.c
index 41ba592f6..b04d910d5 100644
--- a/Xprint/ps/PsText.c
+++ b/Xprint/ps/PsText.c
@@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group.
 **    *********************************************************
 ** 
 ********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/ps/PsText.c,v 1.12 2001/12/14 19:59:17 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/ps/PsText.c,v 1.13 2003/10/29 22:11:55 tsi Exp $ */
 
 #include "Ps.h"
 #include "gcstruct.h"
@@ -164,7 +164,6 @@ PsPolyText8(
 	/* If Type1 font, try to download to printer first */
 	if(strstr(ffname, "Type1") && readFontName(ffname, file_name, dlfnam)) 
 	{
-            int          iso;
             int          siz;
             float        mtx[4];
             PsOutPtr     psOut;
@@ -177,7 +176,6 @@ PsPolyText8(
             PsOut_Offset(psOut, pDrawable->x, pDrawable->y);
        	    PsOut_Color(psOut, PsGetPixelColor(cMap, pGC->fgPixel)); 
        	    siz = PsGetFontSize(pGC->font, mtx);
-       	    iso = PsIsISOLatin1Encoding(pGC->font);
        	    if( !siz ) PsOut_TextAttrsMtx(psOut, file_name, mtx, 1); 
             else PsOut_TextAttrs(psOut, file_name, siz, 1); 
        	    PsOut_Text(psOut, x, y, string, count, -1);
@@ -401,7 +399,7 @@ PsPolyGlyphBlt(
     int gWidth, gHeight;                /* width and height of glyph */
     register int nbyGlyphWidth;         /* bytes per scanline of glyph */
     int nbyPadGlyph;                    /* server padded line of glyph */
-    int w, tmpx;
+    int w;
     XID gcvals[3];
 
     pfont = pGC->font;
@@ -437,7 +435,6 @@ PsPolyGlyphBlt(
         PsDestroyPixmap(pPixmap);
         return;
     }
-    tmpx = 0;
     while(nGlyphs--)
     {
         pci = *pCharInfo++;
diff --git a/Xprint/ps/PsWindow.c b/Xprint/ps/PsWindow.c
index 87d8143aa..e39b602cb 100644
--- a/Xprint/ps/PsWindow.c
+++ b/Xprint/ps/PsWindow.c
@@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group.
 **    *********************************************************
 ** 
 ********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/ps/PsWindow.c,v 1.12 2001/12/19 21:55:59 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/ps/PsWindow.c,v 1.13 2003/10/29 22:11:55 tsi Exp $ */
 
 #include <stdio.h>
 #include <string.h>
@@ -219,7 +219,6 @@ PsPaintWindow(
   RegionPtr pRegion,
   int       what)
 {
-  WindowPtr pRoot;
 
 #define FUNCTION        0
 #define FOREGROUND      1
@@ -299,7 +298,6 @@ PsPaintWindow(
   gcmask |= GCFunction | GCClipMask;
 
   i = pScreen->myNum;
-  pRoot = WindowTable[i];
 
   pBgWin = pWin;
   if (what == PW_BORDER)
diff --git a/Xprint/raster/Raster.c b/Xprint/raster/Raster.c
index c7264c39a..d306dea21 100644
--- a/Xprint/raster/Raster.c
+++ b/Xprint/raster/Raster.c
@@ -31,7 +31,7 @@ dealings in this Software without prior written authorization from said
 copyright holders.
 */
 
-/* $XFree86: xc/programs/Xserver/Xprint/raster/Raster.c,v 1.11 2001/12/21 21:02:06 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/raster/Raster.c,v 1.12 2003/10/29 22:11:55 tsi Exp $ */
 
 /*******************************************************************
 **
@@ -1505,14 +1505,14 @@ RasterCloseScreen(
 /* ARGSUSED */
 static void SigchldHndlr (int dummy)
 {
-    int   status, w;
+    int   status;
     int   olderrno = errno;
     struct sigaction act;
     sigfillset(&act.sa_mask);
     act.sa_flags = 0;
     act.sa_handler = SigchldHndlr;
 
-    w = wait (&status);
+    (void) wait (&status);
 
     /*
      * Is this really necessary?