Browse Source

tally: Slightly simplify tally_new

(Imported from SAMBA commit 066d36a1a635e1115f62c452c49a9830d484c03b)
Volker Lendecke 14 years ago
parent
commit
b10913e2ab
1 changed files with 9 additions and 7 deletions
  1. 9 7
      ccan/tally/tally.c

+ 9 - 7
ccan/tally/tally.c

@@ -33,14 +33,16 @@ struct tally *tally_new(unsigned buckets)
 		return NULL;
 	tally = (struct 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);
+	if (tally == NULL) {
+		return NULL;
 	}
+
+	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;
 }