1 files changed, 35 insertions, 45 deletions

diff --git a/Xprint/pcl/PclPrint.c b/Xprint/pcl/PclPrint.c
index 2bfd92d15..f21d6c22a 100644
--- a/Xprint/pcl/PclPrint.c
+++ b/Xprint/pcl/PclPrint.c
@@ -43,6 +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 $ */
 
 #include <stdio.h>
 #include <string.h>
@@ -63,20 +64,14 @@ copyright holders.
 #include "AttrValid.h"
 #include "Oid.h"
 
-extern PclSoftFontInfoPtr PclCreateSoftFontInfo();
-extern void PclDestroySoftFontInfo(PclSoftFontInfoPtr);
-
 int
-PclStartJob( pCon, sendClientData, client )
-     XpContextPtr pCon;
-     Bool sendClientData;
-     ClientPtr client;
-     
+PclStartJob(
+     XpContextPtr pCon,
+     Bool sendClientData,
+     ClientPtr client)
 {
     PclContextPrivPtr pConPriv = 
       (PclContextPrivPtr)pCon->devPrivates[PclContextPrivateIndex].ptr;
-    char *jobHeader;
-    char s[40];
     PclPaletteMap *pal;
     
     /*
@@ -128,9 +123,9 @@ PclStartJob( pCon, sendClientData, client )
 }
 
 int
-PclEndJob( pCon, cancel )
-     XpContextPtr pCon;
-     Bool cancel;
+PclEndJob(
+     XpContextPtr pCon,
+     Bool cancel)
 {
     PclContextPrivPtr priv = (PclContextPrivPtr)
       pCon->devPrivates[PclContextPrivateIndex].ptr;
@@ -143,7 +138,7 @@ PclEndJob( pCon, cancel )
     char *fileName, *trailer;
     struct stat statBuf;
     int n;
-    PclPaletteMapPtr p, t;
+    PclPaletteMapPtr p;
 
     trailer = "\033%-12345X@PJL RESET\n";
 
@@ -152,7 +147,7 @@ PclEndJob( pCon, cancel )
 	  if( priv->getDocClient != (ClientPtr)NULL ) {
 	      XpFinishDocData( priv->getDocClient );
 
-	      priv->getDocClient == NULL;
+	      priv->getDocClient = NULL;
 	      priv->getDocBufSize = 0;
 	  }
 
@@ -183,7 +178,7 @@ PclEndJob( pCon, cancel )
 	  if( priv->getDocClient != (ClientPtr)NULL ) {
 	      XpFinishDocData( priv->getDocClient );
 
-	      priv->getDocClient == NULL;
+	      priv->getDocClient = NULL;
 	      priv->getDocBufSize = 0;
 	  }
 
@@ -249,11 +244,10 @@ PclEndJob( pCon, cancel )
  * ClearArea the window and all descendant windows
  */
 int
-PclStartPage( pCon, pWin )
-     XpContextPtr pCon;
-     WindowPtr pWin;
+PclStartPage(
+     XpContextPtr pCon,
+     WindowPtr pWin)
 {
-    register WindowPtr pChild;
     PclContextPrivPtr pConPriv = (PclContextPrivPtr)
       pCon->devPrivates[PclContextPrivateIndex].ptr;
     PclWindowPrivPtr pWinPriv =
@@ -261,9 +255,7 @@ PclStartPage( pCon, pWin )
     xRectangle repro;
     char t[80];
     XpOid orient, plex, tray, medium;
-    unsigned short wid, ht;
     int dir, plexNum, num;
-    xEvent event;
     
     /*
      * Put a pointer to the context in the window private structure
@@ -490,14 +482,12 @@ SendDocData( PclContextPrivPtr pPriv )
  * Write page file to job file
  */
 int
-PclEndPage( pCon, pWin )
-     XpContextPtr pCon;
-     WindowPtr pWin;
+PclEndPage(
+     XpContextPtr pCon,
+     WindowPtr pWin)
 {
     PclContextPrivPtr pConPriv = (PclContextPrivPtr)
       pCon->devPrivates[PclContextPrivateIndex].ptr;
-    PclWindowPrivPtr    pWinPriv =
-      (PclWindowPrivPtr)pWin->devPrivates[PclWindowPrivateIndex].ptr;
 
     struct stat statBuf;
 
@@ -566,9 +556,9 @@ PclStartDoc(XpContextPtr pCon,
 }
 
 int
-PclEndDoc( pCon, cancel )
-     XpContextPtr pCon;
-     Bool cancel;
+PclEndDoc(
+     XpContextPtr pCon,
+     Bool cancel)
 {
     /*
      * XXX What should I do if I get cancel == TRUE?
@@ -588,18 +578,18 @@ PclEndDoc( pCon, cancel )
 #define DOC_HPGL 2
 
 int
-PclDocumentData( pCon, pDraw, pData, len_data, pFmt, len_fmt, pOpt, len_opt, client)
-     XpContextPtr pCon;
-     DrawablePtr pDraw;
-     char *pData;
-     int len_data;
-     char *pFmt;
-     int len_fmt;
-     char *pOpt;
-     int len_opt;
-     ClientPtr client;
+PclDocumentData(
+     XpContextPtr pCon,
+     DrawablePtr pDraw,
+     char *pData,
+     int len_data,
+     char *pFmt,
+     int len_fmt,
+     char *pOpt,
+     int len_opt,
+     ClientPtr client)
 {
-    int type;
+    int type = 0;
     PclContextPrivPtr pPriv = (PclContextPrivPtr)
       pCon->devPrivates[PclContextPrivateIndex].ptr;
     XpOidDocFmtList *formats;
@@ -703,10 +693,10 @@ PclDocumentData( pCon, pDraw, pData, len_data, pFmt, len_fmt, pOpt, len_opt, cli
  */
 
 int
-PclGetDocumentData( pCon, client, maxBufferSize )
-     XpContextPtr pCon;
-     ClientPtr client;
-     int maxBufferSize;
+PclGetDocumentData(
+     XpContextPtr pCon,
+     ClientPtr client,
+     int maxBufferSize)
 {
     PclContextPrivPtr pPriv = (PclContextPrivPtr)
       pCon->devPrivates[PclContextPrivateIndex].ptr;