X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/245bfdef8fe5a758d7ef94874e54914666f5f16a..cc3ca08f22460b15423bb88632f3a12741b19003:/blowfish-mktab.c

diff --git a/blowfish-mktab.c b/blowfish-mktab.c
index 6d1015d..9d6fcb2 100644
--- a/blowfish-mktab.c
+++ b/blowfish-mktab.c
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: blowfish-mktab.c,v 1.1 2000/06/17 10:47:28 mdw Exp $
+ * $Id: blowfish-mktab.c,v 1.3 2004/04/08 01:36:15 mdw Exp $
  *
  * Build Blowfish key table
  *
  * (c) 2000 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Catacomb.
  *
@@ -15,26 +15,18 @@
  * 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,
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: blowfish-mktab.c,v $
- * Revision 1.1  2000/06/17 10:47:28  mdw
- * Emits Blowfish initial key data, derived from the digits of pi.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include <stdio.h>
@@ -66,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;
@@ -74,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)								\
@@ -92,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)
@@ -101,7 +99,7 @@ static void spigot(uint32 *buf, size_t n)
   while (n) {
     uint32 q = 0;
     uint32 i;
-    uint32 x;
+    uint32 x = 0;
     uint32 k = max * 2 - 1;
 
     for (i = max; i; i--) {
@@ -127,8 +125,8 @@ static void spigot(uint32 *buf, size_t n)
     }
   }
 
-done:
-  fputc('\n', stderr);
+done:;
+  Q( fputc('\n', stderr); )
 
 #undef EMIT
 }
@@ -162,7 +160,7 @@ int main(void)
 									\\\n\
   { ", stdout);
     else if (i % 4 == 3)
-      fputs(",			\\\n    ", stdout);
+      fputs(",			\\\n	", stdout);
     else
       fputs(", ", stdout);
   }
@@ -178,7 +176,7 @@ int main(void)
 									\\\n\
   { ", stdout);
     } else if (i % 4 == 3)
-      fputs(",			\\\n    ", stdout);
+      fputs(",			\\\n	", stdout);
     else
       fputs(", ", stdout);
     }