X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/0f4971d043c38bae1bfb95201622a1405110f899..8d14d66b84cc370cefe54b33de1b95bb49c90bf6:/sixdegrees.c?ds=sidebyside

diff --git a/sixdegrees.c b/sixdegrees.c
index 9b13cfb..b746327 100644
--- a/sixdegrees.c
+++ b/sixdegrees.c
@@ -4,8 +4,6 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2001-2002 Project Purple.
- *
- * $Id: sixdegrees.c,v 1.4 2003/06/04 20:57:12 noodles Exp $
  */
 
 #include <stdio.h>
@@ -15,6 +13,7 @@
 #include "keydb.h"
 #include "keystructs.h"
 #include "ll.h"
+#include "log.h"
 #include "onak-conf.h"
 #include "stats.h"
 
@@ -31,7 +30,8 @@ unsigned long countdegree(struct stats_key *have, bool sigs, int maxdegree)
 
 	while (curll != NULL && curdegree <= maxdegree) {
 		if (sigs) {
-			sigll = cached_getkeysigs(((struct stats_key *)
+			sigll = config.dbbackend->cached_getkeysigs(
+				((struct stats_key *)
 				curll->object)->keyid);
 		} else {
 			sigll = NULL;
@@ -83,15 +83,16 @@ void sixdegrees(uint64_t keyid)
 	long degree;
 	char *uid;
 
-	cached_getkeysigs(keyid);
+	config.dbbackend->cached_getkeysigs(keyid);
 
 	if ((keyinfo = findinhash(keyid)) == NULL) {
-		printf("Couldn't find key 0x%llX.\n", keyid);
+		printf("Couldn't find key 0x%016" PRIX64 ".\n", keyid);
 		return;
 	}
 
-	uid = keyid2uid(keyinfo->keyid);
-	printf("Six degrees for 0x%llX (%s):\n", keyinfo->keyid, uid);
+	uid = config.dbbackend->keyid2uid(keyinfo->keyid);
+	printf("Six degrees for 0x%016" PRIX64 " (%s):\n", keyinfo->keyid,
+			uid);
 	free(uid);
 	uid = NULL;
 
@@ -126,12 +127,14 @@ int main(int argc, char *argv[])
 		keyid = strtoll(argv[1], NULL, 16);
 	}
 
-	readconfig();
-	initdb();
+	readconfig(NULL);
+	initlogthing("sixdegrees", config.logfile);
+	config.dbbackend->initdb(true);
 	inithash();
-	sixdegrees(getfullkeyid(keyid));
+	sixdegrees(config.dbbackend->getfullkeyid(keyid));
 	destroyhash();
-	cleanupdb();
+	config.dbbackend->cleanupdb();
+	cleanuplogthing();
 	cleanupconfig();
 
 	return 0;