blowfish-mktab.c: Remove the eye-candy progress meter.

[u/mdw/catacomb] / blowfish-mktab.c

diff --git a/blowfish-mktab.c b/blowfish-mktab.c
index 37a9b53..9d6fcb2 100644 (file)
--- a/blowfish-mktab.c
+++ b/blowfish-mktab.c
@@ -7,7 +7,7 @@
  * (c) 2000 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Catacomb.
  *
@@ -15,12 +15,12 @@
  * it under the terms of the GNU Library General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
- * 
+ *
  * Catacomb is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Library General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Library General Public
  * License along with Catacomb; if not, write to the Free
  * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
@@ -58,6 +58,12 @@
 #define SPIGOT_RADIX (1ul << SPIGOT_BITS)
 #define SPIGOT_BUFLEN (SPIGOT_WORDS * 32)
 
+#ifdef QUIET
+#  define Q(x)
+#else
+#  define Q(x) x
+#endif
+
 static void spigot(uint32 *buf, size_t n)
 {
   uint32 acc = 0;
@@ -66,10 +72,10 @@ static void spigot(uint32 *buf, size_t n)
   uint32 p = 0;
   unsigned f = 0;
   unsigned max = 32 * n;
-  size_t step = n / 60;
+  Q( size_t step = n / 60; )
 
-  fputs("[                                                             ]\r[",
-       stderr);
+  Q( fputs("[                                                         ]\r[",
+          stderr); )
 
 #define EMIT(z) do {                                                   \
   if (b == -1)                                                         \
@@ -84,8 +90,8 @@ static void spigot(uint32 *buf, size_t n)
       n--;                                                             \
       if (!n)                                                          \
        goto done;                                                      \
-      if (n % step == 0)                                               \
-       fputc('.', stderr);                                             \
+      Q( if (n % step == 0)                                            \
+          fputc('.', stderr); )                                        \
     }                                                                  \
   }                                                                    \
 } while (0)
@@ -119,8 +125,8 @@ static void spigot(uint32 *buf, size_t n)
     }
   }
 
-done:
-  fputc('\n', stderr);
+done:;
+  Q( fputc('\n', stderr); )
 
 #undef EMIT
 }
@@ -154,7 +160,7 @@ int main(void)
                                                                        \\\n\
   { ", stdout);
     else if (i % 4 == 3)
-      fputs(",                 \\\n    ", stdout);
+      fputs(",                 \\\n    ", stdout);
     else
       fputs(", ", stdout);
   }
@@ -170,7 +176,7 @@ int main(void)
                                                                        \\\n\
   { ", stdout);
     } else if (i % 4 == 3)
-      fputs(",                 \\\n    ", stdout);
+      fputs(",                 \\\n    ", stdout);
     else
       fputs(", ", stdout);
     }