From f18c3122a57df9770087e5fc70ac488552222233 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel.stone@nokia.com>
Date: Thu, 20 Jul 2006 16:49:17 -0400
Subject: [PATCH] sanitise debug output

Don't spit out huge chunks of pointless ephemera, especially without
--enable-debug.
---
 hw/kdrive/src/kinput.c |  7 ++-----
 mi/mieq.c              | 10 +++++-----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index 13869c91b..d46694f9f 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -408,7 +408,9 @@ KdPointerProc(DeviceIntPtr pDevice, int onoff)
     switch (onoff)
     {
     case DEVICE_INIT:
+#ifdef DEBUG
         ErrorF("initialising pointer %s ...\n", pi->name);
+#endif
         if (!pi->driver) {
             if (!pi->driverPrivate) {
                 ErrorF("no driver specified for %s\n", pi->name);
@@ -468,7 +470,6 @@ KdPointerProc(DeviceIntPtr pDevice, int onoff)
         }
 
         if ((*pi->driver->Enable) (pi) == Success) {
-            ErrorF("initialised fine, returning success\n");
             pDev->on = TRUE;
             return Success;
         }
@@ -495,13 +496,11 @@ KdPointerProc(DeviceIntPtr pDevice, int onoff)
         return Success;
 
     case DEVICE_CLOSE:
-        ErrorF("D_C\n");
 	if (pDev->on) {
             if (!pi->driver->Disable) {
                 return BadImplementation;
             }
             (*pi->driver->Disable) (pi);
-            ErrorF("disabled\n");
             pDev->on = FALSE;
         }
 
@@ -509,10 +508,8 @@ KdPointerProc(DeviceIntPtr pDevice, int onoff)
             return BadImplementation;
 
         (*pi->driver->Fini) (pi);
-        ErrorF("finished\n");
 
         KdRemovePointer(pi);
-        ErrorF("removed\n");
         
         return Success;
     }
diff --git a/mi/mieq.c b/mi/mieq.c
index b05210c0b..062914ca6 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -101,7 +101,10 @@ mieqEnqueue (xEvent *e)
     deviceKeyButtonPointer *lastkbp = (deviceKeyButtonPointer *)
                                       &laste->event[0];
 
+#ifdef DEBUG
     ErrorF("mieqEnqueue: slamming an event on to the queue from %d\n", kbp->deviceid & DEVICE_BITS);
+#endif
+
     if (e->u.u.type == MotionNotify) {
         miPointerAbsoluteCursor(e->u.keyButtonPointer.rootX,
                                 e->u.keyButtonPointer.rootY,
@@ -135,7 +138,6 @@ mieqEnqueue (xEvent *e)
                 return;
             }
             laste->event[laste->nevents++] = *e;
-            ErrorF("put a valuator event into the queue\n");
             return;
         }
         else if (e->u.u.type == DeviceMotionNotify) {
@@ -174,9 +176,11 @@ mieqEnqueue (xEvent *e)
     if (e->u.keyButtonPointer.time < miEventQueue.lastEventTime &&
 	miEventQueue.lastEventTime - e->u.keyButtonPointer.time < 10000)
     {
+#ifdef DEBUG
         ErrorF("mieq: rewinding event time from %d to %d\n",
                miEventQueue.lastEventTime,
                miEventQueue.events[oldtail].event[0].u.keyButtonPointer.time);
+#endif
 	miEventQueue.events[oldtail].event[0].u.keyButtonPointer.time =
 	    miEventQueue.lastEventTime;
     }
@@ -186,7 +190,6 @@ mieqEnqueue (xEvent *e)
     miEventQueue.events[oldtail].pDev = pDev;
 
     miEventQueue.lastMotion = isMotion;
-    ErrorF("bottom of mieqEnqueue\n");
 }
 
 void
@@ -206,8 +209,6 @@ void mieqProcessInputEvents ()
     EventRec	*e;
     int		x, y;
 
-    ErrorF("mieqPIE: head %p, tail %p\n", miEventQueue.head, miEventQueue.tail);
-
     while (miEventQueue.head != miEventQueue.tail)
     {
 	if (screenIsSaved == SCREEN_SAVER_ON)
@@ -234,7 +235,6 @@ void mieqProcessInputEvents ()
 	    	miEventQueue.head = 0;
 	    else
 	    	++miEventQueue.head;
-            ErrorF("calling pIP from mieqPIE\n");
             (*e->pDev->public.processInputProc)(e->event, e->pDev, e->nevents);
 	}
     }