1 files changed, 23 insertions, 28 deletions

diff --git a/lib/libalpm/pkghash.c b/lib/libalpm/pkghash.c
index 6dc43243..9e98fcd8 100644
--- a/lib/libalpm/pkghash.c
+++ b/lib/libalpm/pkghash.c
@@ -17,9 +17,10 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <errno.h>
+
 #include "pkghash.h"
 #include "util.h"
-#include "log.h"
 
 /* List of primes for possible sizes of hash tables.
  *
@@ -55,11 +56,7 @@ pmpkghash_t *_alpm_pkghash_create(size_t size)
 	pmpkghash_t *hash = NULL;
 	size_t i, loopsize;
 
-	MALLOC(hash, sizeof(pmpkghash_t), RET_ERR(PM_ERR_MEMORY, NULL));
-
-	hash->list = NULL;
-	hash->entries = 0;
-	hash->buckets = 0;
+	CALLOC(hash, 1, sizeof(pmpkghash_t), return NULL);
 
 	loopsize = sizeof(prime_list) / sizeof(*prime_list);
 	for(i = 0; i < loopsize; i++) {
@@ -70,15 +67,15 @@ pmpkghash_t *_alpm_pkghash_create(size_t size)
 	}
 
 	if(hash->buckets < size) {
-		_alpm_log(PM_LOG_ERROR, _("database larger than maximum size\n"));
+		errno = ERANGE;
 		free(hash);
-		return(NULL);
+		return NULL;
 	}
 
-	CALLOC(hash->hash_table, hash->buckets, sizeof(alpm_list_t*), \
-				free(hash); RET_ERR(PM_ERR_MEMORY, NULL));
+	CALLOC(hash->hash_table, hash->buckets, sizeof(alpm_list_t *), \
+				free(hash); return NULL);
 
-	return(hash);
+	return hash;
 }
 
 static size_t get_hash_position(unsigned long name_hash, pmpkghash_t *hash)
@@ -92,7 +89,7 @@ static size_t get_hash_position(unsigned long name_hash, pmpkghash_t *hash)
 		position = (position + 1) % hash->buckets;
 	}
 
-	return(position);
+	return position;
 }
 
 /* Expand the hash table size to the next increment and rebin the entries */
@@ -123,7 +120,7 @@ static pmpkghash_t *rehash(pmpkghash_t *oldhash)
 	newhash = _alpm_pkghash_create(newsize);
 	if(newhash == NULL) {
 		/* creation of newhash failed, stick with old one... */
-		return(oldhash);
+		return oldhash;
 	}
 
 	newhash->list = oldhash->list;
@@ -144,7 +141,7 @@ static pmpkghash_t *rehash(pmpkghash_t *oldhash)
 
 	_alpm_pkghash_free(oldhash);
 
-	return(newhash);
+	return newhash;
 }
 
 static pmpkghash_t *pkghash_add_pkg(pmpkghash_t *hash, pmpkg_t *pkg, int sorted)
@@ -153,7 +150,7 @@ static pmpkghash_t *pkghash_add_pkg(pmpkghash_t *hash, pmpkg_t *pkg, int sorted)
 	size_t position;
 
 	if(pkg == NULL || hash == NULL) {
-		return(hash);
+		return hash;
 	}
 
 	if((hash->entries + 1) / MAX_HASH_LOAD > hash->buckets) {
@@ -164,7 +161,7 @@ static pmpkghash_t *pkghash_add_pkg(pmpkghash_t *hash, pmpkg_t *pkg, int sorted)
 
 	ptr = calloc(1, sizeof(alpm_list_t));
 	if(ptr == NULL) {
-		return(hash);
+		return hash;
 	}
 
 	ptr->data = pkg;
@@ -179,17 +176,17 @@ static pmpkghash_t *pkghash_add_pkg(pmpkghash_t *hash, pmpkg_t *pkg, int sorted)
 	}
 
 	hash->entries += 1;
-	return(hash);
+	return hash;
 }
 
 pmpkghash_t *_alpm_pkghash_add(pmpkghash_t *hash, pmpkg_t *pkg)
 {
-	return(pkghash_add_pkg(hash, pkg, 0));
+	return pkghash_add_pkg(hash, pkg, 0);
 }
 
 pmpkghash_t *_alpm_pkghash_add_sorted(pmpkghash_t *hash, pmpkg_t *pkg)
 {
-	return(pkghash_add_pkg(hash, pkg, 1));
+	return pkghash_add_pkg(hash, pkg, 1);
 }
 
 static size_t move_one_entry(pmpkghash_t *hash, size_t start, size_t end)
@@ -217,7 +214,7 @@ static size_t move_one_entry(pmpkghash_t *hash, size_t start, size_t end)
 		 * e.g. (47 + 0 - 1) % 47 == 46 */
 		end = (hash->buckets + end - 1) % hash->buckets;
 	}
-	return(end);
+	return end;
 }
 
 /**
@@ -240,7 +237,7 @@ pmpkghash_t *_alpm_pkghash_remove(pmpkghash_t *hash, pmpkg_t *pkg,
 	}
 
 	if(pkg == NULL || hash == NULL) {
-		return(hash);
+		return hash;
 	}
 
 	position = pkg->name_hash % hash->buckets;
@@ -277,13 +274,13 @@ pmpkghash_t *_alpm_pkghash_remove(pmpkghash_t *hash, pmpkg_t *pkg,
 				position = prev;
 			}
 
-			return(hash);
+			return hash;
 		}
 
 		position = (position + 1) % hash->buckets;
 	}
 
-	return(hash);
+	return hash;
 }
 
 void _alpm_pkghash_free(pmpkghash_t *hash)
@@ -304,10 +301,8 @@ pmpkg_t *_alpm_pkghash_find(pmpkghash_t *hash, const char *name)
 	unsigned long name_hash;
 	size_t position;
 
-	ALPM_LOG_FUNC;
-
 	if(name == NULL || hash == NULL) {
-		return(NULL);
+		return NULL;
 	}
 
 	name_hash = _alpm_hash_sdbm(name);
@@ -318,13 +313,13 @@ pmpkg_t *_alpm_pkghash_find(pmpkghash_t *hash, const char *name)
 		pmpkg_t *info = lp->data;
 
 		if(info->name_hash == name_hash && strcmp(info->name, name) == 0) {
-			return(info);
+			return info;
 		}
 
 		position = (position + 1) % hash->buckets;
 	}
 
-	return(NULL);
+	return NULL;
 }
 
 /* vim: set ts=2 sw=2 noet: */