aboutsummaryrefslogtreecommitdiffstats
path: root/src/zadd.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/zadd.c')
-rw-r--r--src/zadd.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/zadd.c b/src/zadd.c
index ec17ca4..9891b00 100644
--- a/src/zadd.c
+++ b/src/zadd.c
@@ -9,10 +9,10 @@ zadd_unsigned(z_t a, z_t b, z_t c)
uint32_t carry[] = {0, 0};
zahl_char_t *addend;
- if (EXPECT(zzero(b), 0)) {
+ if (unlikely(zzero(b))) {
zabs(a, c);
return;
- } else if (EXPECT(zzero(c), 0)) {
+ } else if (unlikely(zzero(c))) {
zabs(a, b);
return;
}
@@ -29,7 +29,7 @@ zadd_unsigned(z_t a, z_t b, z_t c)
zmemset(a->chars + a->used, 0, n - a->used);
}
addend = c->chars;
- } else if (EXPECT(a == c, 0)) {
+ } else if (unlikely(a == c)) {
if (a->used < b->used) {
n = b->used;
zmemset(a->chars + a->used, 0, n - a->used);
@@ -67,15 +67,15 @@ zadd_unsigned(z_t a, z_t b, z_t c)
void
zadd(z_t a, z_t b, z_t c)
{
- if (EXPECT(zzero(b), 0)) {
+ if (unlikely(zzero(b))) {
SET(a, c);
- } else if (EXPECT(zzero(c), 0)) {
+ } else if (unlikely(zzero(c))) {
SET(a, b);
- } else if (EXPECT(b == c, 0)) {
+ } else if (unlikely(b == c)) {
zlsh(a, b, 1);
- } else if (EXPECT((zsignum(b) | zsignum(c)) < 0, 0)) {
- if (zsignum(b) < 0) {
- if (zsignum(c) < 0) {
+ } else if (unlikely(znegative1(b, c))) {
+ if (znegative(b)) {
+ if (znegative(c)) {
zadd_unsigned(a, b, c);
SET_SIGNUM(a, -zsignum(a));
} else {