From 869220b5896e9bf5e9072254ab99779c960e3eae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= Date: Tue, 2 Apr 2024 19:30:44 +0200 Subject: Use designated initializer more Designated initializers are supported in C99 and simplify struct initializations. All members not explicitly mentioned are default initialized to 0, and also modern compilers can warn on of those missing ones. --- Hashtable.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'Hashtable.c') diff --git a/Hashtable.c b/Hashtable.c index 2756b232..041f25eb 100644 --- a/Hashtable.c +++ b/Hashtable.c @@ -109,13 +109,15 @@ static size_t nextPrime(size_t n) { } Hashtable* Hashtable_new(size_t size, bool owner) { - Hashtable* this; - - this = xMalloc(sizeof(Hashtable)); - this->items = 0; - this->size = size ? nextPrime(size) : 13; - this->buckets = (HashtableItem*) xCalloc(this->size, sizeof(HashtableItem)); - this->owner = owner; + size = size ? nextPrime(size) : 13; + + Hashtable* this = xMalloc(sizeof(Hashtable)); + *this = (Hashtable) { + .items = 0, + .size = size, + .buckets = xCalloc(size, sizeof(HashtableItem)), + .owner = owner, + }; assert(Hashtable_isConsistent(this)); return this; -- cgit v1.2.3