From 066d36a1a635e1115f62c452c49a9830d484c03b Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 10 Aug 2011 19:44:10 +0200 Subject: Slightly simplify tally_new --- lib/ccan/tally/tally.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'lib') diff --git a/lib/ccan/tally/tally.c b/lib/ccan/tally/tally.c index 2af7353380..a5eedcb951 100644 --- a/lib/ccan/tally/tally.c +++ b/lib/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; } -- cgit