merge latest (4.3.99.16) from XFree86 (vendor) branchXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASEXINERAMA_2XEVIE

4 files changed, 19 insertions, 23 deletions

diff --git a/chparse.c b/chparse.c
index 3375f8c..820f308 100644
--- a/chparse.c
+++ b/chparse.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/xtrap/chparse.c,v 1.3 2002/09/18 17:11:57 tsi Exp $ */
+/* $XFree86: xc/programs/xtrap/chparse.c,v 1.4 2003/05/27 22:27:13 tsi Exp $ */
 /*****************************************************************************
 Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA
 
@@ -120,7 +120,6 @@ int		inter[],	/* intermediate char, starting at [1]	*/
 int		*ninter,	/* Number of intermediates		*/
 int		*final)		/* Sequence terminator			*/
 {
-        int  present[NPARAM]; /* TRUE if param[i] is not defaulted	*/
 	register int		c;
 	register int		i;
 
@@ -145,7 +144,7 @@ label2:	switch (c) {
 	    *state = c;
 	    *private = 0;
 	    for (i = 0; i < NPARAM; i++)
-		param[i] = present[i] = 0;
+		param[i] = 0;
 	    for (i = 0; i < NINTER; i++)
 		inter[i] = EOS;
 	    *nparam = *ninter = 0;
@@ -205,7 +204,6 @@ label2:	switch (c) {
 	    *private = 'X';
 	    goto label1;
 	}
-	present[*nparam] = 1;
 	param[*nparam] = (param[*nparam] * 10) + (c - '0');
 	goto label1;
 label3:	if (*nparam == 0)
diff --git a/xtrap.man b/xtrap.man
index de2f0c6..d1a4938 100644
--- a/xtrap.man
+++ b/xtrap.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/xtrap/xtrap.man,v 1.2 2001/11/03 18:51:04 dawes Exp $
+.\" $XFree86: xc/programs/xtrap/xtrap.man,v 1.3 2003/05/29 21:48:13 herrb Exp $
 .TH xtrap 1
 .SH NAME
 xtrapreset, xtrapinfo, xtrapstats, xtrapout, xtrapin, xtrapchar, xtrapproto  
@@ -115,9 +115,9 @@ The \-v flag is used to force recording of all requests and input events.
 .LP
 .B xtrapin
 is used to test the input transport to the XTrap server extension.  As stated
-earler, it's input can be provided by 
+earlier, it's input can be provided by 
 .B xtrapout
-using the \-e qualifer.  While it's primary function is for testing XTrap
+using the \-e qualifier.  While it's primary function is for testing XTrap
 and serving as an example for XTrap functionality, it can reasonably used as
 a primitive "playback" client for X sessions.
 .LP
diff --git a/xtrapin.c b/xtrapin.c
index 4b826c2..f70fb85 100644
--- a/xtrapin.c
+++ b/xtrapin.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/xtrap/xtrapin.c,v 1.2 2001/12/12 00:43:50 dawes Exp $ */
+/* $XFree86: xc/programs/xtrap/xtrapin.c,v 1.3 2003/05/27 22:27:13 tsi Exp $ */
 /*
  * @DEC_COPYRIGHT@
  */
@@ -229,17 +229,16 @@ static Bool found_input_rec(FILE *ifp, file_rec *rec)
     int found = False;
     char buff[BUFSIZ];
     char junk[16L];
-    int  match;
     int  tmp[8L];
 
     while ((found != True) && (fgets(buff,BUFSIZ,ifp) != NULL))
     {
         if (!strncmp(buff, "Event:", strlen("Event:")))
         {   /* we want this record */
-            if ((match = sscanf(buff,
+            if (sscanf(buff,
              "Event: %s (%d):det=%d scr=%d (%d,%d) root=%d Msk=%d TS=%d\n",
                 junk, &(tmp[0L]), &(tmp[1L]), &(tmp[2L]), &(tmp[3L]), 
-                &(tmp[4L]), &(tmp[5L]), &(tmp[6L]), &(tmp[7L]))) != 9L)
+                &(tmp[4L]), &(tmp[5L]), &(tmp[6L]), &(tmp[7L])) != 9L)
             {
                 fprintf(stderr, "%s:  Error parsing script input!\n\t'%s'\n",
                     ProgName, buff);
diff --git a/xtrapproto.c b/xtrapproto.c
index 192de78..1fed9fa 100644
--- a/xtrapproto.c
+++ b/xtrapproto.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/xtrap/xtrapproto.c,v 1.3 2002/09/18 17:11:57 tsi Exp $ */
+/* $XFree86: xc/programs/xtrap/xtrapproto.c,v 1.4 2003/05/27 22:27:13 tsi Exp $ */
 /*
  * @DEC_COPYRIGHT@
  */
@@ -68,7 +68,6 @@ main(int argc, char *argv[])
     XETrapGetLastInpTimeRep ret_time;
     XETC    *tc;
     Display *dpy;
-    Boolean status = True;
 
     /* Connect to Server */
     appW = XtAppInitialize(&app,"XTrap",NULL,(Cardinal)0L,
@@ -82,18 +81,18 @@ main(int argc, char *argv[])
         exit(1L);
     }
     XSynchronize(dpy, True);
-    status = XEResetRequest(tc);
-    status = XEGetAvailableRequest(tc,&ret_avail);
+    XEResetRequest(tc);
+    XEGetAvailableRequest(tc,&ret_avail);
     XEPrintAvail(stdout,&ret_avail);
-    status = XEGetCurrentRequest(tc,&ret_cur);
+    XEGetCurrentRequest(tc,&ret_cur);
     XEPrintCurrent(stderr,&ret_cur);
     XETrapSetStatistics(tc, True);  /* trigger config and def stats */
-    status = XEFlushConfig(tc);
-    status = XEGetStatisticsRequest(tc, &ret_stats);
+    XEFlushConfig(tc);
+    XEGetStatisticsRequest(tc, &ret_stats);
     XEPrintStatistics(stdout, &ret_stats,tc);
-    status = XEStartTrapRequest(tc);
-    status = XESimulateXEventRequest(tc, MotionNotify, 0, 10L, 20L, 0L);
-    status = XEStopTrapRequest(tc);
+    XEStartTrapRequest(tc);
+    XESimulateXEventRequest(tc, MotionNotify, 0, 10L, 20L, 0L);
+    XEStopTrapRequest(tc);
     if (tc->protocol == 31)
     {   /* didn't work in V3.1 */
         printf("XEGetVersionRequest() & XEGetLastInpTimeRequest() are\n");
@@ -101,8 +100,8 @@ main(int argc, char *argv[])
     }
     else
     {
-        status = XEGetVersionRequest(tc,&ret_vers);
-        status = XEGetLastInpTimeRequest(tc, &ret_time);
+        XEGetVersionRequest(tc,&ret_vers);
+        XEGetLastInpTimeRequest(tc, &ret_time);
     }
     XEFreeTC(tc);
     (void)XCloseDisplay(dpy);