X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftally%2Ftally.c;h=29f055588015f5e38f02513c6dcce39b4657ff20;hb=6977745243a4bdd351e1565f2749872bb927709e;hp=a6d66b6688dc5d6940bfc75596e20d866a098ebd;hpb=137c60bf9e4aa3160fbd44b99e54bcb0df5d6cbf;p=ccan

diff --git a/ccan/tally/tally.c b/ccan/tally/tally.c
index a6d66b66..29f05558 100644
--- a/ccan/tally/tally.c
+++ b/ccan/tally/tally.c
@@ -231,8 +231,9 @@ static uint64_t divlu64(uint64_t u1, uint64_t u0, uint64_t v)
 	uint64_t p;		  /* Product of two digits. */
 	int64_t s, i, j, t, k;
 
-	if (u1 >= v)		  /* If overflow, return the largest */
+	if (u1 >= v) {		  /* If overflow, return the largest */
 		return (uint64_t)-1; /* possible quotient. */
+	}
 
 	s = 64 - fls64(v);		  /* 0 <= s <= 63. */
 	vn0 = v << s;		  /* Normalize divisor. */
@@ -255,7 +256,9 @@ static uint64_t divlu64(uint64_t u1, uint64_t u0, uint64_t v)
 		if (qhat >= b || qhat*vn[0] > b*rhat + un[j]) {
 			qhat = qhat - 1;
 			rhat = rhat + vn[1];
-			if (rhat < b) goto again;
+			if (rhat < b) {
+				goto again;
+			}
 		}
 
 		/* Multiply and subtract. */
@@ -289,26 +292,28 @@ static int64_t divls64(int64_t u1, uint64_t u0, int64_t v)
 {
 	int64_t q, uneg, vneg, diff, borrow;
 
-	uneg = u1 >> 63;	  // -1 if u < 0.
-	if (uneg) {		  // Compute the absolute
-		u0 = -u0;	  // value of the dividend u.
+	uneg = u1 >> 63;	  /* -1 if u < 0. */
+	if (uneg) {		  /* Compute the absolute */
+		u0 = -u0;	  /* value of the dividend u. */
 		borrow = (u0 != 0);
 		u1 = -u1 - borrow;
 	}
 
-	vneg = v >> 63;		  // -1 if v < 0.
-	v = (v ^ vneg) - vneg;	  // Absolute value of 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);
 
-	diff = uneg ^ vneg;	  // Negate q if signs of
-	q = (q ^ diff) - diff;	  // u and v differed.
+	diff = uneg ^ vneg;	  /* Negate q if signs of */
+	q = (q ^ diff) - diff;	  /* u and v differed. */
 
-	if ((diff ^ q) < 0 && q != 0) {	   // If overflow, return the largest
-	overflow:			   // possible neg. quotient.
+	if ((diff ^ q) < 0 && q != 0) {	   /* If overflow, return the
+					      largest */
+	overflow:			   /* possible neg. quotient. */
 		q = 0x8000000000000000ULL;
 	}
 	return q;
@@ -317,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. */
@@ -361,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;
@@ -379,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);
 }
@@ -414,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;
 }
 
@@ -441,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;
@@ -459,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);
@@ -476,25 +489,28 @@ 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
+			memset(p, '*', count);
+		} else {
 			count = 0;
+		}
 
-		memset(p, '*', count);
 		p += count;
 		*p = '\n';
 		p++;