summaryrefslogtreecommitdiff
path: root/dix
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2015-09-01 11:20:04 -0700
committerAdam Jackson <ajax@redhat.com>2016-07-18 15:27:51 -0400
commitfb0802113b4c57819cba15d64baf79bf4148607e (patch)
treef040ef9bac4f3a13d4bf9191aa28503a93cd7709 /dix
parent410bc047480a9f98df678dc850bc6b99c3cfb5bf (diff)
Remove readmask from screen block/wakeup handler
With no users of the interface needing the readmask anymore, we can remove it from the argument passed to these functions. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'dix')
-rw-r--r--dix/dixutils.c18
1 files changed, 6 insertions, 12 deletions
diff --git a/dix/dixutils.c b/dix/dixutils.c
index 3d2e7a3c5..d72892943 100644
--- a/dix/dixutils.c
+++ b/dix/dixutils.c
@@ -385,16 +385,13 @@ BlockHandler(void *pTimeout, void *pReadmask)
++inHandler;
for (i = 0; i < numHandlers; i++)
if (!handlers[i].deleted)
- (*handlers[i].BlockHandler) (handlers[i].blockData,
- pTimeout, pReadmask);
+ (*handlers[i].BlockHandler) (handlers[i].blockData, pTimeout, pReadmask);
for (i = 0; i < screenInfo.numGPUScreens; i++)
- (*screenInfo.gpuscreens[i]->BlockHandler) (screenInfo.gpuscreens[i],
- pTimeout, pReadmask);
+ (*screenInfo.gpuscreens[i]->BlockHandler) (screenInfo.gpuscreens[i], pTimeout);
for (i = 0; i < screenInfo.numScreens; i++)
- (*screenInfo.screens[i]->BlockHandler) (screenInfo.screens[i],
- pTimeout, pReadmask);
+ (*screenInfo.screens[i]->BlockHandler) (screenInfo.screens[i], pTimeout);
if (handlerDeleted) {
for (i = 0; i < numHandlers;)
@@ -422,15 +419,12 @@ WakeupHandler(int result, void *pReadmask)
++inHandler;
for (i = 0; i < screenInfo.numScreens; i++)
- (*screenInfo.screens[i]->WakeupHandler) (screenInfo.screens[i],
- result, pReadmask);
+ (*screenInfo.screens[i]->WakeupHandler) (screenInfo.screens[i], result);
for (i = 0; i < screenInfo.numGPUScreens; i++)
- (*screenInfo.gpuscreens[i]->WakeupHandler) (screenInfo.gpuscreens[i],
- result, pReadmask);
+ (*screenInfo.gpuscreens[i]->WakeupHandler) (screenInfo.gpuscreens[i], result);
for (i = numHandlers - 1; i >= 0; i--)
if (!handlers[i].deleted)
- (*handlers[i].WakeupHandler) (handlers[i].blockData,
- result, pReadmask);
+ (*handlers[i].WakeupHandler) (handlers[i].blockData, result, pReadmask);
if (handlerDeleted) {
for (i = 0; i < numHandlers;)
if (handlers[i].deleted) {