more lint and formatting

Fix a C89/C90 complaint about a declaration following executable code.
The rest is formatting (of stuff I saw rather than systematic fixups).

src/do_name.c

@@ -48,8 +48,10 @@ const char *const gloc_descr[NUM_GLOCS][4] = {
     { "any monsters", "monster", "next monster", "monsters" },
     { "any items", "item", "next object", "objects" },
     { "any doors", "door", "next door or doorway", "doors or doorways" },
-    { "any unexplored areas", "unexplored area", "unexplored location", "unexplored locations" },
+    { "any unexplored areas", "unexplored area", "unexplored location",
-    { "anything interesting", "interesting thing", "anything interesting", "anything interesting" }
+      "unexplored locations" },
+    { "anything interesting", "interesting thing", "anything interesting",
+      "anything interesting" }
 };
 
 
@@ -61,6 +63,7 @@ const char *k2;
 int gloc;
 {
     char sbuf[BUFSZ];
+
     Sprintf(sbuf, "Use '%s' or '%s' to %s%s%s.",
             k1, k2,
             iflags.getloc_usemenu ? "get a menu of "
@@ -80,10 +83,12 @@ const char *goal;
     boolean doing_what_is;
     winid tmpwin = create_nhwindow(NHW_MENU);
 
-    Sprintf(sbuf, "Use '%c', '%c', '%c', '%c' to move the cursor to %s.", /* hjkl */
+    Sprintf(sbuf,
+            "Use '%c', '%c', '%c', '%c' to move the cursor to %s.", /* hjkl */
             Cmd.move_W, Cmd.move_S, Cmd.move_N, Cmd.move_E, goal);
     putstr(tmpwin, 0, sbuf);
-    putstr(tmpwin, 0, "Use 'H', 'J', 'K', 'L' to move the cursor 8 units at a time.");
+    putstr(tmpwin, 0,
+           "Use 'H', 'J', 'K', 'L' to move the cursor 8 units at a time.");
     putstr(tmpwin, 0, "Or enter a background symbol (ex. '<').");
     Sprintf(sbuf, "Use '%s' to move the cursor on yourself.",
            visctrl(Cmd.spkeys[NHKF_GETPOS_SELF]));
@@ -119,7 +124,8 @@ const char *goal;
     Sprintf(sbuf, "Use '%s' to toggle menu listing for possible targets.",
             visctrl(Cmd.spkeys[NHKF_GETPOS_MENU]));
     putstr(tmpwin, 0, sbuf);
-    Sprintf(sbuf, "Use '%s' to toggle limiting possible targets to in view only.",
+    Sprintf(sbuf,
+            "Use '%s' to toggle limiting possible targets to in view only.",
             visctrl(Cmd.spkeys[NHKF_GETPOS_LIMITVIEW]));
     putstr(tmpwin, 0, sbuf);
     if (!iflags.terrainmode) {

src/mkmaze.c

@@ -630,18 +630,19 @@ void
 maze_remove_deadends(typ)
 xchar typ;
 {
-    int x,y, dir;
+    char dirok[4];
+    int x, y, dir, idx, idx2, dx, dy, dx2, dy2;
+
+    dirok[0] = 0; /* lint suppression */
     for (x = 2; x < x_maze_max; x++)
         for (y = 2; y < y_maze_max; y++)
             if (ACCESSIBLE(levl[x][y].typ) && (x % 2) && (y % 2)) {
-                char dirok[4];
+                idx = idx2 = 0;
-                int idx = 0;
-                int idx2 = 0;
                 for (dir = 0; dir < 4; dir++) {
-                    int dx = x;
+                    /* note: mz_move() is a macro which modifies
-                    int dy = y;
+                       one of its first two parameters */
-                    int dx2 = x;
+                    dx = dx2 = x;
-                    int dy2 = y;
+                    dy = dy2 = y;
                     mz_move(dx, dy, dir);
                     if (!maze_inbounds(dx, dy)) {
                         idx2++;
@@ -660,9 +661,9 @@ xchar typ;
                     }
                 }
                 if (idx2 >= 3 && idx > 0) {
+                    dx = x;
+                    dy = y;
                     dir = dirok[rn2(idx)];
-                    int dx = x;
-                    int dy = y;
                     mz_move(dx, dy, dir);
                     levl[dx][dy].typ = typ;
                 }
@@ -738,12 +739,14 @@ int wallthick;
         rx = x = 2;
         while (rx < x_maze_max) {
             int mx = (x % 2) ? corrwid
-                : ((x == 2 || x == ((rdx*2))) ? 1 : wallthick);
+                             : ((x == 2 || x == (rdx * 2)) ? 1
+                                                           : wallthick);
             ry = y = 2;
             while (ry < y_maze_max) {
                 int dx = 0, dy = 0;
                 int my = (y % 2) ? corrwid
-                    : ((y == 2 || y == ((rdy*2))) ? 1 : wallthick);
+                                 : ((y == 2 || y == (rdy * 2)) ? 1
+                                                               : wallthick);
                 for (dx = 0; dx < mx; dx++)
                     for (dy = 0; dy < my; dy++) {
                         if (rx+dx >= x_maze_max