xts5: Fix "unused variable" warnings.

There are still two left:
    XDrawRectangle/XDrawRectangle.c:4211: warning: unused variable ‘jssav’
    XDrawRectangles/XDrawRectangles.c:4292: warning: unused variable ‘jssav’

These are a little harder to fix because the declaration is generated but jssav
is only used in some of the tests.

Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>

52 files changed, 54 insertions, 268 deletions

diff --git a/xts5/Xlib7/XAllocColorCells.m b/xts5/Xlib7/XAllocColorCells.m
index f480a312..c36576f0 100644
--- a/xts5/Xlib7/XAllocColorCells.m
+++ b/xts5/Xlib7/XAllocColorCells.m
@@ -140,10 +140,8 @@ For each visual class DirectColor, PseudoColor and GrayScale:
 >>CODE
 XVisualInfo *vp;
 XColor color, qcolor;
-Visual *visual;
 Status status;
-Colormap cmap;
-unsigned long vmask, pmask, mask, planemask;
+unsigned long vmask, mask, planemask;
 int i, j, k, cells;
 int pathcnt;
 
@@ -314,9 +312,7 @@ For each supported visual with r/w colour cells:
     Verify that the bitwise AND of the planemask and the OR of the colours is 0.
 >>CODE
 XVisualInfo *vp;
-Visual *visual;
 Status status;
-Colormap cmap;
 unsigned long vmask, planemask, pixelmask;
 int i, j, cells, pathcnt = 0;
 
@@ -410,9 +406,7 @@ For the visuals PseudoColor and GrayScale:
   Verify that the number of bits set in each planemask is exactly 1.
 >>CODE
 XVisualInfo *vp;
-Visual *visual;
 Status status;
-Colormap cmap;
 unsigned long vmask;
 int j, cells, pathcnt = 0;
 
@@ -486,9 +480,7 @@ For the visual class DirectColor:
   Verify that for each planemask exactly three bits are set.
 >>CODE
 XVisualInfo *vp;
-Visual *visual;
 Status status;
-Colormap cmap;
 unsigned long vmask;
 int j, cells;
 
@@ -571,9 +563,7 @@ For the visual types PseudoColor and GreyScale:
   Verify that the returned planemasks were contiguous.
 >>CODE
 XVisualInfo *vp;
-Visual *visual;
 Status status;
-Colormap cmap;
 unsigned long vmask;
 unsigned long planeor;
 int j, cells;
@@ -663,11 +653,8 @@ For the visual class DirectColor:
     were contiguous and distinct.
 >>CODE
 XVisualInfo *vp;
-Visual *visual;
 Status status;
-Colormap cmap;
 unsigned long vmask;
-unsigned long planeor;
 int j, cells;
 
 
diff --git a/xts5/Xlib7/XAllocColorPlanes.m b/xts5/Xlib7/XAllocColorPlanes.m
index 68a23064..a6eac84a 100644
--- a/xts5/Xlib7/XAllocColorPlanes.m
+++ b/xts5/Xlib7/XAllocColorPlanes.m
@@ -165,7 +165,6 @@ For visual class DirectColor:
 >>CODE
 XVisualInfo	*vp;
 unsigned long	vmask = (1<<DirectColor);
-unsigned long	*pixm, *rr, *gr, *br;
 unsigned long	rm, gm, bm, pm, rgbmask, pixel, r, g, b;
 XColor 		color, qcolor;
 Status		status;
@@ -333,7 +332,6 @@ For the visual class DirectColor:
 >>CODE
 XVisualInfo	*vp;
 unsigned long	vmask = (1<<DirectColor);
-unsigned long	*pixm, *rr, *gr, *br;
 unsigned long	rm, gm, bm, pm, rgbmask;
 unsigned long	pm_array[3], i;
 Status		status;
@@ -490,8 +488,7 @@ For the visual class DirectColor:
 >>CODE
 XVisualInfo	*vp;
 unsigned long	vmask = (1<<DirectColor);
-unsigned long	*pixm, *rr, *gr, *br;
-unsigned long	rm, gm, bm, pm, rgbmask, pixel, i;
+unsigned long	rm, gm, bm, pm;
 Status		status;
 int		cells;
 
@@ -565,9 +562,7 @@ For the visual class DirectColor:
 >>CODE
 XVisualInfo	*vp;
 unsigned long	vmask = (1<<DirectColor);
-unsigned long	*pixm, *rr, *gr, *br;
-unsigned long	rm, gm, bm, pm, rgbmask, pixel, i;
-XColor 		color;
+unsigned long	rm, gm, bm, pm;
 Status		status;
 int		cells;
 
@@ -635,7 +630,6 @@ For all supported visual classes:
   Call XAllocColorPlanes with ncolors = 0.
 >>CODE BadValue
 XVisualInfo *vp;
-Visual *visual;
 unsigned long vmask = (1<<DirectColor);
 
 	if( (vmask = visualsupported(display, vmask)) == 0L) {
diff --git a/xts5/Xlib7/XAllocNamedColor.m b/xts5/Xlib7/XAllocNamedColor.m
index 8785afe5..67f2602f 100644
--- a/xts5/Xlib7/XAllocNamedColor.m
+++ b/xts5/Xlib7/XAllocNamedColor.m
@@ -163,7 +163,6 @@ char *goodname;
 Status status;
 XColor screencol, exactcol, testcol;
 unsigned long vmask;
-unsigned short trunc;
 
 	if( (vmask = visualsupported(display, 0L)) == 0L) {
 		delete("No visuals reported as valid.");
@@ -241,9 +240,8 @@ For each supported visual type:
 XVisualInfo *vp;
 char *goodname;
 Status status;
-XColor screencol, exactcol, testcol;
+XColor screencol, exactcol;
 unsigned long vmask;
-unsigned short trunc;
 
 	if( (vmask = visualsupported(display, 0L)) == 0L) {
 		delete("No visuals reported as valid.");
@@ -287,9 +285,8 @@ For each supported visual type:
 XVisualInfo *vp;
 char *badname;
 Status status;
-XColor screencol, exactcol, testcol;
+XColor screencol, exactcol;
 unsigned long vmask;
-unsigned short trunc;
 
 	if( (vmask = visualsupported(display, 0L)) == 0L) {
 		delete("No visuals reported as valid.");
@@ -342,7 +339,6 @@ char *cp, *goodname, *casename;
 Status status;
 XColor screencol, exactcol, alscreencol, alexactcol;
 unsigned long vmask;
-unsigned short trunc;
 int i;
 
 	if( (vmask = visualsupported(display, 0L)) == 0L) {
diff --git a/xts5/Xlib7/XCopyColormapAndFree.m b/xts5/Xlib7/XCopyColormapAndFree.m
index d31bd823..1488e261 100644
--- a/xts5/Xlib7/XCopyColormapAndFree.m
+++ b/xts5/Xlib7/XCopyColormapAndFree.m
@@ -121,11 +121,9 @@ XVisualInfo	*vp;
 unsigned long 	vmask = (1<<DirectColor)|(1<<PseudoColor)|(1<<GrayScale);
 XColor		*cellmap, *cellptr;
 XColor		cell;
-unsigned long	l;
 unsigned int	i;
-int		pathcnt = 0, size;
-XColor		color, color1, color2, ncol1, ncol2;
-Display		*disp2;
+int		size;
+XColor		color1, color2;
 
 
 	if( (vmask = visualsupported(display, vmask)) == 0L) {
@@ -233,7 +231,6 @@ unsigned long 	vmask = (1<<DirectColor)|(1<<PseudoColor)|(1<<GrayScale);
 XColor		*cellmap, *cellptr;
 XColor		cell;
 unsigned long	l;
-int		i;
 int		pathcnt = 0;
 int 	size;
 
@@ -360,12 +357,9 @@ static Bool check_rgb(dpy, cmap, xcp)
 Colormap	testcmap;
 XVisualInfo	*vp;
 unsigned long 	vmask = (1<<DirectColor)|(1<<PseudoColor)|(1<<GrayScale);
-XColor		*cellmap, *cellptr;
-XColor		cell;
-unsigned long	l;
 int	i;
-int		pathcnt = 0, size;
-XColor		color, ncol1, ncol2, cols[4];
+int		size;
+XColor		cols[4];
 Display		*disp2;
 unsigned long	pix[2];
 unsigned long	*copypix;
diff --git a/xts5/Xlib7/XCreateColormap.m b/xts5/Xlib7/XCreateColormap.m
index 6a744b4a..272b6f00 100644
--- a/xts5/Xlib7/XCreateColormap.m
+++ b/xts5/Xlib7/XCreateColormap.m
@@ -121,9 +121,6 @@ For each visual type
 >>CODE
 XVisualInfo *vp;
 Colormap	cmap;
-Display		*d2;
-Window		w2;
-int i;
 
 
 	alloc = AllocNone;
@@ -431,10 +428,9 @@ For the visual Directcolor:
 Colormap	cmap;
 XVisualInfo	*vi;
 XColor		colarr[NUM_COLS];
-unsigned long	plane, count;
-unsigned long		vmask = (1L<<DirectColor), b, planemask;
-int 		n, i, j, bitsum;
-int		bitpos[sizeof(long) * 8];
+unsigned long	count;
+unsigned long		vmask = (1L<<DirectColor);
+int		n, i,  bitsum;
 
 
 	if( (vmask = visualsupported(display, vmask)) == 0L) {
diff --git a/xts5/Xlib7/XFreeColormap.m b/xts5/Xlib7/XFreeColormap.m
index 16b8c4ce..8e43d87a 100644
--- a/xts5/Xlib7/XFreeColormap.m
+++ b/xts5/Xlib7/XFreeColormap.m
@@ -247,11 +247,9 @@ For each supported visual class:
   Verify that a ColorMapnotify event was generated with XNextEvent.
   Verify that the window's colourmap is set to none with XGetWindowAttributes.
 >>CODE
-int i, len, notfound;
 XVisualInfo *vi;
 XWindowAttributes watts;
 XEvent ev;
-Colormap *maplist;
 unsigned long vmask;
 XColor col;
 Window win;
diff --git a/xts5/Xlib7/XLookupColor.m b/xts5/Xlib7/XLookupColor.m
index 36296bba..df597cae 100644
--- a/xts5/Xlib7/XLookupColor.m
+++ b/xts5/Xlib7/XLookupColor.m
@@ -223,7 +223,6 @@ char *cp, *goodname, *casename;
 Status status;
 XColor screencol, exactcol, alscreencol, alexactcol;
 unsigned long vmask;
-unsigned short trunc;
 int i;
 
 	if( (vmask = visualsupported(display, 0L)) == 0L) {
diff --git a/xts5/Xlib7/XParseColor.m b/xts5/Xlib7/XParseColor.m
index 5d3bcc02..a691de1a 100644
--- a/xts5/Xlib7/XParseColor.m
+++ b/xts5/Xlib7/XParseColor.m
@@ -411,7 +411,6 @@ Verify that the flags component of the returned XColor structure was DoRed|DoGre
 >>CODE
 Status	ret;
 char	flags;
-XColor	dcol;
 
 	spec = "#000";
 	ret = XCALL;
@@ -496,11 +495,7 @@ then a call to xname returns zero.
 Parse the string XT_BAD_COLORNAME using xname.
 Verify that the call returns zero.
 >>CODE
-char		*ptr;
-char		*str;
 Status		result;
-XColor		dcol;
-unsigned short	red, green, blue;
 
 	spec = config.bad_colorname;
 	result = XCALL;
diff --git a/xts5/Xlib7/XStoreNamedColor.m b/xts5/Xlib7/XStoreNamedColor.m
index af333d0d..03dd35b1 100644
--- a/xts5/Xlib7/XStoreNamedColor.m
+++ b/xts5/Xlib7/XStoreNamedColor.m
@@ -299,7 +299,6 @@ XVisualInfo *vp;
 char *cp, *goodname, *casename;
 XColor casecol, testcol;
 unsigned long vmask = (1<<DirectColor)|(1<<PseudoColor)|(1<<GrayScale);
-unsigned short trunc;
 int		i;
 
 	if( (vmask = visualsupported(display, vmask)) == 0L) {
@@ -375,7 +374,6 @@ For each visual class DirectColor, PseudoColor and GrayScale:
 >>CODE BadValue
 XVisualInfo *vp;
 char *goodname;
-XColor namedcol, testcol, storedcol;
 unsigned long vmask = (1<<DirectColor)|(1<<PseudoColor)|(1<<GrayScale);
 
 	if( (vmask = visualsupported(display, vmask)) == 0L) {
@@ -498,7 +496,6 @@ For the visual classes DirectColor, PseudoColor and GrayScale :
 >>CODE BadName
 XVisualInfo *vp;
 char *badname;
-Status status;
 unsigned long vmask = (1<<DirectColor)|(1<<PseudoColor)|(1<<GrayScale);
 
 	if( (vmask = visualsupported(display, vmask)) == 0L) {
diff --git a/xts5/Xlib7/XcmsAddColorSpace.m b/xts5/Xlib7/XcmsAddColorSpace.m
index f8bb6e18..e38e28f2 100644
--- a/xts5/Xlib7/XcmsAddColorSpace.m
+++ b/xts5/Xlib7/XcmsAddColorSpace.m
@@ -101,7 +101,6 @@ XcmsColorSpace       *color_space ;
         extern int  chkflg;
 	extern int  signal_status();
 	extern int  unexp_err();
-	extern char *svc_user_arg;
 	extern char *strcpy();
 
 /******
@@ -109,14 +108,11 @@ XcmsColorSpace       *color_space ;
  ******/
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
+  		cleanup_status;
 
         Status           svc_ret_value;
 
diff --git a/xts5/Xlib7/XcmsAddFunctionSet.m b/xts5/Xlib7/XcmsAddFunctionSet.m
index 246e82df..cadc870f 100644
--- a/xts5/Xlib7/XcmsAddFunctionSet.m
+++ b/xts5/Xlib7/XcmsAddFunctionSet.m
@@ -130,13 +130,10 @@ XcmsFunctionSet      *function_set ;
  ******/
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int ss_status,			  /* save stat return status */	
 		stat_status,		  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
+  		cleanup_status;
 
         Status           svc_ret_value;
 
diff --git a/xts5/Xlib7/XcmsAllocColor.m b/xts5/Xlib7/XcmsAllocColor.m
index c353f804..7ad4710b 100644
--- a/xts5/Xlib7/XcmsAllocColor.m
+++ b/xts5/Xlib7/XcmsAllocColor.m
@@ -108,15 +108,11 @@ extern int  unexp_err();
 
 char fmtstr[256], *call_string;
 union msglst fmt_lst[1];        
-int skip_pixcheck;
-int red, green, blue;
 int tmpRGB;
 
 int     ss_status,			  /* save stat return status */	
 	stat_status,			  /* check stat return status */
-	setup_status,
-	cleanup_status,
-	i1;
+	cleanup_status;
 
 Status           svc_ret_value;
 
diff --git a/xts5/Xlib7/XcmsAllocNamedColor.m b/xts5/Xlib7/XcmsAllocNamedColor.m
index d163821d..ebcb46d4 100644
--- a/xts5/Xlib7/XcmsAllocNamedColor.m
+++ b/xts5/Xlib7/XcmsAllocNamedColor.m
@@ -121,14 +121,11 @@ XcmsColorFormat      format ;
  ******/
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
+  		cleanup_status;
 
         Status           svc_ret_value;
 
diff --git a/xts5/Xlib7/XcmsCCCOfColormap.m b/xts5/Xlib7/XcmsCCCOfColormap.m
index 7592b87e..363a61f1 100644
--- a/xts5/Xlib7/XcmsCCCOfColormap.m
+++ b/xts5/Xlib7/XcmsCCCOfColormap.m
@@ -106,7 +106,6 @@ Colormap             colormap ;
         extern int  chkflg;
 	extern int  signal_status();
 	extern int  unexp_err();
-	extern char *svc_user_arg;
 	extern char *strcpy();
 
 /******
@@ -114,14 +113,11 @@ Colormap             colormap ;
  ******/
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
+  		cleanup_status;
 
         XcmsCCC         svc_ret_value;
 
diff --git a/xts5/Xlib7/XcmsCIELabQueryMaxC.m b/xts5/Xlib7/XcmsCIELabQueryMaxC.m
index e42ede59..643238df 100644
--- a/xts5/Xlib7/XcmsCIELabQueryMaxC.m
+++ b/xts5/Xlib7/XcmsCIELabQueryMaxC.m
@@ -84,19 +84,15 @@ XcmsColor            color ;
         extern int  chkflg;
 	extern int  signal_status();
 	extern int  unexp_err();
-	extern char *svc_user_arg;
 	extern char *strcpy();
 
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
+  		cleanup_status;
         Status           svc_ret_value;
 
 
diff --git a/xts5/Xlib7/XcmsCIELabQueryMaxL.m b/xts5/Xlib7/XcmsCIELabQueryMaxL.m
index 7af686ee..ab9c3e86 100644
--- a/xts5/Xlib7/XcmsCIELabQueryMaxL.m
+++ b/xts5/Xlib7/XcmsCIELabQueryMaxL.m
@@ -85,7 +85,6 @@ XcmsColor            color ;
         extern int  chkflg;
 	extern int  signal_status();
 	extern int  unexp_err();
-	extern char *svc_user_arg;
 	extern char *strcpy();
 
 /******
@@ -93,14 +92,11 @@ XcmsColor            color ;
  ******/
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
+  		cleanup_status;
 
         Status           svc_ret_value;
 
diff --git a/xts5/Xlib7/XcmsCIELabQueryMaxLC.m b/xts5/Xlib7/XcmsCIELabQueryMaxLC.m
index 2fb4f539..00f1eee8 100644
--- a/xts5/Xlib7/XcmsCIELabQueryMaxLC.m
+++ b/xts5/Xlib7/XcmsCIELabQueryMaxLC.m
@@ -85,18 +85,14 @@ XcmsColor            color ;
         extern int  chkflg;
 	extern int  signal_status();
 	extern int  unexp_err();
-	extern char *svc_user_arg;
 	extern char *strcpy();
 
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
+  		cleanup_status;
         Status           svc_ret_value;
 
 	/******
diff --git a/xts5/Xlib7/XcmsCIELabQueryMinL.m b/xts5/Xlib7/XcmsCIELabQueryMinL.m
index b9585434..d93a3126 100644
--- a/xts5/Xlib7/XcmsCIELabQueryMinL.m
+++ b/xts5/Xlib7/XcmsCIELabQueryMinL.m
@@ -107,7 +107,6 @@ XcmsColor            color ;
         extern int  chkflg;
 	extern int  signal_status();
 	extern int  unexp_err();
-	extern char *svc_user_arg;
 	extern char *strcpy();
 
 /******
@@ -115,14 +114,11 @@ XcmsColor            color ;
  ******/
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
+		cleanup_status;
 
         Status           svc_ret_value;
 
diff --git a/xts5/Xlib7/XcmsCIELuvQueryMaxC.m b/xts5/Xlib7/XcmsCIELuvQueryMaxC.m
index 458ff145..9bb767a3 100644
--- a/xts5/Xlib7/XcmsCIELuvQueryMaxC.m
+++ b/xts5/Xlib7/XcmsCIELuvQueryMaxC.m
@@ -110,7 +110,6 @@ XcmsColor            color ;
         extern int  chkflg;
 	extern int  signal_status();
 	extern int  unexp_err();
-	extern char *svc_user_arg;
 	extern char *strcpy();
 
 /******
@@ -118,14 +117,11 @@ XcmsColor            color ;
  ******/
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
+		cleanup_status;
 
         Status           svc_ret_value;
 
diff --git a/xts5/Xlib7/XcmsCIELuvQueryMaxL.m b/xts5/Xlib7/XcmsCIELuvQueryMaxL.m
index 92de81d2..07801856 100644
--- a/xts5/Xlib7/XcmsCIELuvQueryMaxL.m
+++ b/xts5/Xlib7/XcmsCIELuvQueryMaxL.m
@@ -110,7 +110,6 @@ XcmsColor            color ;
         extern int  chkflg;
 	extern int  signal_status();
 	extern int  unexp_err();
-	extern char *svc_user_arg;
 	extern char *strcpy();
 
 /******
@@ -118,14 +117,11 @@ XcmsColor            color ;
  ******/
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
+		cleanup_status;
 
         Status           svc_ret_value;
 
diff --git a/xts5/Xlib7/XcmsCIELuvQueryMaxLC.m b/xts5/Xlib7/XcmsCIELuvQueryMaxLC.m
index 49cb164b..cb85221f 100644
--- a/xts5/Xlib7/XcmsCIELuvQueryMaxLC.m
+++ b/xts5/Xlib7/XcmsCIELuvQueryMaxLC.m
@@ -106,7 +106,6 @@ XcmsColor            color ;
         extern int  chkflg;
 	extern int  signal_status();
 	extern int  unexp_err();
-	extern char *svc_user_arg;
 	extern char *strcpy();
 
 /******
@@ -114,14 +113,11 @@ XcmsColor            color ;
  ******/
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
+		cleanup_status;
 
         Status           svc_ret_value;
 
diff --git a/xts5/Xlib7/XcmsCIELuvQueryMinL.m b/xts5/Xlib7/XcmsCIELuvQueryMinL.m
index b66edc64..bb1f9b16 100644
--- a/xts5/Xlib7/XcmsCIELuvQueryMinL.m
+++ b/xts5/Xlib7/XcmsCIELuvQueryMinL.m
@@ -110,7 +110,6 @@ XcmsColor            color ;
         extern int  chkflg;
 	extern int  signal_status();
 	extern int  unexp_err();
-	extern char *svc_user_arg;
 	extern char *strcpy();
 
 /******
@@ -118,14 +117,11 @@ XcmsColor            color ;
  ******/
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
+		cleanup_status;
 
         Status           svc_ret_value;
 
diff --git a/xts5/Xlib7/XcmsClientWhitePointOfCCC.m b/xts5/Xlib7/XcmsClientWhitePointOfCCC.m
index 4cf6c10b..cf29aee0 100644
--- a/xts5/Xlib7/XcmsClientWhitePointOfCCC.m
+++ b/xts5/Xlib7/XcmsClientWhitePointOfCCC.m
@@ -103,21 +103,17 @@ extern int  errflg;
 extern int  chkflg;
 extern int  signal_status();
 extern int  unexp_err();
-extern char *svc_user_arg;
 
 /******
  * local storage 
  ******/
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
+		cleanup_status;
 
         XcmsColor           *svc_ret_value;
 
diff --git a/xts5/Xlib7/XcmsConversionProc.m b/xts5/Xlib7/XcmsConversionProc.m
index 61229d43..68a441ee 100644
--- a/xts5/Xlib7/XcmsConversionProc.m
+++ b/xts5/Xlib7/XcmsConversionProc.m
@@ -92,21 +92,17 @@ unsigned int         num ;
         extern int  chkflg;
 	extern int  signal_status();
 	extern int  unexp_err();
-	extern char *svc_user_arg;
 
 /******
  * local storage 
  ******/
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
+  		cleanup_status;
 
         Status           svc_ret_value;
 
diff --git a/xts5/Xlib7/XcmsConversionProc2.m b/xts5/Xlib7/XcmsConversionProc2.m
index a1e650ab..6db7e626 100644
--- a/xts5/Xlib7/XcmsConversionProc2.m
+++ b/xts5/Xlib7/XcmsConversionProc2.m
@@ -95,21 +95,17 @@ Bool                 flags[] ;
         extern int  chkflg;
 	extern int  signal_status();
 	extern int  unexp_err();
-	extern char *svc_user_arg;
 
 /******
  * local storage 
  ******/
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
+		cleanup_status;
 
         Status           svc_ret_value;
 
diff --git a/xts5/Xlib7/XcmsConvertColors.m b/xts5/Xlib7/XcmsConvertColors.m
index 5fd79b38..7621eafc 100644
--- a/xts5/Xlib7/XcmsConvertColors.m
+++ b/xts5/Xlib7/XcmsConvertColors.m
@@ -112,12 +112,10 @@ extern int  unexp_err();
  ******/
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
   		cleanup_status,
 		i1;
 
diff --git a/xts5/Xlib7/XcmsCreateCCC.m b/xts5/Xlib7/XcmsCreateCCC.m
index b10f9f09..875df6e0 100644
--- a/xts5/Xlib7/XcmsCreateCCC.m
+++ b/xts5/Xlib7/XcmsCreateCCC.m
@@ -98,7 +98,6 @@ extern int  errflg;
 extern int  chkflg;
 extern int  signal_status();
 extern int  unexp_err();
-extern char *svc_user_arg;
 extern char *strcpy();
 
 /******
@@ -106,14 +105,11 @@ extern char *strcpy();
  ******/
 char fmtstr[256], *call_string;
 union msglst fmt_lst[1];        
-int skip_pixcheck;
 
 int
 	ss_status,			  /* save stat return status */	
 	stat_status,			  /* check stat return status */
-	setup_status,
-	cleanup_status,
-	i1;
+	cleanup_status;
 
 XcmsCCC        svc_ret_value;
 
diff --git a/xts5/Xlib7/XcmsDefaultCCC.m b/xts5/Xlib7/XcmsDefaultCCC.m
index b57de277..680258fc 100644
--- a/xts5/Xlib7/XcmsDefaultCCC.m
+++ b/xts5/Xlib7/XcmsDefaultCCC.m
@@ -89,7 +89,6 @@ int                  screen_number ;
         extern int  chkflg;
 	extern int  signal_status();
 	extern int  unexp_err();
-	extern char *svc_user_arg;
 	extern char *strcpy();
 
 /******
@@ -97,14 +96,11 @@ int                  screen_number ;
  ******/
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
+		cleanup_status;
 
         XcmsCCC      svc_ret_value;
 
diff --git a/xts5/Xlib7/XcmsDisplayOfCCC.m b/xts5/Xlib7/XcmsDisplayOfCCC.m
index 6199abec..5e1a7e83 100644
--- a/xts5/Xlib7/XcmsDisplayOfCCC.m
+++ b/xts5/Xlib7/XcmsDisplayOfCCC.m
@@ -99,7 +99,6 @@ XcmsCCC              ccc ;
         extern int  chkflg;
 	extern int  signal_status();
 	extern int  unexp_err();
-	extern char *svc_user_arg;
 	extern char *strcpy();
 
 /******
@@ -107,14 +106,11 @@ XcmsCCC              ccc ;
  ******/
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
+		cleanup_status;
 
         Display          *svc_ret_value;
 
diff --git a/xts5/Xlib7/XcmsFormatOfPrefix.m b/xts5/Xlib7/XcmsFormatOfPrefix.m
index 81daec3b..aaaab25d 100644
--- a/xts5/Xlib7/XcmsFormatOfPrefix.m
+++ b/xts5/Xlib7/XcmsFormatOfPrefix.m
@@ -109,7 +109,6 @@ char                 *prefix_good ;
         extern int  chkflg;
 	extern int  signal_status();
 	extern int  unexp_err();
-	extern char *svc_user_arg;
 	extern char *strcpy();
 
 /******
@@ -117,14 +116,11 @@ char                 *prefix_good ;
  ******/
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
+		cleanup_status;
 
         XcmsColorFormat           svc_ret_value;
 
diff --git a/xts5/Xlib7/XcmsFreeCCC.m b/xts5/Xlib7/XcmsFreeCCC.m
index bebdccb7..ccca838b 100644
--- a/xts5/Xlib7/XcmsFreeCCC.m
+++ b/xts5/Xlib7/XcmsFreeCCC.m
@@ -104,7 +104,6 @@ XcmsCCC              ccc ;
         extern int  chkflg;
 	extern int  signal_status();
 	extern int  unexp_err();
-	extern char *svc_user_arg;
 	extern char *strcpy();
 
 /******
@@ -112,16 +111,11 @@ XcmsCCC              ccc ;
  ******/
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
-
-        XcmsCCC        svc_ret_value;
+		cleanup_status;
 
 
 /******
diff --git a/xts5/Xlib7/XcmsLookupColor.m b/xts5/Xlib7/XcmsLookupColor.m
index bcec072c..605ecb42 100644
--- a/xts5/Xlib7/XcmsLookupColor.m
+++ b/xts5/Xlib7/XcmsLookupColor.m
@@ -123,7 +123,6 @@ XcmsColorFormat      result_format ;
         extern int  chkflg;
 	extern int  signal_status();
 	extern int  unexp_err();
-	extern char *svc_user_arg;
 	extern char *strcpy();
 
 /******
@@ -131,14 +130,11 @@ XcmsColorFormat      result_format ;
  ******/
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
+		cleanup_status;
 
         Status           svc_ret_value;
 
diff --git a/xts5/Xlib7/XcmsPrefixOfFormat.m b/xts5/Xlib7/XcmsPrefixOfFormat.m
index 8f602fbe..daf912fa 100644
--- a/xts5/Xlib7/XcmsPrefixOfFormat.m
+++ b/xts5/Xlib7/XcmsPrefixOfFormat.m
@@ -111,7 +111,6 @@ XcmsColorFormat      format ;
         extern int  chkflg;
 	extern int  signal_status();
 	extern int  unexp_err();
-	extern char *svc_user_arg;
 	extern char *strcpy();
 
 /******
@@ -119,14 +118,11 @@ XcmsColorFormat      format ;
  ******/
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
+		cleanup_status;
 
         char          *svc_ret_value;
 
diff --git a/xts5/Xlib7/XcmsQueryBlack.m b/xts5/Xlib7/XcmsQueryBlack.m
index c3a1aa0b..557340e7 100644
--- a/xts5/Xlib7/XcmsQueryBlack.m
+++ b/xts5/Xlib7/XcmsQueryBlack.m
@@ -111,7 +111,6 @@ XcmsColor            color ;
         extern int  chkflg;
 	extern int  signal_status();
 	extern int  unexp_err();
-	extern char *svc_user_arg;
 	extern char *strcpy();
 
 /******
@@ -119,14 +118,11 @@ XcmsColor            color ;
  ******/
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
+		cleanup_status;
 
         Status           svc_ret_value;
 
diff --git a/xts5/Xlib7/XcmsQueryBlue.m b/xts5/Xlib7/XcmsQueryBlue.m
index a65cfb98..5dae5bfb 100644
--- a/xts5/Xlib7/XcmsQueryBlue.m
+++ b/xts5/Xlib7/XcmsQueryBlue.m
@@ -109,7 +109,6 @@ XcmsColor            color ;
         extern int  chkflg;
 	extern int  signal_status();
 	extern int  unexp_err();
-	extern char *svc_user_arg;
 	extern char *strcpy();
 
 /******
@@ -117,14 +116,11 @@ XcmsColor            color ;
  ******/
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
+		cleanup_status;
 
         Status           svc_ret_value;
 
diff --git a/xts5/Xlib7/XcmsQueryColor.m b/xts5/Xlib7/XcmsQueryColor.m
index c4ddd6a0..b64875ce 100644
--- a/xts5/Xlib7/XcmsQueryColor.m
+++ b/xts5/Xlib7/XcmsQueryColor.m
@@ -123,7 +123,6 @@ XcmsColorFormat      format ;
         extern int  chkflg;
 	extern int  signal_status();
 	extern int  unexp_err();
-	extern char *svc_user_arg;
 	extern char *strcpy();
 
 /******
@@ -131,14 +130,11 @@ XcmsColorFormat      format ;
  ******/
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
+		cleanup_status;
 
         Status           svc_ret_value;
 
diff --git a/xts5/Xlib7/XcmsQueryColors.m b/xts5/Xlib7/XcmsQueryColors.m
index cfb02143..fdd53b12 100644
--- a/xts5/Xlib7/XcmsQueryColors.m
+++ b/xts5/Xlib7/XcmsQueryColors.m
@@ -133,7 +133,6 @@ XcmsColorFormat      format ;
         extern int  chkflg;
 	extern int  signal_status();
 	extern int  unexp_err();
-	extern char *svc_user_arg;
 	extern char *strcpy();
 
 /******
@@ -141,14 +140,11 @@ XcmsColorFormat      format ;
  ******/
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
+		cleanup_status;
 
         Status           svc_ret_value;
 
diff --git a/xts5/Xlib7/XcmsQueryGreen.m b/xts5/Xlib7/XcmsQueryGreen.m
index 6bb1a982..870d0793 100644
--- a/xts5/Xlib7/XcmsQueryGreen.m
+++ b/xts5/Xlib7/XcmsQueryGreen.m
@@ -109,7 +109,6 @@ XcmsColor            color ;
         extern int  chkflg;
 	extern int  signal_status();
 	extern int  unexp_err();
-	extern char *svc_user_arg;
 	extern char *strcpy();
 
 /******
@@ -117,14 +116,11 @@ XcmsColor            color ;
  ******/
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
+		cleanup_status;
 
         Status           svc_ret_value;
 
diff --git a/xts5/Xlib7/XcmsQueryRed.m b/xts5/Xlib7/XcmsQueryRed.m
index 16557100..ce034d71 100644
--- a/xts5/Xlib7/XcmsQueryRed.m
+++ b/xts5/Xlib7/XcmsQueryRed.m
@@ -104,18 +104,14 @@ XcmsColor            color ;
         extern int  chkflg;
 	extern int  signal_status();
 	extern int  unexp_err();
-	extern char *svc_user_arg;
 
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
+		cleanup_status;
 
         Status           svc_ret_value;
 
diff --git a/xts5/Xlib7/XcmsQueryWhite.m b/xts5/Xlib7/XcmsQueryWhite.m
index 471af252..f91c9429 100644
--- a/xts5/Xlib7/XcmsQueryWhite.m
+++ b/xts5/Xlib7/XcmsQueryWhite.m
@@ -110,21 +110,17 @@ XcmsColor            color ;
         extern int  chkflg;
 	extern int  signal_status();
 	extern int  unexp_err();
-	extern char *svc_user_arg;
 
 /******
  * local storage 
  ******/
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
+		cleanup_status;
 
         Status           svc_ret_value;
 
diff --git a/xts5/Xlib7/XcmsScreenNumberOfCCC.m b/xts5/Xlib7/XcmsScreenNumberOfCCC.m
index 1f3c216d..108aa2bd 100644
--- a/xts5/Xlib7/XcmsScreenNumberOfCCC.m
+++ b/xts5/Xlib7/XcmsScreenNumberOfCCC.m
@@ -108,7 +108,6 @@ XcmsCCC               ccc ;
         extern int  chkflg;
 	extern int  signal_status();
 	extern int  unexp_err();
-	extern char *svc_user_arg;
 	extern char *strcpy();
 
 /******
@@ -116,14 +115,11 @@ XcmsCCC               ccc ;
  ******/
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
+		cleanup_status;
 
         int           svc_ret_value;
 
diff --git a/xts5/Xlib7/XcmsScreenWhitePointOfCCC.m b/xts5/Xlib7/XcmsScreenWhitePointOfCCC.m
index acd954a6..2c02c454 100644
--- a/xts5/Xlib7/XcmsScreenWhitePointOfCCC.m
+++ b/xts5/Xlib7/XcmsScreenWhitePointOfCCC.m
@@ -103,21 +103,17 @@ XcmsCCC             ccc ;
         extern int  chkflg;
 	extern int  signal_status();
 	extern int  unexp_err();
-	extern char *svc_user_arg;
 
 /******
  * local storage 
  ******/
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
+		cleanup_status;
 
         XcmsColor           *svc_ret_value;
 
diff --git a/xts5/Xlib7/XcmsSetWhiteAdjustProc.m b/xts5/Xlib7/XcmsSetWhiteAdjustProc.m
index 70a8b5b2..b62200c7 100644
--- a/xts5/Xlib7/XcmsSetWhiteAdjustProc.m
+++ b/xts5/Xlib7/XcmsSetWhiteAdjustProc.m
@@ -110,7 +110,6 @@ XPointer             client_data ;
         extern int  chkflg;
 	extern int  signal_status();
 	extern int  unexp_err();
-	extern char *svc_user_arg;
 	extern char *strcpy();
 
 /******
@@ -118,14 +117,11 @@ XPointer             client_data ;
  ******/
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
+		cleanup_status;
 
         XcmsWhiteAdjustProc       svc_ret_value;
 
diff --git a/xts5/Xlib7/XcmsSetWhitePoint.m b/xts5/Xlib7/XcmsSetWhitePoint.m
index c8f9fdf6..64a5c6ed 100644
--- a/xts5/Xlib7/XcmsSetWhitePoint.m
+++ b/xts5/Xlib7/XcmsSetWhitePoint.m
@@ -109,7 +109,6 @@ XcmsColor            color ;
         extern int  chkflg;
 	extern int  signal_status();
 	extern int  unexp_err();
-	extern char *svc_user_arg;
 	extern char *strcpy();
 
 /******
@@ -117,14 +116,11 @@ XcmsColor            color ;
  ******/
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
+		cleanup_status;
 
         Status           svc_ret_value;
 
diff --git a/xts5/Xlib7/XcmsStoreColor.m b/xts5/Xlib7/XcmsStoreColor.m
index 535a6c72..1d08f221 100644
--- a/xts5/Xlib7/XcmsStoreColor.m
+++ b/xts5/Xlib7/XcmsStoreColor.m
@@ -104,7 +104,6 @@ XcmsColor            color ;
         extern int  chkflg;
 	extern int  signal_status();
 	extern int  unexp_err();
-	extern char *svc_user_arg;
 	extern char *strcpy();
 
 /******
@@ -112,14 +111,11 @@ XcmsColor            color ;
  ******/
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
+		cleanup_status;
 
         Status           svc_ret_value;
 
diff --git a/xts5/Xlib7/XcmsStoreColors.m b/xts5/Xlib7/XcmsStoreColors.m
index 42a50ad3..e2e00be3 100644
--- a/xts5/Xlib7/XcmsStoreColors.m
+++ b/xts5/Xlib7/XcmsStoreColors.m
@@ -113,7 +113,6 @@ Bool                 flags_return[] ;
         extern int  chkflg;
 	extern int  signal_status();
 	extern int  unexp_err();
-	extern char *svc_user_arg;
 	extern char *strcpy();
 
 /******
@@ -121,14 +120,11 @@ Bool                 flags_return[] ;
  ******/
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
+		cleanup_status;
 
         Status           svc_ret_value;
 
diff --git a/xts5/Xlib7/XcmsTekHVCQueryMaxC.m b/xts5/Xlib7/XcmsTekHVCQueryMaxC.m
index c7315f7a..63616913 100644
--- a/xts5/Xlib7/XcmsTekHVCQueryMaxC.m
+++ b/xts5/Xlib7/XcmsTekHVCQueryMaxC.m
@@ -108,7 +108,6 @@ XcmsColor            color ;
         extern int  chkflg;
 	extern int  signal_status();
 	extern int  unexp_err();
-	extern char *svc_user_arg;
 	extern char *strcpy();
 
 /******
@@ -116,14 +115,11 @@ XcmsColor            color ;
  ******/
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
+		cleanup_status;
 
         Status           svc_ret_value;
 
diff --git a/xts5/Xlib7/XcmsTekHVCQueryMaxV.m b/xts5/Xlib7/XcmsTekHVCQueryMaxV.m
index 3f029fc2..bf17798f 100644
--- a/xts5/Xlib7/XcmsTekHVCQueryMaxV.m
+++ b/xts5/Xlib7/XcmsTekHVCQueryMaxV.m
@@ -111,7 +111,6 @@ XcmsColor            color ;
         extern int  chkflg;
 	extern int  signal_status();
 	extern int  unexp_err();
-	extern char *svc_user_arg;
 	extern char *strcpy();
 
 /******
@@ -119,14 +118,11 @@ XcmsColor            color ;
  ******/
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
+		cleanup_status;
 
         Status           svc_ret_value;
 
diff --git a/xts5/Xlib7/XcmsTekHVCQueryMaxVC.m b/xts5/Xlib7/XcmsTekHVCQueryMaxVC.m
index e93d0f33..de4bb864 100644
--- a/xts5/Xlib7/XcmsTekHVCQueryMaxVC.m
+++ b/xts5/Xlib7/XcmsTekHVCQueryMaxVC.m
@@ -106,7 +106,6 @@ XcmsColor            color ;
         extern int  chkflg;
 	extern int  signal_status();
 	extern int  unexp_err();
-	extern char *svc_user_arg;
 	extern char *strcpy();
 
 /******
@@ -114,14 +113,11 @@ XcmsColor            color ;
  ******/
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
+		cleanup_status;
 
         Status           svc_ret_value;
 
diff --git a/xts5/Xlib7/XcmsTekHVCQueryMaxVSamples.m b/xts5/Xlib7/XcmsTekHVCQueryMaxVSamples.m
index 11c3a380..53a24386 100644
--- a/xts5/Xlib7/XcmsTekHVCQueryMaxVSamples.m
+++ b/xts5/Xlib7/XcmsTekHVCQueryMaxVSamples.m
@@ -112,7 +112,6 @@ unsigned int         nsamples ;
         extern int  chkflg;
 	extern int  signal_status();
 	extern int  unexp_err();
-	extern char *svc_user_arg;
 	extern char *strcpy();
 
 /******
@@ -120,14 +119,11 @@ unsigned int         nsamples ;
  ******/
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
+		cleanup_status;
 
         Status           svc_ret_value;
 
diff --git a/xts5/Xlib7/XcmsTekHVCQueryMinV.m b/xts5/Xlib7/XcmsTekHVCQueryMinV.m
index bdb7e855..daa198e6 100644
--- a/xts5/Xlib7/XcmsTekHVCQueryMinV.m
+++ b/xts5/Xlib7/XcmsTekHVCQueryMinV.m
@@ -111,7 +111,6 @@ XcmsColor            color ;
         extern int  chkflg;
 	extern int  signal_status();
 	extern int  unexp_err();
-	extern char *svc_user_arg;
 	extern char *strcpy();
 
 /******
@@ -119,14 +118,11 @@ XcmsColor            color ;
  ******/
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
+		cleanup_status;
 
         Status           svc_ret_value;
 
diff --git a/xts5/Xlib7/XcmsVisualOfCCC.m b/xts5/Xlib7/XcmsVisualOfCCC.m
index b84692e9..fae56d16 100644
--- a/xts5/Xlib7/XcmsVisualOfCCC.m
+++ b/xts5/Xlib7/XcmsVisualOfCCC.m
@@ -104,7 +104,6 @@ XcmsCCC              ccc ;
         extern int  chkflg;
 	extern int  signal_status();
 	extern int  unexp_err();
-	extern char *svc_user_arg;
 	extern char *strcpy();
 
 /******
@@ -112,14 +111,11 @@ XcmsCCC              ccc ;
  ******/
 	char fmtstr[256], *call_string;
 	union msglst fmt_lst[1];        
-        int skip_pixcheck;
 
 	int
 		ss_status,			  /* save stat return status */	
 		stat_status,			  /* check stat return status */
-  		setup_status,
-  		cleanup_status,
-		i1;
+		cleanup_status;
 
         Visual           *svc_ret_value;