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

include: regionstr.h: fix int type mismatch in RegionNumRects() and RegionSize()

Browse Source 
Fix compiler warnings by explicit type casts.

In this case, we know that those values can't be bigger than int can take,
neither become negative.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-08-08 15:11:43 +02:00
committed by Enrico Weigelt
parent 35c075e2c4
commit 8d2860fd35
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/regionstr.h
View File

@@ -85,13 +85,13 @@ RegionNar(RegionPtr reg)
static inline int
RegionNumRects(RegionPtr reg)
{
return ((reg)->data ? (reg)->data->numRects : 1);
return (int)(reg->data ? reg->data->numRects : 1);
}
static inline int
RegionSize(RegionPtr reg)
{
return ((reg)->data ? (reg)->data->size : 0);
return (int)(reg->data ? reg->data->size : 0);
}
static inline BoxPtr
@@ -115,13 +115,13 @@ RegionBox(RegionPtr reg, int i)
static inline BoxPtr
RegionTop(RegionPtr reg)
{
return RegionBox(reg, (reg)->data->numRects);
return RegionBox(reg, (int)reg->data->numRects);
}
static inline BoxPtr
RegionEnd(RegionPtr reg)
{
return RegionBox(reg, (reg)->data->numRects - 1);
return RegionBox(reg, (int)reg->data->numRects - 1);
}
static inline size_t
@@ -134,7 +134,7 @@ RegionSizeof(size_t n)
}
static inline void
RegionInit(RegionPtr _pReg, BoxPtr _rect, int _size)
RegionInit(RegionPtr _pReg, BoxPtr _rect, size_t _size)
{
if ((_rect) != NULL) {
(_pReg)->extents = *(_rect);
@@ -145,7 +145,7 @@ RegionInit(RegionPtr _pReg, BoxPtr _rect, int _size)
(_pReg)->extents = RegionEmptyBox;
if (((_size) > 1) && ((rgnSize = RegionSizeof(_size)) > 0) &&
(((_pReg)->data = (RegDataPtr) calloc(1, rgnSize)) != NULL)) {
(_pReg)->data->size = (_size);
(_pReg)->data->size = (long)(_size);
(_pReg)->data->numRects = 0;
}
else