projects
/
u
/
mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
86c079e
..
9d6fcb2
100644
(file)
--- a/
blowfish-mktab.c
+++ b/
blowfish-mktab.c
@@
-58,6
+58,12
@@
#define SPIGOT_RADIX (1ul << SPIGOT_BITS)
#define SPIGOT_BUFLEN (SPIGOT_WORDS * 32)
#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;
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;
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) \
#define EMIT(z) do { \
if (b == -1) \
@@
-84,8
+90,8
@@
static void spigot(uint32 *buf, size_t n)
n--; \
if (!n) \
goto done; \
n--; \
if (!n) \
goto done; \
-
if (n % step == 0)
\
-
fputc('.', stderr);
\
+
Q( if (n % step == 0)
\
+
fputc('.', stderr); )
\
} \
} \
} while (0)
} \
} \
} 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
}
#undef EMIT
}