From 7319dc09eb492e5b2f9c87acef09ed36be88db59 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 26 Sep 2025 14:55:52 +0200 Subject: [PATCH] dix: simplify PolyText(), ProcImageText8(), ProcImageText16() Don't need to store and branch on error value, just return it. Signed-off-by: Enrico Weigelt, metux IT consult --- dix/dispatch.c | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/dix/dispatch.c b/dix/dispatch.c index 2ab7723b1f..5888546d37 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -2380,8 +2380,6 @@ ProcGetImage(ClientPtr client) int ProcPolyText(ClientPtr client) { - int err; - REQUEST(xPolyTextReq); DrawablePtr pDraw; GCPtr pGC; @@ -2389,24 +2387,17 @@ ProcPolyText(ClientPtr client) REQUEST_AT_LEAST_SIZE(xPolyTextReq); VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess); - err = PolyText(client, + return PolyText(client, pDraw, pGC, (unsigned char *) &stuff[1], ((unsigned char *) stuff) + (client->req_len << 2), stuff->x, stuff->y, stuff->reqType, stuff->drawable); - - if (err == Success) { - return Success; - } - else - return err; } int ProcImageText8(ClientPtr client) { - int err; DrawablePtr pDraw; GCPtr pGC; @@ -2415,24 +2406,17 @@ ProcImageText8(ClientPtr client) REQUEST_FIXED_SIZE(xImageTextReq, stuff->nChars); VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess); - err = ImageText(client, + return ImageText(client, pDraw, pGC, stuff->nChars, (unsigned char *) &stuff[1], stuff->x, stuff->y, stuff->reqType, stuff->drawable); - - if (err == Success) { - return Success; - } - else - return err; } int ProcImageText16(ClientPtr client) { - int err; DrawablePtr pDraw; GCPtr pGC; @@ -2441,18 +2425,12 @@ ProcImageText16(ClientPtr client) REQUEST_FIXED_SIZE(xImageTextReq, stuff->nChars << 1); VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess); - err = ImageText(client, + return ImageText(client, pDraw, pGC, stuff->nChars, (unsigned char *) &stuff[1], stuff->x, stuff->y, stuff->reqType, stuff->drawable); - - if (err == Success) { - return Success; - } - else - return err; } int