From 90abc95c85020a2d2e02246a297d26261dd06c33 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Mon, 29 Jul 2024 17:05:28 +0200
Subject: [PATCH] randr: ProcRRGetCrtcInfo(): use locally scoped variables

Improve readability by moving the variables into local scopes.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1794>
---
 randr/rrcrtc.c | 36 +++++++++++++++---------------------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c
index 4feccbb87..c0127534a 100644
--- a/randr/rrcrtc.c
+++ b/randr/rrcrtc.c
@@ -1148,28 +1148,19 @@ ProcRRGetCrtcInfo(ClientPtr client)
     RRCrtcPtr crtc;
     CARD8 *extra = NULL;
     unsigned long extraLen = 0;
-    ScreenPtr pScreen;
-    rrScrPrivPtr pScrPriv;
-    RRModePtr mode;
-    RROutput *outputs;
-    RROutput *possible;
-    int i, j, k;
-    int width, height;
-    BoxRec panned_area;
-    Bool leased;
 
     REQUEST_SIZE_MATCH(xRRGetCrtcInfoReq);
     VERIFY_RR_CRTC(stuff->crtc, crtc, DixReadAccess);
 
-    leased = RRCrtcIsLeased(crtc);
+    Bool leased = RRCrtcIsLeased(crtc);
 
     /* All crtcs must be associated with screens before client
      * requests are processed
      */
-    pScreen = crtc->pScreen;
-    pScrPriv = rrGetScrPriv(pScreen);
+    ScreenPtr pScreen = crtc->pScreen;
+    rrScrPrivPtr pScrPriv = rrGetScrPriv(pScreen);
 
-    mode = crtc->mode;
+    RRModePtr mode = crtc->mode;
 
     xRRGetCrtcInfoReply rep = {
         .type = X_Reply,
@@ -1183,6 +1174,7 @@ ProcRRGetCrtcInfo(ClientPtr client)
         rep.rotation = RR_Rotate_0;
         rep.rotations = RR_Rotate_0;
     } else {
+        BoxRec panned_area;
         if (pScrPriv->rrGetPanning &&
             pScrPriv->rrGetPanning(pScreen, crtc, &panned_area, NULL, NULL) &&
             (panned_area.x2 > panned_area.x1) && (panned_area.y2 > panned_area.y1))
@@ -1193,6 +1185,7 @@ ProcRRGetCrtcInfo(ClientPtr client)
             rep.height = panned_area.y2 - panned_area.y1;
         }
         else {
+            int width, height;
             RRCrtcGetScanoutSize(crtc, &width, &height);
             rep.x = crtc->x;
             rep.y = crtc->y;
@@ -1201,9 +1194,9 @@ ProcRRGetCrtcInfo(ClientPtr client)
         }
         rep.mode = mode ? mode->mode.id : 0;
         rep.nOutput = crtc->numOutputs;
-        for (i = 0; i < pScrPriv->numOutputs; i++) {
+        for (int i = 0; i < pScrPriv->numOutputs; i++) {
             if (!RROutputIsLeased(pScrPriv->outputs[i])) {
-                for (j = 0; j < pScrPriv->outputs[i]->numCrtcs; j++)
+                for (int j = 0; j < pScrPriv->outputs[i]->numCrtcs; j++)
                     if (pScrPriv->outputs[i]->crtcs[j] == crtc)
                         rep.nPossibleOutput++;
             }
@@ -1218,18 +1211,19 @@ ProcRRGetCrtcInfo(ClientPtr client)
                 return BadAlloc;
         }
 
-        outputs = (RROutput *) extra;
-        possible = (RROutput *) (outputs + rep.nOutput);
+        RROutput *outputs = (RROutput *) extra;
+        RROutput *possible = (RROutput *) (outputs + rep.nOutput);
 
-        for (i = 0; i < crtc->numOutputs; i++) {
+        for (int i = 0; i < crtc->numOutputs; i++) {
             outputs[i] = crtc->outputs[i]->id;
             if (client->swapped)
                 swapl(&outputs[i]);
         }
-        k = 0;
-        for (i = 0; i < pScrPriv->numOutputs; i++) {
+
+        int k = 0;
+        for (int i = 0; i < pScrPriv->numOutputs; i++) {
             if (!RROutputIsLeased(pScrPriv->outputs[i])) {
-                for (j = 0; j < pScrPriv->outputs[i]->numCrtcs; j++)
+                for (int j = 0; j < pScrPriv->outputs[i]->numCrtcs; j++)
                     if (pScrPriv->outputs[i]->crtcs[j] == crtc) {
                         possible[k] = pScrPriv->outputs[i]->id;
                         if (client->swapped)