XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 08:04:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

render: ProcRenderAddGlyphs(): move locally used variables into local scope

Browse Source 
make the variable's it easier to understand.

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

21
render/render.c
View File

@@ -975,8 +975,6 @@ ProcRenderAddGlyphs(ClientPtr client)
unsigned int size;
int err;
int i;
PicturePtr pSrc = NULL, pDst = NULL;
PixmapPtr pSrcPix = NULL, pDstPix = NULL;
CARD32 component_alpha;
REQUEST_AT_LEAST_SIZE(xRenderAddGlyphsReq);
@@ -1069,7 +1067,7 @@ ProcRenderAddGlyphs(ClientPtr client)
if (!width || !height)
break;
pSrcPix = GetScratchPixmapHeader(walkScreen,
PixmapPtr pSrcPix = GetScratchPixmapHeader(walkScreen,
width, height,
depth, depth, -1, bits);
if (!pSrcPix) {
@@ -1077,24 +1075,27 @@ ProcRenderAddGlyphs(ClientPtr client)
goto bail;
}
pSrc = CreatePicture(0, &pSrcPix->drawable,
PicturePtr pSrc = CreatePicture(0, &pSrcPix->drawable,
glyphSet->format, 0, NULL,
serverClient, &error);
if (!pSrc) {
err = BadAlloc;
FreeScratchPixmapHeader(pSrcPix);
goto bail;
}
pDstPix = walkScreen->CreatePixmap(walkScreen,
PixmapPtr pDstPix = walkScreen->CreatePixmap(walkScreen,
width, height, depth,
CREATE_PIXMAP_USAGE_GLYPH_PICTURE);
if (!pDstPix) {
err = BadAlloc;
FreeScratchPixmapHeader(pSrcPix);
FreePicture((void *) pSrc, 0);
goto bail;
}
pDst = CreatePicture(0, &pDstPix->drawable,
PicturePtr pDst = CreatePicture(0, &pDstPix->drawable,
glyphSet->format,
CPComponentAlpha, &component_alpha,
serverClient, &error);
@@ -1107,6 +1108,8 @@ ProcRenderAddGlyphs(ClientPtr client)
if (!pDst) {
err = BadAlloc;
FreePicture((void *) pSrc, 0);
FreeScratchPixmapHeader(pSrcPix);
goto bail;
}
@@ -1115,9 +1118,7 @@ ProcRenderAddGlyphs(ClientPtr client)
None, pDst, 0, 0, 0, 0, 0, 0, width, height);
FreePicture((void *) pSrc, 0);
pSrc = NULL;
FreeScratchPixmapHeader(pSrcPix);
pSrcPix = NULL;
}
memcpy(glyph_new->glyph->sha1, glyph_new->sha1, 20);
@@ -1147,10 +1148,6 @@ ProcRenderAddGlyphs(ClientPtr client)
free(glyphsBase);
return Success;
bail:
if (pSrc)
FreePicture((void *) pSrc, 0);
if (pSrcPix)
FreeScratchPixmapHeader(pSrcPix);
for (i = 0; i < nglyphs; i++) {
if (glyphs[i].glyph) {
--glyphs[i].glyph->refcnt;