diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-12-05 18:29:27 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-12-13 13:24:00 +1000 |
| commit | c81cdb0862e2184f033b3933e6bacbe0809ef2c0 (patch) | |
| tree | 9f42b39357574cc17c6dde10c000b655035be6ac | |
| parent | 6368c2aa4613a7c7eb0e8afca8d41f1a9bc4fc4d (diff) | |
dix: replace conversion errors with BUG_WARN_MSG
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
| -rw-r--r-- | dix/events.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/dix/events.c b/dix/events.c index ced29f7c7..705b07995 100644 --- a/dix/events.c +++ b/dix/events.c @@ -4149,8 +4149,9 @@ DeliverGrabbedEvent(InternalEvent *event, DeviceIntPtr thisDev, GetEventFilter(thisDev, core), grab); } - } else if (rc != BadMatch) - ErrorF("[dix] DeliverGrabbedEvent. Core conversion failed.\n"); + } else + BUG_WARN_MSG(rc != BadMatch, "%s: Core conversion failed on %d with %d\n", + thisDev->name, event->any.type, rc); } if (!deliveries) @@ -4164,9 +4165,9 @@ DeliverGrabbedEvent(InternalEvent *event, DeviceIntPtr thisDev, FixUpEventFromWindow(pSprite, xi2, grab->window, None, TRUE); /* XXX: XACE */ deliveries = TryClientEvents(rClient(grab), thisDev, xi2, 1, mask, 1, grab); - } else if (rc != BadMatch) - ErrorF("[dix] %s: XI2 conversion failed in DGE (%d, %d). Skipping delivery.\n", - thisDev->name, event->any.type, rc); + } else + BUG_WARN_MSG(rc != BadMatch, "%s: XI2 conversion failed on %d with %d\n", + thisDev->name, event->any.type, rc); } if (!deliveries) @@ -4197,9 +4198,9 @@ DeliverGrabbedEvent(InternalEvent *event, DeviceIntPtr thisDev, GetEventFilter(thisDev, xi), grab); } - } else if (rc != BadMatch) - ErrorF("[dix] %s: XI conversion failed in DGE (%d, %d). Skipping delivery.\n", - thisDev->name, event->any.type, rc); + } else + BUG_WARN_MSG(rc != BadMatch, "%s: XI conversion failed on %d with %d\n", + thisDev->name, event->any.type, rc); } if (deliveries && (event->any.type == ET_Motion)) |