X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftally%2Ftally.c;h=0d0190795557b60ccfe8d73138dfda2baf99477d;hp=b3ac863ba68119aedc59973b72c1d3716bb35867;hb=d1cea3ebf96f61b5bbac1e74975700770e06add6;hpb=097857e6c09bf9696797fe08cd4241b8315f9c9a diff --git a/ccan/tally/tally.c b/ccan/tally/tally.c index b3ac863b..0d019079 100644 --- a/ccan/tally/tally.c +++ b/ccan/tally/tally.c @@ -322,7 +322,7 @@ ssize_t tally_total(const struct tally *tally, ssize_t *overflow) } /* If result is negative, make sure we can represent it. */ - if (tally->total[1] & (1 << (SIZET_BITS-1))) { + if (tally->total[1] & ((size_t)1 << (SIZET_BITS-1))) { /* Must have only underflowed once, and must be able to * represent result at ssize_t. */ if ((~tally->total[1])+1 != 0 @@ -455,14 +455,17 @@ char *tally_histogram(const struct tally *tally, } for (i = 0; i < height; i++) { - unsigned covered = 1; - count = (double)tally->counts[i] / largest_bucket * (width-1)+1; + unsigned covered = 1, row; - if (i == 0) + /* People expect minimum at the bottom. */ + row = height - i - 1; + count = (double)tally->counts[row] / largest_bucket * (width-1)+1; + + if (row == 0) covered = snprintf(p, width, "%zi", tally->min); - else if (i == height - 1) + else if (row == height - 1) covered = snprintf(p, width, "%zi", tally->max); - else if (i == bucket_of(tally->min, tally->step_bits, 0)) + else if (row == bucket_of(tally->min, tally->step_bits, 0)) *p = '+'; else *p = '|';