From 480538737a8a9be074a1848f2e52cf2d1ff4709f Mon Sep 17 00:00:00 2001 From: graham.gower Date: Wed, 04 Nov 2009 23:20:09 -0500 Subject: s/malloc/xmalloc/ s/calloc/xcalloc/ s/realloc/realloc/ And redundant error checking removed from the places where allocation failures were actually checked. git-svn-id: http://opkg.googlecode.com/svn/trunk@259 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358 --- (limited to 'libopkg/hash_table.c') diff --git a/libopkg/hash_table.c b/libopkg/hash_table.c index 6de9085..df6ff4f 100644 --- a/libopkg/hash_table.c +++ b/libopkg/hash_table.c @@ -69,11 +69,8 @@ int hash_table_init(const char *name, hash_table_t *hash, int len) --picker; hash->n_entries = *picker; - hash->entries = (hash_entry_t *)calloc(hash->n_entries, sizeof(hash_entry_t)); - if (hash->entries == NULL) { - fprintf(stderr, "%s: Out of memory.\n", __FUNCTION__); - return ENOMEM; - } + hash->entries = xcalloc(hash->n_entries, sizeof(hash_entry_t)); + return 0; } @@ -147,10 +144,7 @@ int hash_table_insert(hash_table_t *hash, const char *key, void *value) return 0; } } - hash_entry->next = (hash_entry_t *)calloc(1, sizeof(hash_entry_t)); - if (!hash_entry->next) { - return -ENOMEM; - } + hash_entry->next = xcalloc(1, sizeof(hash_entry_t)); hash_entry = hash_entry->next; hash_entry->next = NULL; } -- cgit v0.9.1