X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftally%2Ftally.c;h=4ece2364c308d86173fab8bed7fa548c0591dd5f;hp=0d49319608d2ff6dc53edf9d62429e055c50f152;hb=a062738ac042002d51fdc3302a96fb7803aa2708;hpb=74257cee33ae3033f961d5f22a0313b8cb1b18d4

diff --git a/ccan/tally/tally.c b/ccan/tally/tally.c
index 0d493196..4ece2364 100644
--- a/ccan/tally/tally.c
+++ b/ccan/tally/tally.c
@@ -25,29 +25,36 @@ struct tally *tally_new(unsigned buckets)
 	struct tally *tally;
 
 	/* There is always 1 bucket. */
-	if (buckets == 0)
+	if (buckets == 0) {
 		buckets = 1;
+	}
 
 	/* Overly cautious check for overflow. */
-	if (sizeof(*tally) * buckets / sizeof(*tally) != buckets)
+	if (sizeof(*tally) * buckets / sizeof(*tally) != buckets) {
+		return NULL;
+	}
+
+	tally = (struct tally *)malloc(
+		sizeof(*tally) + sizeof(tally->counts[0])*(buckets-1));
+	if (tally == NULL) {
 		return NULL;
-	tally = malloc(sizeof(*tally) + sizeof(tally->counts[0])*(buckets-1));
-	if (tally) {
-		tally->max = ((size_t)1 << (SIZET_BITS - 1));
-		tally->min = ~tally->max;
-		tally->total[0] = tally->total[1] = 0;
-		tally->buckets = buckets;
-		tally->step_bits = 0;
-		memset(tally->counts, 0, sizeof(tally->counts[0])*buckets);
 	}
+
+	tally->max = ((size_t)1 << (SIZET_BITS - 1));
+	tally->min = ~tally->max;
+	tally->total[0] = tally->total[1] = 0;
+	tally->buckets = buckets;
+	tally->step_bits = 0;
+	memset(tally->counts, 0, sizeof(tally->counts[0])*buckets);
 	return tally;
 }
 
 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;
 }
@@ -56,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);
 }
@@ -65,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));
 }
@@ -449,7 +458,7 @@ char *tally_histogram(const struct tally *tally,
 			largest_bucket = tally->counts[i];
 	}
 
-	p = graph = malloc(height * (width + 1) + 1);
+	p = graph = (char *)malloc(height * (width + 1) + 1);
 	if (!graph) {
 		free(tmp);
 		return NULL;