X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftally%2Ftally.c;h=4c5e37e9e05d9eb256569573863e8e18714430be;hp=d67112c2cf6da49017904be9ec91b49f1f11ced5;hb=e74c8a2bdf3e8ef45294d2b656150c07c4ca6294;hpb=237fc67d26def3f4458594b4aff7cb617f4522f7 diff --git a/ccan/tally/tally.c b/ccan/tally/tally.c index d67112c2..4c5e37e9 100644 --- a/ccan/tally/tally.c +++ b/ccan/tally/tally.c @@ -52,8 +52,9 @@ struct tally *tally_new(unsigned buckets) static unsigned bucket_of(ssize_t min, unsigned step_bits, ssize_t val) { /* Don't over-shift. */ - if (step_bits == SIZET_BITS) + if (step_bits == SIZET_BITS) { return 0; + } assert(step_bits < SIZET_BITS); return (size_t)(val - min) >> step_bits; } @@ -62,8 +63,9 @@ static unsigned bucket_of(ssize_t min, unsigned step_bits, ssize_t val) static ssize_t bucket_min(ssize_t min, unsigned step_bits, unsigned b) { /* Don't over-shift. */ - if (step_bits == SIZET_BITS) + if (step_bits == SIZET_BITS) { return min; + } assert(step_bits < SIZET_BITS); return min + ((ssize_t)b << step_bits); } @@ -71,8 +73,9 @@ static ssize_t bucket_min(ssize_t min, unsigned step_bits, unsigned b) /* Does shifting by this many bits truncate the number? */ static bool shift_overflows(size_t num, unsigned bits) { - if (bits == 0) + if (bits == 0) { return false; + } return ((num << bits) >> 1) != (num << (bits - 1)); } @@ -85,8 +88,9 @@ static void renormalize(struct tally *tally, unsigned int i, old_min; /* Uninitialized? Don't do anything... */ - if (tally->max < tally->min) + if (tally->max < tally->min) { goto update; + } /* If we don't have sufficient range, increase step bits until * buckets cover entire range of ssize_t anyway. */