X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/7388adcea7ebace8d8c299da0e7c2e7e93da9c83..393d83b8760584006eaefd6fc370abead228e02a:/hash.c?ds=sidebyside

diff --git a/hash.c b/hash.c
index e29017c..66ae5e5 100644
--- a/hash.c
+++ b/hash.c
@@ -8,12 +8,12 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "hash.h"
-#include "keydb.h"
-#include "keyid.h"
+#include "keystructs.h"
 #include "ll.h"
-#include "stats.h"
+#include "mem.h"
 
 /**
  *	hashtable - the hash table array.
@@ -48,20 +48,14 @@ void destroyhash(void)
 {
 	int i;
 	struct ll *curll = NULL;
-	struct ll *nextll = NULL;
 
 	for (i = 0; i < HASHSIZE; i++) {
 		curll = hashtable[i];
-		while (curll != NULL) {
-			nextll = curll->next;
-			/*
-			 * TODO: The problem is the object has pointers that
-			 * need freed too.
-			 */
-			free(curll->object);
-			free(curll);
-			curll = nextll;
-		}
+		/*
+		 * TODO: The problem is the object has pointers that
+		 * need freed too.
+		 */
+		llfree(curll, (void (*)(void *)) free_statskey);
 		hashtable[i] = NULL;
 	}
 	elements = 0;
@@ -127,42 +121,7 @@ unsigned long hashelements(void)
 	return elements;
 }
 
-struct ll *gethashtableentry(int entry)
+struct ll *gethashtableentry(unsigned int entry)
 {
 	return hashtable[entry];
 }
-
-/**
- *	hash_getkeysigs - Gets the signatures on a key.
- *	@keyid: The key we want the signatures for.
- *	
- *	This function gets the signatures on a key. It's the same as the
- *	getkeysigs function from the keydb module except we also cache the data
- *	so that if we need it again we already have it available.
- */
-struct ll *hash_getkeysigs(uint64_t keyid)
-{
-	struct stats_key *key = NULL;
-
-	key = findinhash(keyid);
-	if (key == NULL) {
-		key = malloc(sizeof(*key));
-		if (key != NULL) {
-			key->keyid = keyid;
-			key->colour = 0;
-			key->parent = 0;
-			key->sigs = NULL;
-			key->gotsigs = false;
-			addtohash(key);
-		} else {
-			perror("hash_getkeysigs()");
-			return NULL;
-		}
-	}
-	if (key->gotsigs == false) {
-		key->sigs = getkeysigs(key->keyid);
-		key->gotsigs = true;
-	}
-
-	return key->sigs;
-}