diff options
| author | Mattias Andrée <maandree@kth.se> | 2016-03-13 23:54:56 +0100 |
|---|---|---|
| committer | Mattias Andrée <maandree@kth.se> | 2016-03-13 23:54:56 +0100 |
| commit | 5b10b24044b3350a19ab3d3c0b37b5e9c12365b1 (patch) | |
| tree | 3f6aa8de29becc5d7511fcca50e6d31982c1b64b /src/zrand.c | |
| parent | Optimisations (diff) | |
| download | libzahl-5b10b24044b3350a19ab3d3c0b37b5e9c12365b1.tar.gz libzahl-5b10b24044b3350a19ab3d3c0b37b5e9c12365b1.tar.bz2 libzahl-5b10b24044b3350a19ab3d3c0b37b5e9c12365b1.tar.xz | |
Multiple changes:
1) Compile test with -O0, it takes too long otherwise.
2) Add error codes: ZERROR_0_POW_0, ZERROR_0_DIV_0, ZERROR_DIV_0, ZERROR_NEGATIVE.
3) Add workaround for a bug in clang (src/allocator.c).
4) Cleanups.
5) Minor optimisations.
6) Add inclusion guard for zahl.h.
Signed-off-by: Mattias Andrée <maandree@kth.se>
Diffstat (limited to 'src/zrand.c')
| -rw-r--r-- | src/zrand.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/zrand.c b/src/zrand.c index 48d4802..64fa7ed 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(errno); + libzahl_failure(errno); read_total += (size_t)read_just; n -= (size_t)read_just; } @@ -62,22 +62,22 @@ zrand(z_t r, enum zranddev dev, enum zranddist dist, z_t n) pathname = SECURE_RANDOM_PATHNAME; break; default: - abort(); + libzahl_failure(EINVAL); } - if (EXPECT(zzero(n), 0)) { + if (unlikely(zzero(n))) { SET_SIGNUM(r, 0); return; } fd = open(pathname, O_RDONLY); if (fd < 0) - FAILURE(errno); + libzahl_failure(errno); switch (dist) { case QUASIUNIFORM: - if (EXPECT(zsignum(n) < 0, 0)) - FAILURE(EDOM); /* n must be non-negative. */ + if (unlikely(znegative(n))) + libzahl_failure(-ZERROR_NEGATIVE); bits = zbits(n); zrand_get_random_bits(r, bits, fd); zadd(r, r, libzahl_const_1); @@ -86,8 +86,8 @@ zrand(z_t r, enum zranddev dev, enum zranddist dist, z_t n) break; case UNIFORM: - if (EXPECT(zsignum(n) < 0, 0)) - FAILURE(EDOM); /* n must be non-negative. */ + if (unlikely(znegative(n))) + libzahl_failure(-ZERROR_NEGATIVE); bits = zbits(n); do zrand_get_random_bits(r, bits, fd); @@ -95,7 +95,7 @@ zrand(z_t r, enum zranddev dev, enum zranddist dist, z_t n) break; default: - abort(); + libzahl_failure(EINVAL); } close(fd); |