~mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correct misunderstanding of how inttypes.h printf format strings work.
[catacomb]
/
fibrand.c
diff --git
a/fibrand.c
b/fibrand.c
index
44856e7
..
4196e98
100644
(file)
--- a/
fibrand.c
+++ b/
fibrand.c
@@
-1,6
+1,6
@@
/* -*-c-*-
*
/* -*-c-*-
*
- * $Id: fibrand.c,v 1.
1 1999/12/10 23:15:27
mdw Exp $
+ * $Id: fibrand.c,v 1.
5 2004/04/08 01:36:15
mdw Exp $
*
* Fibonacci generator
*
*
* Fibonacci generator
*
@@
-27,14
+27,6
@@
* MA 02111-1307, USA.
*/
* MA 02111-1307, USA.
*/
-/*----- Revision history --------------------------------------------------*
- *
- * $Log: fibrand.c,v $
- * Revision 1.1 1999/12/10 23:15:27 mdw
- * Noncryptographic random number generator.
- *
- */
-
/*----- Header files ------------------------------------------------------*/
#include <stdarg.h>
/*----- Header files ------------------------------------------------------*/
#include <stdarg.h>
@@
-58,7
+50,7
@@
* Returns: Next output from generator.
*
* Use: Steps the generator. Returns
* Returns: Next output from generator.
*
* Use: Steps the generator. Returns
- * %$x_{i - 24} + x_{i - 55} \bmod 2^{32}
%$
.
+ * %$x_{i - 24} + x_{i - 55} \bmod 2^{32}
$%
.
*/
uint32 fibrand_step(fibrand *f)
*/
uint32 fibrand_step(fibrand *f)
@@
-141,12
+133,12
@@
void fibrand_lcseed(fibrand *f, uint32 seed)
uint32 fibrand_range(fibrand *f, uint32 m)
{
uint32 r = 0xffffffff - (0xffffffff % m);
uint32 fibrand_range(fibrand *f, uint32 m)
{
uint32 r = 0xffffffff - (0xffffffff % m);
- uint x;
+ uint
32
x;
/* --- Now generate numbers until a good one comes along --- */
do x = fibrand_step(f); while (x >= r);
/* --- Now generate numbers until a good one comes along --- */
do x = fibrand_step(f); while (x >= r);
- return (x
/ (r / m)
);
+ return (x
% m
);
}
/*----- Generic interface -------------------------------------------------*/
}
/*----- Generic interface -------------------------------------------------*/
@@
-231,7
+223,7
@@
static void gfill(grand *r, void *p, size_t sz)
static const grand_ops gops = {
"fibrand",
static const grand_ops gops = {
"fibrand",
- 0,
+ 0,
0,
gmisc, gdestroy,
gword, gbyte, gword, grange, gfill
};
gmisc, gdestroy,
gword, gbyte, gword, grange, gfill
};