From 2824899d280f2b169b3e745b222f9a981c1ce5f7 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri, 16 Aug 2013 18:27:28 -0700
Subject: Rearrange some variable declarations & initializations in XKB

Little things noticed during XKB restyling that seemed to make the
code easier to read.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
---
 nx-X11/lib/X11/XKBGeom.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'nx-X11/lib/X11/XKBGeom.c')

diff --git a/nx-X11/lib/X11/XKBGeom.c b/nx-X11/lib/X11/XKBGeom.c
index 3666d16fa..1014c9adb 100644
--- a/nx-X11/lib/X11/XKBGeom.c
+++ b/nx-X11/lib/X11/XKBGeom.c
@@ -261,13 +261,11 @@ _XkbReadGeomProperties(XkbReadBufferPtr buf,
         return Success;
     if ((rtrn = XkbAllocGeomProps(geom, rep->nProperties)) == Success) {
         register int i;
-        register Bool ok;
-        char *name, *value;
+        register Bool ok = True;
 
-        ok = True;
         for (i = 0; (i < rep->nProperties) && ok; i++) {
-            name = NULL;
-            value = NULL;
+            char *name = NULL;
+            char *value = NULL;
             ok = _XkbGetReadBufferCountedString(buf, &name) && ok;
             ok = _XkbGetReadBufferCountedString(buf, &value) && ok;
             ok = ok && (XkbAddGeomProperty(geom, name, value) != NULL);
@@ -317,10 +315,9 @@ _XkbReadGeomColors(XkbReadBufferPtr buf,
         return Success;
     if ((rtrn = XkbAllocGeomColors(geom, rep->nColors)) == Success) {
         register int i;
-        char *spec;
 
         for (i = 0; i < rep->nColors; i++) {
-            spec = NULL;
+            char *spec = NULL;
             if (!_XkbGetReadBufferCountedString(buf, &spec))
                 rtrn = BadLength;
             else if (XkbAddGeomColor(geom, spec, geom->num_colors) == NULL)
@@ -531,10 +528,11 @@ _XkbReadGeomSections(XkbReadBufferPtr buf,
         section->priority = sectionWire->priority;
         if (sectionWire->nRows > 0) {
             register int r;
-            XkbRowPtr row;
-            xkbRowWireDesc *rowWire;
 
             for (r = 0; r < sectionWire->nRows; r++) {
+                XkbRowPtr row;
+                xkbRowWireDesc *rowWire;
+
                 rowWire = (xkbRowWireDesc *)
                     _XkbGetReadBufferPtr(buf, SIZEOF(xkbRowWireDesc));
                 if (!rowWire)
@@ -547,10 +545,11 @@ _XkbReadGeomSections(XkbReadBufferPtr buf,
                 row->vertical = rowWire->vertical;
                 if (rowWire->nKeys > 0) {
                     register int k;
-                    XkbKeyPtr key;
-                    xkbKeyWireDesc *keyWire;
 
                     for (k = 0; k < rowWire->nKeys; k++) {
+                        XkbKeyPtr key;
+                        xkbKeyWireDesc *keyWire;
+
                         keyWire = (xkbKeyWireDesc *)
                             _XkbGetReadBufferPtr(buf, SIZEOF(xkbKeyWireDesc));
                         if (!keyWire)
-- 
cgit v1.2.3