tally: Adapt tally_approx_median to Samba coding conventions

[ccan] / ccan / tally / tally.c

diff --git a/ccan/tally/tally.c b/ccan/tally/tally.c
index 9775cb4e62a3087e070cf9cd28dab8f4b7e051af..20e99dcb870dac2d56c539e6873cc1618d84d22f 100644 (file)
--- a/ccan/tally/tally.c
+++ b/ccan/tally/tally.c
@@ -302,8 +302,9 @@ static int64_t divls64(int64_t u1, uint64_t u0, int64_t v)
        vneg = v >> 63;           /* -1 if v < 0. */
        v = (v ^ vneg) - vneg;    /* Absolute value of v. */
 
-       if ((uint64_t)u1 >= (uint64_t)v)
+       if ((uint64_t)u1 >= (uint64_t)v) {
                goto overflow;
+       }
 
        q = divlu64(u1, u0, v);
 
@@ -321,8 +322,9 @@ static int64_t divls64(int64_t u1, uint64_t u0, int64_t v)
 ssize_t tally_mean(const struct tally *tally)
 {
        size_t count = tally_num(tally);
-       if (!count)
+       if (!count) {
                return 0;
+       }
 
        if (sizeof(tally->total[0]) == sizeof(uint32_t)) {
                /* Use standard 64-bit arithmetic. */
@@ -365,10 +367,11 @@ static ssize_t bucket_range(const struct tally *tally, unsigned b, size_t *err)
        ssize_t min, max;
 
        min = bucket_min(tally->min, tally->step_bits, b);
-       if (b == tally->buckets - 1)
+       if (b == tally->buckets - 1) {
                max = tally->max;
-       else
+       } else {
                max = bucket_min(tally->min, tally->step_bits, b+1) - 1;
+       }
 
        /* FIXME: Think harder about cumulative error; is this enough?. */
        *err = (max - min + 1) / 2;
@@ -383,8 +386,9 @@ ssize_t tally_approx_median(const struct tally *tally, size_t *err)
 
        for (i = 0; i < tally->buckets; i++) {
                total += tally->counts[i];
-               if (total * 2 >= count)
+               if (total * 2 >= count) {
                        break;
+               }
        }
        return bucket_range(tally, i, err);
 }