summaryrefslogtreecommitdiff
path: root/Xprint/pcl
diff options
context:
space:
mode:
Diffstat (limited to 'Xprint/pcl')
-rw-r--r--Xprint/pcl/Pcl.h4
-rw-r--r--Xprint/pcl/PclColor.c11
-rw-r--r--Xprint/pcl/PclFonts.c3
-rw-r--r--Xprint/pcl/PclMisc.c6
-rw-r--r--Xprint/pcl/PclPixel.c10
-rw-r--r--Xprint/pcl/PclPrint.c7
-rw-r--r--Xprint/pcl/PclSFonts.c5
-rw-r--r--Xprint/pcl/PclText.c5
-rw-r--r--Xprint/pcl/PclWindow.c4
9 files changed, 23 insertions, 32 deletions
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)
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 07:52:44 +0000