Ensure DB4 backend dbconns memory is initialised to zero

[onak.git] / sixdegrees.c

diff --git a/sixdegrees.c b/sixdegrees.c
index b78397f1682275c3a7dac19c8d64cbc0d0080a2a..9d2d68d3dfeb8eca4472e05ac30b00e20baf5d82 100644 (file)
--- a/sixdegrees.c
+++ b/sixdegrees.c
@@ -30,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;
@@ -82,15 +83,15 @@ 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%" 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%" PRIX64 " (%s):\n", keyinfo->keyid, uid);
        free(uid);
        uid = NULL;
 
@@ -127,11 +128,12 @@ int main(int argc, char *argv[])
 
        readconfig(NULL);
        initlogthing("sixdegrees", config.logfile);
-       initdb(true);
+       config.dbbackend->initdb(true);
        inithash();
-       sixdegrees(getfullkeyid(keyid));
+       sixdegrees(config.dbbackend->getfullkeyid(keyid));
        destroyhash();
-       cleanupdb();
+       config.dbbackend->cleanupdb();
+       cleanuplogthing();
        cleanupconfig();
 
        return 0;