X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftally%2Ftally.c;h=774373ca0f88e0b4a48bed5029107cf28bded0d1;hp=936b5142561a9ec172fd86a96ddf88a529472842;hb=926996e88c32445c874ff9c4f47f159db6b45995;hpb=ce3198f06194b9ccd9a5d7653daa109175e1226b diff --git a/ccan/tally/tally.c b/ccan/tally/tally.c index 936b5142..774373ca 100644 --- a/ccan/tally/tally.c +++ b/ccan/tally/tally.c @@ -386,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); } @@ -421,9 +422,11 @@ static unsigned get_max_bucket(const struct tally *tally) { unsigned int i; - for (i = tally->buckets; i > 0; i--) - if (tally->counts[i-1]) + for (i = tally->buckets; i > 0; i--) { + if (tally->counts[i-1]) { break; + } + } return i; } @@ -448,15 +451,17 @@ char *tally_histogram(const struct tally *tally, /* We create a temporary then renormalize so < height. */ /* FIXME: Antialias properly! */ tmp = tally_new(tally->buckets); - if (!tmp) + if (!tmp) { return NULL; + } tmp->min = tally->min; tmp->max = tally->max; tmp->step_bits = tally->step_bits; memcpy(tmp->counts, tally->counts, sizeof(tally->counts[0]) * tmp->buckets); - while ((max_bucket = get_max_bucket(tmp)) >= height) + while ((max_bucket = get_max_bucket(tmp)) >= height) { renormalize(tmp, tmp->min, tmp->max * 2); + } /* Restore max */ tmp->max = tally->max; tally = tmp; @@ -466,8 +471,9 @@ char *tally_histogram(const struct tally *tally, /* Figure out longest line, for scale. */ largest_bucket = 0; for (i = 0; i < tally->buckets; i++) { - if (tally->counts[i] > largest_bucket) + if (tally->counts[i] > largest_bucket) { largest_bucket = tally->counts[i]; + } } p = graph = (char *)malloc(height * (width + 1) + 1); @@ -483,23 +489,26 @@ char *tally_histogram(const struct tally *tally, row = height - i - 1; count = (double)tally->counts[row] / largest_bucket * (width-1)+1; - if (row == 0) + if (row == 0) { covered = snprintf(p, width, "%zi", tally->min); - else if (row == height - 1) + } else if (row == height - 1) { covered = snprintf(p, width, "%zi", tally->max); - else if (row == bucket_of(tally->min, tally->step_bits, 0)) + } else if (row == bucket_of(tally->min, tally->step_bits, 0)) { *p = '+'; - else + } else { *p = '|'; + } - if (covered > width) + if (covered > width) { covered = width; + } p += covered; - if (count > covered) + if (count > covered) { count -= covered; - else + } else { count = 0; + } memset(p, '*', count); p += count;