XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

dix: dixutils: fix signedness of numHandlers and sizeHandlers

Browse Source 
These are used as counters / sizes, and we're getting lots of warnings
on signedness mismatches. So use size_t instead of (signed) int here.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-09-15 19:00:32 +02:00
committed by Enrico Weigelt
parent 12b003a975
commit 4edc5ceaf7
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
dix/dixutils.c
View File

@@ -326,8 +326,8 @@ typedef struct _BlockHandler {
} BlockHandlerRec, *BlockHandlerPtr;
static BlockHandlerPtr handlers;
static int numHandlers;
static int sizeHandlers;
static size_t numHandlers;
static size_t sizeHandlers;
static Bool inHandler;
static Bool handlerDeleted;
@@ -339,7 +339,7 @@ void
BlockHandler(void *pTimeout)
{
++inHandler;
for (int i = 0; i < numHandlers; i++)
for (size_t i = 0; i < numHandlers; i++)
if (!handlers[i].deleted)
(*handlers[i].BlockHandler) (handlers[i].blockData, pTimeout);
@@ -356,9 +356,9 @@ BlockHandler(void *pTimeout)
}
if (handlerDeleted) {
for (int i = 0; i < numHandlers;)
for (size_t i = 0; i < numHandlers;)
if (handlers[i].deleted) {
for (int j = i; j < numHandlers - 1; j++)
for (size_t j = i; j < numHandlers - 1; j++)
handlers[j] = handlers[j + 1];
numHandlers--;
}
@@ -389,13 +389,13 @@ WakeupHandler(int result)
walkScreen->WakeupHandler(walkScreen, result);
}
for (int i = numHandlers - 1; i >= 0; i--)
if (!handlers[i].deleted)
(*handlers[i].WakeupHandler) (handlers[i].blockData, result);
for (size_t i = numHandlers; i > 0; i--)
if (!handlers[i-1].deleted)
handlers[i-1].WakeupHandler(handlers[i-1].blockData, result);
if (handlerDeleted) {
for (int i = 0; i < numHandlers;)
for (size_t i = 0; i < numHandlers;)
if (handlers[i].deleted) {
for (int j = i; j < numHandlers - 1; j++)
for (size_t j = i; j < numHandlers - 1; j++)
handlers[j] = handlers[j + 1];
numHandlers--;
}
@@ -438,7 +438,7 @@ RemoveBlockAndWakeupHandlers(ServerBlockHandlerProcPtr blockHandler,
ServerWakeupHandlerProcPtr wakeupHandler,
void *blockData)
{
for (int i = 0; i < numHandlers; i++)
for (size_t i = 0; i < numHandlers; i++)
if (handlers[i].BlockHandler == blockHandler &&
handlers[i].WakeupHandler == wakeupHandler &&
handlers[i].blockData == blockData) {