From 117458d2db49efd3f04432ff45871b44c7d4ad57 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 7 Dec 2007 20:18:49 +1030 Subject: [PATCH] mi: change infamous "Tossed event ..." error for something more explanatory. Few whitespace errors fixed. Two ErrorF's prefixed with [mi]. --- mi/mieq.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/mi/mieq.c b/mi/mieq.c index 5dcc40461..15155124c 100644 --- a/mi/mieq.c +++ b/mi/mieq.c @@ -142,7 +142,7 @@ mieqEnqueue(DeviceIntPtr pDev, xEvent *e) lastkbp = (deviceKeyButtonPointer *) laste->events->event; if (laste->nevents > 6) { - ErrorF("mieqEnqueue: more than six valuator events; dropping.\n"); + ErrorF("[mi] mieqEnqueue: more than six valuator events; dropping.\n"); return; } if (oldtail == miEventQueue.head || @@ -151,7 +151,7 @@ mieqEnqueue(DeviceIntPtr pDev, xEvent *e) lastkbp->type == DeviceButtonRelease) || ((lastkbp->deviceid & DEVICE_BITS) != (v->deviceid & DEVICE_BITS))) { - ErrorF("mieqEnequeue: out-of-order valuator event; dropping.\n"); + ErrorF("[mi] mieqEnequeue: out-of-order valuator event; dropping.\n"); return; } @@ -164,12 +164,13 @@ mieqEnqueue(DeviceIntPtr pDev, xEvent *e) oldtail = (oldtail - 1) % QUEUE_SIZE; } else { - newtail = (oldtail + 1) % QUEUE_SIZE; - /* Toss events which come in late. Usually this means your server's + newtail = (oldtail + 1) % QUEUE_SIZE; + /* Toss events which come in late. Usually this means your server's * stuck in an infinite loop somewhere, but SIGIO is still getting * handled. */ - if (newtail == miEventQueue.head) { - ErrorF("tossed event which came in late\n"); + if (newtail == miEventQueue.head) { + ErrorF("[mi] EQ overflowing. The server is probably stuck " + "in an infinite loop.\n"); return; } miEventQueue.tail = newtail;