From 9c53c6cf76bbf6e28da4a822e2666a4af53dc498 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed, 11 Jun 2025 13:43:36 -0700
Subject: [PATCH] Revert "randr: ProcRRGetCrtcInfo(): use locally scoped
 variables"

This reverts commit 90abc95c85020a2d2e02246a297d26261dd06c33.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2012>
---
 randr/rrcrtc.c | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c
index c0127534a..4feccbb87 100644
--- a/randr/rrcrtc.c
+++ b/randr/rrcrtc.c
@@ -1148,19 +1148,28 @@ 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);
 
-    Bool leased = RRCrtcIsLeased(crtc);
+    leased = RRCrtcIsLeased(crtc);
 
     /* All crtcs must be associated with screens before client
      * requests are processed
      */
-    ScreenPtr pScreen = crtc->pScreen;
-    rrScrPrivPtr pScrPriv = rrGetScrPriv(pScreen);
+    pScreen = crtc->pScreen;
+    pScrPriv = rrGetScrPriv(pScreen);
 
-    RRModePtr mode = crtc->mode;
+    mode = crtc->mode;
 
     xRRGetCrtcInfoReply rep = {
         .type = X_Reply,
@@ -1174,7 +1183,6 @@ 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))
@@ -1185,7 +1193,6 @@ 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;
@@ -1194,9 +1201,9 @@ ProcRRGetCrtcInfo(ClientPtr client)
         }
         rep.mode = mode ? mode->mode.id : 0;
         rep.nOutput = crtc->numOutputs;
-        for (int i = 0; i < pScrPriv->numOutputs; i++) {
+        for (i = 0; i < pScrPriv->numOutputs; i++) {
             if (!RROutputIsLeased(pScrPriv->outputs[i])) {
-                for (int j = 0; j < pScrPriv->outputs[i]->numCrtcs; j++)
+                for (j = 0; j < pScrPriv->outputs[i]->numCrtcs; j++)
                     if (pScrPriv->outputs[i]->crtcs[j] == crtc)
                         rep.nPossibleOutput++;
             }
@@ -1211,19 +1218,18 @@ ProcRRGetCrtcInfo(ClientPtr client)
                 return BadAlloc;
         }
 
-        RROutput *outputs = (RROutput *) extra;
-        RROutput *possible = (RROutput *) (outputs + rep.nOutput);
+        outputs = (RROutput *) extra;
+        possible = (RROutput *) (outputs + rep.nOutput);
 
-        for (int i = 0; i < crtc->numOutputs; i++) {
+        for (i = 0; i < crtc->numOutputs; i++) {
             outputs[i] = crtc->outputs[i]->id;
             if (client->swapped)
                 swapl(&outputs[i]);
         }
-
-        int k = 0;
-        for (int i = 0; i < pScrPriv->numOutputs; i++) {
+        k = 0;
+        for (i = 0; i < pScrPriv->numOutputs; i++) {
             if (!RROutputIsLeased(pScrPriv->outputs[i])) {
-                for (int j = 0; j < pScrPriv->outputs[i]->numCrtcs; j++)
+                for (j = 0; j < pScrPriv->outputs[i]->numCrtcs; j++)
                     if (pScrPriv->outputs[i]->crtcs[j] == crtc) {
                         possible[k] = pScrPriv->outputs[i]->id;
                         if (client->swapped)