Declare variables at the start of each block, as required

diff --git a/unix/xserver/hw/vnc/vncExt.c b/unix/xserver/hw/vnc/vncExt.c
index 2330eee8b0dc9c983215e5f3f51820c6071ed7bb..33f51003e07924e23b9b921ee9a2bb84016774d7 100644 (file)
--- a/unix/xserver/hw/vnc/vncExt.c
+++ b/unix/xserver/hw/vnc/vncExt.c
@@ -123,6 +123,8 @@ int vncNotifyQueryConnect(void)
 
 void vncClientCutText(const char* str, int len)
 {
+  xVncExtClientCutTextNotifyEvent ev;
+
   if (clientCutText != NULL)
     free(clientCutText);
   clientCutTextLen = 0;
@@ -136,7 +138,6 @@ void vncClientCutText(const char* str, int len)
   memcpy(clientCutText, str, len);
   clientCutTextLen = len;
 
-  xVncExtClientCutTextNotifyEvent ev;
   ev.type = vncEventBase + VncExtClientCutTextNotify;
   for (struct VncInputSelect* cur = vncInputSelectHead; cur; cur = cur->next) {
     if (cur->mask & VncExtClientCutTextMask) {
@@ -164,6 +165,7 @@ void vncClientCutText(const char* str, int len)
 static int ProcVncExtSetParam(ClientPtr client)
 {
   char *param;
+  xVncExtSetParamReply rep;
 
   REQUEST(xVncExtSetParamReq);
   REQUEST_FIXED_SIZE(xVncExtSetParamReq, stuff->paramLen);
@@ -174,7 +176,6 @@ static int ProcVncExtSetParam(ClientPtr client)
   strncpy(param, (char*)&stuff[1], stuff->paramLen);
   param[stuff->paramLen] = '\0';
 
-  xVncExtSetParamReply rep;
   rep.type = X_Reply;
   rep.length = 0;
   rep.success = 0;
@@ -233,6 +234,7 @@ static int ProcVncExtGetParam(ClientPtr client)
   char* param;
   char* value;
   size_t len;
+  xVncExtGetParamReply rep;
 
   REQUEST(xVncExtGetParamReq);
   REQUEST_FIXED_SIZE(xVncExtGetParamReq, stuff->paramLen);
@@ -248,7 +250,6 @@ static int ProcVncExtGetParam(ClientPtr client)
 
   free(param);
 
-  xVncExtGetParamReply rep;
   rep.type = X_Reply;
   rep.sequenceNumber = client->sequence;
   rep.success = 0;
@@ -293,6 +294,7 @@ static int ProcVncExtGetParamDesc(ClientPtr client)
   char* param;
   const char* desc;
   size_t len;
+  xVncExtGetParamDescReply rep;
 
   REQUEST(xVncExtGetParamDescReq);
   REQUEST_FIXED_SIZE(xVncExtGetParamDescReq, stuff->paramLen);
@@ -308,7 +310,6 @@ static int ProcVncExtGetParamDesc(ClientPtr client)
 
   free(param);
 
-  xVncExtGetParamDescReply rep;
   rep.type = X_Reply;
   rep.sequenceNumber = client->sequence;
   rep.success = 0;
@@ -349,16 +350,16 @@ static int SProcVncExtGetParamDesc(ClientPtr client)
 
 static int ProcVncExtListParams(ClientPtr client)
 {
+  xVncExtListParamsReply rep;
+  char *params;
+  size_t len;
+
   REQUEST(xVncExtListParamsReq);
   REQUEST_SIZE_MATCH(xVncExtListParamsReq);
 
-  xVncExtListParamsReply rep;
   rep.type = X_Reply;
   rep.sequenceNumber = client->sequence;
 
-  char *params;
-  size_t len;
-
   params = vncGetParamList();
   if (params == NULL)
     return BadAlloc;
@@ -426,10 +427,11 @@ static int SProcVncExtSetServerCutText(ClientPtr client)
 
 static int ProcVncExtGetClientCutText(ClientPtr client)
 {
+  xVncExtGetClientCutTextReply rep;
+
   REQUEST(xVncExtGetClientCutTextReq);
   REQUEST_SIZE_MATCH(xVncExtGetClientCutTextReq);
 
-  xVncExtGetClientCutTextReply rep;
   rep.type = X_Reply;
   rep.length = (clientCutTextLen + 3) >> 2;
   rep.sequenceNumber = client->sequence;
@@ -522,6 +524,7 @@ static int SProcVncExtSelectInput(ClientPtr client)
 static int ProcVncExtConnect(ClientPtr client)
 {
   char *address;
+  xVncExtConnectReply rep;
 
   REQUEST(xVncExtConnectReq);
   REQUEST_FIXED_SIZE(xVncExtConnectReq, stuff->strLen);
@@ -532,7 +535,6 @@ static int ProcVncExtConnect(ClientPtr client)
   strncpy(address, (char*)&stuff[1], stuff->strLen);
   address[stuff->strLen] = 0;
 
-  xVncExtConnectReply rep;
   rep.success = 0;
   if (vncConnectClient(address) == 0)
         rep.success = 1;
@@ -573,16 +575,17 @@ static int SProcVncExtConnect(ClientPtr client)
 
 static int ProcVncExtGetQueryConnect(ClientPtr client)
 {
-  REQUEST(xVncExtGetQueryConnectReq);
-  REQUEST_SIZE_MATCH(xVncExtGetQueryConnectReq);
-
   uint32_t opaqueId;
   const char *qcAddress, *qcUsername;
   int qcTimeout;
 
+  xVncExtGetQueryConnectReply rep;
+
+  REQUEST(xVncExtGetQueryConnectReq);
+  REQUEST_SIZE_MATCH(xVncExtGetQueryConnectReq);
+
   vncGetQueryConnect(&opaqueId, &qcAddress, &qcUsername, &qcTimeout);
 
-  xVncExtGetQueryConnectReply rep;
   rep.type = X_Reply;
   rep.sequenceNumber = client->sequence;
   rep.timeout = qcTimeout;

diff --git a/unix/xserver/hw/vnc/xvnc.c b/unix/xserver/hw/vnc/xvnc.c
index 26d8b40f79096458915661a3236c891a4aafc799..800e712bf977f69629828a0a5b3f2cf738ab606b 100644 (file)
--- a/unix/xserver/hw/vnc/xvnc.c
+++ b/unix/xserver/hw/vnc/xvnc.c
@@ -1264,6 +1264,9 @@ static RRCrtcPtr vncRandRCrtcCreate(ScreenPtr pScreen)
     RRModePtr mode;
     char name[100];
 
+    RRModePtr *modes;
+    int i, num_modes;
+
     /* First we create the CRTC... */
     crtc = RRCrtcCreate(pScreen, NULL);
 
@@ -1283,11 +1286,12 @@ static RRCrtcPtr vncRandRCrtcCreate(ScreenPtr pScreen)
     vncRandRCrtcSet(pScreen, crtc, NULL, 0, 0, RR_Rotate_0, 1, &output);
 
     /* Populate a list of default modes */
-    RRModePtr modes[sizeof(vncRandRWidths)/sizeof(*vncRandRWidths)];
-    int num_modes;
+    modes = malloc(sizeof(RRModePtr)*sizeof(vncRandRWidths)/sizeof(*vncRandRWidths));
+    if (modes == NULL)
+        return NULL;
 
     num_modes = 0;
-    for (int i = 0;i < sizeof(vncRandRWidths)/sizeof(*vncRandRWidths);i++) {
+    for (i = 0;i < sizeof(vncRandRWidths)/sizeof(*vncRandRWidths);i++) {
         mode = vncRandRModeGet(vncRandRWidths[i], vncRandRHeights[i]);
         if (mode != NULL) {
             modes[num_modes] = mode;
@@ -1297,6 +1301,8 @@ static RRCrtcPtr vncRandRCrtcCreate(ScreenPtr pScreen)
 
     RROutputSetModes(output, modes, num_modes, 0);
 
+    free(modes);
+
     return crtc;
 }
 
@@ -1405,6 +1411,10 @@ vfbScreenInit(ScreenPtr pScreen, int argc, char **argv)
     int ret;
     void *pbits;
 
+#ifdef RANDR
+    rrScrPrivPtr rp;
+#endif
+
 #if XORG >= 113
     if (!dixRegisterPrivateKey(&cmapScrPrivateKeyRec, PRIVATE_SCREEN, 0))
        return FALSE;
@@ -1539,8 +1549,6 @@ vfbScreenInit(ScreenPtr pScreen, int argc, char **argv)
     pScreen->CloseScreen = vfbCloseScreen;
 
 #ifdef RANDR
-    rrScrPrivPtr rp;
-
     ret = RRScreenInit(pScreen);
     if (!ret) return FALSE;