hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-11-14 05:14:45 +00:00
Code Issues Projects Releases Wiki Activity

dix: colormap: declare variables where needed in ResizeVisualArray()

Browse source 
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2026-05-05 13:01:21 +02:00 • committed by Enrico Weigelt
commit ef4b23df9e
1 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
dix/colormap.c
View file

@ -2511,16 +2511,10 @@ _colormap_find_resource(void *value, XID id, void *cdata)
Bool
ResizeVisualArray(ScreenPtr pScreen, int new_visual_count, DepthPtr depth)
{
struct colormap_lookup_data cdata;
int numVisuals;
VisualPtr visuals;
XID *vids, vid;
int first_new_vid, first_new_visual;
int first_new_vid = depth->numVids;
int first_new_visual = pScreen->numVisuals;
first_new_vid = depth->numVids;
first_new_visual = pScreen->numVisuals;
vids = reallocarray(depth->vids, depth->numVids + new_visual_count,
XID *vids = reallocarray(depth->vids, depth->numVids + new_visual_count,
sizeof(XID));
if (!vids)
return FALSE;
@ -2528,21 +2522,23 @@ ResizeVisualArray(ScreenPtr pScreen, int new_visual_count, DepthPtr depth)
/* its realloced now no going back if we fail the next one */
depth->vids = vids;
numVisuals = pScreen->numVisuals + new_visual_count;
visuals = reallocarray(pScreen->visuals, numVisuals, sizeof(VisualRec));
int numVisuals = pScreen->numVisuals + new_visual_count;
VisualPtr visuals = reallocarray(pScreen->visuals, numVisuals, sizeof(VisualRec));
if (!visuals) {
return FALSE;
}
cdata.visuals = visuals;
cdata.pScreen = pScreen;
struct colormap_lookup_data cdata = {
.visuals = visuals,
.pScreen = pScreen,
};
FindClientResourcesByType(serverClient, X11_RESTYPE_COLORMAP,
_colormap_find_resource, &cdata);
pScreen->visuals = visuals;
for (int i = 0; i < new_visual_count; i++) {
vid = dixAllocServerXID();
XID vid = dixAllocServerXID();
pScreen->visuals[first_new_visual + i].vid = vid;
vids[first_new_vid + i] = vid;
}