makekeys: Coding style cleanup

Mostly tab-to-space conversion, but a couple other nits, too.

diff --git a/src/makekeys.c b/src/makekeys.c
index eacd180..6185656 100644 (file)
--- a/src/makekeys.c
+++ b/src/makekeys.c
@@ -1,5 +1,3 @@
-/* $Xorg: makekeys.c,v 1.5 2001/02/09 02:03:40 $ */
-/* $XdotOrg: lib/X11/src/util/makekeys.c,v 1.5 2005-07-03 07:00:56 daniels Exp $ */
 /*
 
 Copyright 1990, 1998  The Open Group
@@ -27,7 +25,6 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: $ */
 
 /* Constructs hash tables for XStringToKeysym and XKeysymToString. */
 
@@ -45,8 +42,8 @@ typedef unsigned long Signature;
 #define KTNUM 4000
 
 static struct info {
-    char       *name;
-    KeySym     val;
+    char        *name;
+    KeySym      val;
 } info[KTNUM];
 
 #define MIN_REHASH 15
@@ -77,44 +74,44 @@ main(int argc, char *argv[])
 
 
     while (fgets(buf, sizeof(buf), stdin)) {
-       i = sscanf(buf, "#define XK_%127s 0x%lx", key, &info[ksnum].val);
-       if (i != 2) {
-           i = sscanf(buf, "#define XK_%127s XK_%127s", key, alias);
-           if (i != 2)
-               continue;
-           for (i = ksnum - 1; i >= 0; i--) {
-               if (strcmp(info[i].name, alias) == 0) {
-                   info[ksnum].val = info[i].val;
-                   break;
-               }
-           }
-           if (i < 0) {  /* Didn't find a match */
-               fprintf(stderr,
-                   "can't find matching definition %s for keysym %s\n",
-                   alias, key);
-               continue;
-           }
-       }
-       if (info[ksnum].val == XK_VoidSymbol)
-           info[ksnum].val = 0;
-       if (info[ksnum].val > 0x1fffffff) {
-           fprintf(stderr,
-                   "ignoring illegal keysym (%s), remove it from .h file!\n",
-                   key);
-           continue;
-       }
-       name = malloc((unsigned)strlen(key)+1);
-       if (!name) {
-           fprintf(stderr, "makekeys: out of memory!\n");
-           exit(1);
-       }
-       (void)strcpy(name, key);
-       info[ksnum].name = name;
-       ksnum++;
-       if (ksnum == KTNUM) {
-           fprintf(stderr, "makekeys: too many keysyms!\n");
-           exit(1);
-       }
+        i = sscanf(buf, "#define XK_%127s 0x%lx", key, &info[ksnum].val);
+        if (i != 2) {
+            i = sscanf(buf, "#define XK_%127s XK_%127s", key, alias);
+            if (i != 2)
+                continue;
+            for (i = ksnum - 1; i >= 0; i--) {
+                if (strcmp(info[i].name, alias) == 0) {
+                    info[ksnum].val = info[i].val;
+                    break;
+                }
+            }
+            if (i < 0) {  /* Didn't find a match */
+                fprintf(stderr,
+                        "can't find matching definition %s for keysym %s\n",
+                        alias, key);
+                continue;
+            }
+        }
+        if (info[ksnum].val == XK_VoidSymbol)
+            info[ksnum].val = 0;
+        if (info[ksnum].val > 0x1fffffff) {
+            fprintf(stderr,
+                    "ignoring illegal keysym (%s), remove it from .h file!\n",
+                    key);
+            continue;
+        }
+        name = malloc((unsigned)strlen(key) + 1);
+        if (!name) {
+            fprintf(stderr, "makekeys: out of memory!\n");
+            exit(1);
+        }
+        (void)strcpy(name, key);
+        info[ksnum].name = name;
+        ksnum++;
+        if (ksnum == KTNUM) {
+            fprintf(stderr, "makekeys: too many keysyms!\n");
+            exit(1);
+        }
     }
 
     printf("/* This file is generated from keysymdef.h. */\n");
@@ -124,36 +121,36 @@ main(int argc, char *argv[])
     best_max_rehash = ksnum;
     num_found = 0;
     for (z = ksnum; z < KTNUM; z++) {
-       max_rehash = 0;
-       for (name = tab, i = z; --i >= 0;)
-               *name++ = 0;
-       for (i = 0; i < ksnum; i++) {
-           name = info[i].name;
-           sig = 0;
-           while ((c = *name++))
-               sig = (sig << 1) + c;
-           first = j = sig % z;
-           for (k = 0; tab[j]; k++) {
-               j += first + 1;
-               if (j >= z)
-                   j -= z;
-               if (j == first)
-                   goto next1;
-           }
-           tab[j] = 1;
-           if (k > max_rehash)
-               max_rehash = k;
-       }
-       if (max_rehash < MIN_REHASH) {
-           if (max_rehash < best_max_rehash) {
-               best_max_rehash = max_rehash;
-               best_z = z;
-           }
-           num_found++;
-           if (num_found >= MATCHES)
-               break;
-       }
-next1: ;
+        max_rehash = 0;
+        for (name = tab, i = z; --i >= 0;)
+            *name++ = 0;
+        for (i = 0; i < ksnum; i++) {
+            name = info[i].name;
+            sig = 0;
+            while ((c = *name++))
+                sig = (sig << 1) + c;
+            first = j = sig % z;
+            for (k = 0; tab[j]; k++) {
+                j += first + 1;
+                if (j >= z)
+                    j -= z;
+                if (j == first)
+                    goto next1;
+            }
+            tab[j] = 1;
+            if (k > max_rehash)
+                max_rehash = k;
+        }
+        if (max_rehash < MIN_REHASH) {
+            if (max_rehash < best_max_rehash) {
+                best_max_rehash = max_rehash;
+                best_z = z;
+            }
+            num_found++;
+            if (num_found >= MATCHES)
+                break;
+        }
+next1:  ;
     }
 
     z = best_z;
@@ -162,26 +159,26 @@ next1:    ;
     printf("0,\n");
     k = 1;
     for (i = 0; i < ksnum; i++) {
-       name = info[i].name;
-       sig = 0;
-       while ((c = *name++))
-           sig = (sig << 1) + c;
-       first = j = sig % z;
-       while (offsets[j]) {
-           j += first + 1;
-           if (j >= z)
-               j -= z;
-       }
-       offsets[j] = k;
-       indexes[i] = k;
-       val = info[i].val;
-       printf("0x%.2lx, 0x%.2lx, 0x%.2lx, 0x%.2lx, 0x%.2lx, 0x%.2lx, ",
-              (sig >> 8) & 0xff, sig & 0xff,
-              (val >> 24) & 0xff, (val >> 16) & 0xff,
-              (val >> 8) & 0xff, val & 0xff);
-       for (name = info[i].name, k += 7; (c = *name++); k++)
-           printf("'%c',", c);
-       printf((i == (ksnum-1)) ? "0\n" : "0,\n");
+        name = info[i].name;
+        sig = 0;
+        while ((c = *name++))
+            sig = (sig << 1) + c;
+        first = j = sig % z;
+        while (offsets[j]) {
+            j += first + 1;
+            if (j >= z)
+                j -= z;
+        }
+        offsets[j] = k;
+        indexes[i] = k;
+        val = info[i].val;
+        printf("0x%.2lx, 0x%.2lx, 0x%.2lx, 0x%.2lx, 0x%.2lx, 0x%.2lx, ",
+               (sig >> 8) & 0xff, sig & 0xff,
+               (val >> 24) & 0xff, (val >> 16) & 0xff,
+               (val >> 8) & 0xff, val & 0xff);
+        for (name = info[i].name, k += 7; (c = *name++); k++)
+            printf("'%c',", c);
+        printf((i == (ksnum-1)) ? "0\n" : "0,\n");
     }
     printf("};\n");
     printf("\n");
@@ -190,11 +187,11 @@ next1:    ;
     printf("\n");
     printf("static const unsigned short hashString[KTABLESIZE] = {\n");
     for (i = 0; i < z;) {
-       printf("0x%.4x", offsets[i]);
-       i++;
-       if (i == z)
-           break;
-       printf((i & 7) ? ", " : ",\n");
+        printf("0x%.4x", offsets[i]);
+        i++;
+        if (i == z)
+            break;
+        printf((i & 7) ? ", " : ",\n");
     }
     printf("\n");
     printf("};\n");
@@ -203,55 +200,55 @@ next1:    ;
     best_max_rehash = ksnum;
     num_found = 0;
     for (z = ksnum; z < KTNUM; z++) {
-       max_rehash = 0;
-       for (name = tab, i = z; --i >= 0;)
-               *name++ = 0;
-       for (i = 0; i < ksnum; i++) {
-           val = info[i].val;
-           first = j = val % z;
-           for (k = 0; tab[j]; k++) {
-               if (values[j] == val)
-                   goto skip1;
-               j += first + 1;
-               if (j >= z)
-                   j -= z;
-               if (j == first)
-                   goto next2;
-           }
-           tab[j] = 1;
-           values[j] = val;
-           if (k > max_rehash)
-               max_rehash = k;
-skip1: ;
-       }
-       if (max_rehash < MIN_REHASH) {
-           if (max_rehash < best_max_rehash) {
-               best_max_rehash = max_rehash;
-               best_z = z;
-           }
-           num_found++;
-           if (num_found >= MATCHES)
-               break;
-       }
-next2: ;
+        max_rehash = 0;
+        for (name = tab, i = z; --i >= 0;)
+            *name++ = 0;
+        for (i = 0; i < ksnum; i++) {
+            val = info[i].val;
+            first = j = val % z;
+            for (k = 0; tab[j]; k++) {
+                if (values[j] == val)
+                    goto skip1;
+                j += first + 1;
+                if (j >= z)
+                    j -= z;
+                if (j == first)
+                    goto next2;
+            }
+            tab[j] = 1;
+            values[j] = val;
+            if (k > max_rehash)
+                max_rehash = k;
+skip1:  ;
+        }
+        if (max_rehash < MIN_REHASH) {
+            if (max_rehash < best_max_rehash) {
+                best_max_rehash = max_rehash;
+                best_z = z;
+            }
+            num_found++;
+            if (num_found >= MATCHES)
+                break;
+        }
+next2:  ;
     }
 
     z = best_z;
     for (i = z; --i >= 0;)
-       offsets[i] = 0;
+        offsets[i] = 0;
     for (i = 0; i < ksnum; i++) {
-       val = info[i].val;
-       first = j = val % z;
-       while (offsets[j]) {
-           if (values[j] == val)
-               goto skip2;
-           j += first + 1;
-           if (j >= z)
-               j -= z;
-       }
-       offsets[j] = indexes[i] + 2;
-       values[j] = val;
-skip2: ;
+        val = info[i].val;
+        first = j = val % z;
+        while (offsets[j]) {
+            if (values[j] == val)
+                goto skip2;
+            j += first + 1;
+            if (j >= z)
+                j -= z;
+        }
+        offsets[j] = indexes[i] + 2;
+        values[j] = val;
+skip2:  ;
     }
     printf("\n");
     printf("#ifdef NEEDVTABLE\n");
@@ -260,11 +257,11 @@ skip2:    ;
     printf("\n");
     printf("static const unsigned short hashKeysym[VTABLESIZE] = {\n");
     for (i = 0; i < z;) {
-       printf("0x%.4x", offsets[i]);
-       i++;
-       if (i == z)
-           break;
-       printf((i & 7) ? ", " : ",\n");
+        printf("0x%.4x", offsets[i]);
+        i++;
+        if (i == z)
+            break;
+        printf((i & 7) ? ", " : ",\n");
     }
     printf("\n");
     printf("};\n");