Ensure DB4 backend dbconns memory is initialised to zero

[onak.git] / maxpath.c

diff --git a/maxpath.c b/maxpath.c
index 171d6b1a4793c63065967b9502cc820f67c3242c..ccd500839fe00f0a0d5eddb801822af3597f25fa 100644 (file)
--- a/maxpath.c
+++ b/maxpath.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: maxpath.c,v 1.9 2003/06/04 20:57:10 noodles Exp $

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


@@ -16,6 +14,7 @@
 #include "hash.h"
 #include "keydb.h"
 #include "ll.h"
 #include "hash.h"
 #include "keydb.h"
 #include "ll.h"

+#include "log.h"

 #include "onak-conf.h"
 #include "stats.h"
 
 #include "onak-conf.h"
 #include "stats.h"
 


@@ -32,7 +31,7 @@ void findmaxpath(unsigned long max)
         * My (noodles@earth.li, DSA) key is in the strongly connected set of
         * keys, so we use it as a suitable starting seed.
         */
         * My (noodles@earth.li, DSA) key is in the strongly connected set of
         * keys, so we use it as a suitable starting seed.
         */

-       cached_getkeysigs(0xF1BD4BE45B430367);
+       config.dbbackend->cached_getkeysigs(0xF1BD4BE45B430367);

 
        /*
         * Loop through the hash examining each key present and finding the
 
        /*
         * Loop through the hash examining each key present and finding the


@@ -43,7 +42,8 @@ void findmaxpath(unsigned long max)
        for (loop = 0; (loop < HASHSIZE) && (distance < max); loop++) {
                curkey = gethashtableentry(loop);
                while (curkey != NULL && distance < max) {
        for (loop = 0; (loop < HASHSIZE) && (distance < max); loop++) {
                curkey = gethashtableentry(loop);
                while (curkey != NULL && distance < max) {

-                       cached_getkeysigs(((struct stats_key *)
+                       config.dbbackend->cached_getkeysigs(
+                                       ((struct stats_key *)

                                        curkey->object)->keyid);
                        initcolour(false);
                        tmp = furthestkey((struct stats_key *)
                                        curkey->object)->keyid);
                        initcolour(false);
                        tmp = furthestkey((struct stats_key *)


@@ -52,8 +52,9 @@ void findmaxpath(unsigned long max)
                                from = (struct stats_key *)curkey->object;
                                to = tmp;
                                distance = to->colour;
                                from = (struct stats_key *)curkey->object;
                                to = tmp;
                                distance = to->colour;

-                               printf("Current max path (#%ld) is from %llX"
-                                               " to %llX (%ld steps)\n", 
+                               printf("Current max path (#%ld) is from %"
+                                               PRIX64 " to %" PRIX64 
+                                               " (%ld steps)\n", 

                                                loop,
                                                from->keyid,
                                                to->keyid,
                                                loop,
                                                from->keyid,
                                                to->keyid,


@@ -62,7 +63,7 @@ void findmaxpath(unsigned long max)
                        curkey=curkey->next;
                }
        }
                        curkey=curkey->next;
                }
        }

-       printf("Max path is from %llX to %llX (%ld steps)\n",
+       printf("Max path is from %" PRIX64 " to %" PRIX64 " (%ld steps)\n",

                        from->keyid,
                        to->keyid,
                        distance);
                        from->keyid,
                        to->keyid,
                        distance);


@@ -71,14 +72,16 @@ void findmaxpath(unsigned long max)
 
 int main(int argc, char *argv[])
 {
 
 int main(int argc, char *argv[])
 {

-       readconfig();
-       initdb();
+       readconfig(NULL);
+       initlogthing("maxpath", config.logfile);
+       config.dbbackend->initdb(true);

        inithash();
        findmaxpath(30);
        printf("--------\n");
        findmaxpath(30);
        destroyhash();
        inithash();
        findmaxpath(30);
        printf("--------\n");
        findmaxpath(30);
        destroyhash();

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

        cleanupconfig();
        
        return EXIT_SUCCESS;
        cleanupconfig();
        
        return EXIT_SUCCESS;