From 9b69c93543a87fe6cbf6416944d0d3fbab2fe4b4 Mon Sep 17 00:00:00 2001
From: Kaleb Keithley <kaleb@freedesktop.org>
Date: Wed, 26 Nov 2003 22:49:10 +0000
Subject: merge latest (4.3.99.16) from XFree86 (vendor) branch

---
 do_simple.c | 8 +++-----
 do_traps.c  | 4 +---
 x11perf.man | 6 +++---
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/do_simple.c b/do_simple.c
index 934303b..096cdcc 100644
--- a/do_simple.c
+++ b/do_simple.c
@@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************************/
-/* $XFree86: xc/programs/x11perf/do_simple.c,v 1.6 2001/11/03 21:59:20 dawes Exp $ */
+/* $XFree86: xc/programs/x11perf/do_simple.c,v 1.7 2003/05/27 22:26:58 tsi Exp $ */
 
 #ifndef VMS
 #include <X11/Xatom.h>
@@ -32,7 +32,6 @@ SOFTWARE.
 #include "x11perf.h"
 
 static Atom XA_PK_TEMP;
-static Window root;
 
 void 
 DoNoOp(XParms xp, Parms p, int reps)
@@ -82,7 +81,6 @@ InitGetProperty(XParms xp, Parms p, int reps)
     foo[1] = 14;
     foo[2] = 37;
     foo[3] = 73;
-    root = RootWindow (xp->d, 0);
     XA_PK_TEMP = XInternAtom (xp->d, "_PK_TEMP", False);
     XChangeProperty (
 	    xp->d, xp->w, XA_PK_TEMP, XA_INTEGER, 32,
@@ -93,7 +91,7 @@ InitGetProperty(XParms xp, Parms p, int reps)
 void 
 DoGetProperty(XParms xp, Parms p, int reps)
 {
-    int     i, status;
+    int     i;
     int     actual_format;
     unsigned long actual_length, bytes_remaining;
     unsigned char *prop;
@@ -101,7 +99,7 @@ DoGetProperty(XParms xp, Parms p, int reps)
     Atom actual_type;
 
     for (i = 0; i != reps; i++) {
-	status = XGetWindowProperty (
+	XGetWindowProperty (
 		xp->d, xp->w, XA_PK_TEMP, 0, 4,
 		False, AnyPropertyType, &actual_type, &actual_format,
 		&actual_length, &bytes_remaining, &prop);
diff --git a/do_traps.c b/do_traps.c
index 4c0b4ce..9501563 100644
--- a/do_traps.c
+++ b/do_traps.c
@@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************************/
-/* $XFree86: xc/programs/x11perf/do_traps.c,v 1.9 2002/12/04 10:28:08 eich Exp $ */
+/* $XFree86: xc/programs/x11perf/do_traps.c,v 1.10 2003/05/27 22:26:58 tsi Exp $ */
 
 #include "x11perf.h"
 #include "bitmaps.h"
@@ -219,7 +219,6 @@ void
 DoFixedTrapezoids(XParms xp, Parms p, int reps)
 {
     int		i;
-    XTrapezoid	*curTrap;
     Picture	white, black, src, dst;
 
     white = XftDrawSrcPicture (aadraw, &aawhite);
@@ -228,7 +227,6 @@ DoFixedTrapezoids(XParms xp, Parms p, int reps)
 
     src = black;
     for (i = 0; i != reps; i++) {
-        curTrap = traps;
 	XRenderCompositeTrapezoids (xp->d, PictOpOver, src, dst, maskFormat,
 				    0, 0, traps, p->objects);
         if (src == black)
diff --git a/x11perf.man b/x11perf.man
index f2c78cb..e91eefd 100644
--- a/x11perf.man
+++ b/x11perf.man
@@ -24,7 +24,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/x11perf/x11perf.man,v 1.8 2001/12/14 20:01:14 dawes Exp $
+.\" $XFree86: xc/programs/x11perf/x11perf.man,v 1.9 2003/05/29 21:48:11 herrb Exp $
 .\"
 .TH X11PERF 1 __xorgversion__
 .SH NAME
@@ -47,7 +47,7 @@ Since workstations are not used as standalone graphics engines, but as
 super-terminals, 
 .I x11perf 
 measures window management performance as well as
-traditional graphics performace.  
+traditional graphics performance.  
 .I x11perf 
 includes benchmarks for the time it
 takes to create and map windows (as when you start up an application); to map a
@@ -223,7 +223,7 @@ StaticColor, PseudoColor, TrueColor, or DirectColor.  (default is the default
 visual).
 .TP 14
 .B \-reps <n>
-Specify the repetion count (Default is number that takes aprox. 5 seconds)
+Specify the repetition count (Default is number that takes aprox. 5 seconds)
 .TP 14
 .B \-subs <s0 s1 ...>
 Specify the number of sub windows to use in the Window tests.
-- 
cgit v1.2.3