diff options
| author | Mattias Andrée <maandree@kth.se> | 2016-03-04 23:50:00 +0100 |
|---|---|---|
| committer | Mattias Andrée <maandree@kth.se> | 2016-03-04 23:50:00 +0100 |
| commit | 76d0af5599554d11f104d582cdac8fbaa8569fcc (patch) | |
| tree | 0ed9889a86d52ebd208382f2fd49dad0570d1f8c /src/zrand.c | |
| parent | Clean up, fix a few bugs, and add a test (diff) | |
| download | libzahl-76d0af5599554d11f104d582cdac8fbaa8569fcc.tar.gz libzahl-76d0af5599554d11f104d582cdac8fbaa8569fcc.tar.bz2 libzahl-76d0af5599554d11f104d582cdac8fbaa8569fcc.tar.xz | |
Clean up, add zerror and zperror, fix bugs and add more tests
Signed-off-by: Mattias Andrée <maandree@kth.se>
Diffstat (limited to 'src/zrand.c')
| -rw-r--r-- | src/zrand.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/zrand.c b/src/zrand.c index cb0b375..30dc61d 100644 --- a/src/zrand.c +++ b/src/zrand.c @@ -27,7 +27,7 @@ zrand_get_random_bits(z_t r, size_t bits, int fd) for (n = chars * sizeof(zahl_char_t); n;) { read_just = read(fd, buf + read_total, n); if (read_just < 0) - FAILURE_JUMP(); + FAILURE(errno); read_total += (size_t)read_just; n -= (size_t)read_just; } @@ -72,14 +72,12 @@ zrand(z_t r, enum zranddev dev, enum zranddist dist, z_t n) fd = open(pathname, O_RDONLY); if (fd < 0) - FAILURE_JUMP(); + FAILURE(errno); switch (dist) { case QUASIUNIFORM: - if (zsignum(n) < 0) { - errno = EDOM; /* n must be non-negative. */ - FAILURE_JUMP(); - } + if (zsignum(n) < 0) + FAILURE(EDOM); /* n must be non-negative. */ bits = zbits(n); zrand_get_random_bits(r, bits, fd); zadd(r, r, libzahl_const_1); @@ -88,10 +86,8 @@ zrand(z_t r, enum zranddev dev, enum zranddist dist, z_t n) break; case UNIFORM: - if (zsignum(n) < 0) { - errno = EDOM; /* n must be non-negative. */ - FAILURE_JUMP(); - } + if (zsignum(n) < 0) + FAILURE(EDOM); /* n must be non-negative. */ bits = zbits(n); do zrand_get_random_bits(r, bits, fd); |