Ensure DB4 backend dbconns memory is initialised to zero

[onak.git] / sixdegrees.c

diff --git a/sixdegrees.c b/sixdegrees.c
index f2700290bdedc1b3bc64fa5f7d5732cb65790546..9d2d68d3dfeb8eca4472e05ac30b00e20baf5d82 100644 (file)
--- a/sixdegrees.c
+++ b/sixdegrees.c
@@ -4,8 +4,6 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2001-2002 Project Purple.
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2001-2002 Project Purple.

- *
- * $Id: sixdegrees.c,v 1.6 2004/03/23 12:33:47 noodles Exp $

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>


@@ -15,6 +13,7 @@
 #include "keydb.h"
 #include "keystructs.h"
 #include "ll.h"
 #include "keydb.h"
 #include "keystructs.h"
 #include "ll.h"

+#include "log.h"

 #include "onak-conf.h"
 #include "stats.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) {
 
        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;
                                curll->object)->keyid);
                } else {
                        sigll = NULL;


@@ -83,15 +83,15 @@ void sixdegrees(uint64_t keyid)
        long degree;
        char *uid;
 
        long degree;
        char *uid;
 

-       cached_getkeysigs(keyid);
+       config.dbbackend->cached_getkeysigs(keyid);

 
        if ((keyinfo = findinhash(keyid)) == NULL) {
 
        if ((keyinfo = findinhash(keyid)) == NULL) {

-               printf("Couldn't find key 0x%llX.\n", keyid);
+               printf("Couldn't find key 0x%" PRIX64 ".\n", keyid);

                return;
        }
 
                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%" PRIX64 " (%s):\n", keyinfo->keyid, uid);

        free(uid);
        uid = NULL;
 
        free(uid);
        uid = NULL;
 


@@ -127,11 +127,13 @@ int main(int argc, char *argv[])
        }
 
        readconfig(NULL);
        }
 
        readconfig(NULL);

-       initdb(true);
+       initlogthing("sixdegrees", config.logfile);
+       config.dbbackend->initdb(true);

        inithash();
        inithash();

-       sixdegrees(getfullkeyid(keyid));
+       sixdegrees(config.dbbackend->getfullkeyid(keyid));

        destroyhash();
        destroyhash();

-       cleanupdb();
+       config.dbbackend->cleanupdb();
+       cleanuplogthing();

        cleanupconfig();
 
        return 0;
        cleanupconfig();
 
        return 0;