isisd,ospf6d,bgpd: Fix GCC 6 warnings on indentation not matching control flow

GCC 6 can now give warnings when the indentation of code does not
align with the scope of prior control flow statement(s).  I.e., where
the code visually suggests one kind of control flow, but in actuality
follows another.

Fix warnings found. They all seem to be simple cases of the indentation being
deceptive, but the existing flow being correct.
diff --git a/isisd/topology/spgrid.c b/isisd/topology/spgrid.c
index 22cfa7b..e1c87ab 100644
--- a/isisd/topology/spgrid.c
+++ b/isisd/topology/spgrid.c
@@ -598,7 +598,7 @@
     init_rand ( seed1);
     pl = pl - pm + 1;
 
-    for ( x = 0; x < X; x ++ )
+    for ( x = 0; x < X; x ++ ) {
       for ( y = 0; y < Y; y ++ ) {
         p_t = pm + nrand ( pl );
         if ( pn_f ) p_t *= (long) ( (1 + x) * pn );
@@ -606,9 +606,10 @@
 
         p[ NODE ( x, y ) ] = p_t;
       }
-      p[n0] = 0;
-      if ( s_f ) p[n0-1] = 0;
     }
+    p[n0] = 0;
+    if ( s_f ) p[n0-1] = 0;
+  }
 
   if ( s_f ) /* additional arcs from artifical source */
     {