X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=stats.h;h=3696e0849283cbd9e76a9e6e4f04532ca9e2753d;hb=408ea0b9ceafdc9f861701cfb14b57d09aa47777;hp=df32ab66189a6345e4f2c20c58f55f4bc751239d;hpb=4aafe74aea2d616a5d9611c6e3c01a182a0b37ec;p=onak.git

diff --git a/stats.h b/stats.h
index df32ab6..3696e08 100644
--- a/stats.h
+++ b/stats.h
@@ -19,28 +19,12 @@ key_getsigns - get the keys a key signs. */
 #ifndef __STATS_H__
 #define __STATS_H__
 
-#include <stdbool.h>
-// #include <stdint.h>
 #include <inttypes.h>
+#include <stdbool.h>
 
+#include "keystructs.h"
 #include "ll.h"
 
-/**
- *	struct stats_key - holds key details suitable for doing stats on.
- *	@keyid: The keyid.
- *	@colour: Used for marking during DFS/BFS.
- *	@parent: The key that lead us to this one for DFS/BFS.
- *	@sigs: A linked list of the signatures on this key.
- *	@gotsigs: A bool indicating if we've initialized the sigs element yet.
- */
-struct stats_key {
-	uint64_t keyid;
-	int colour;
-	uint64_t parent;
-	struct ll *sigs;
-	bool gotsigs;
-};
-
 /**
  *	initcolour - Clear the key graph ready for use.
  *	@parent: Do we want to clear the parent pointers too?
@@ -66,12 +50,13 @@ unsigned long findpath(struct stats_key *have, struct stats_key *want);
  *	@have: The key we have.
  *	@want: The key we want to get to.
  *	@html: Should we output in html.
+ *	@count: How many paths we should look for at most.
  *
  *	This does a breadth first search on the key tree, starting with the
  *	key we have. It returns as soon as a path is found or when we run out
  *	of keys; whichever comes sooner.
  */
-void dofindpath(uint64_t have, uint64_t want, bool html);
+void dofindpath(uint64_t have, uint64_t want, bool html, int count);
 
 struct stats_key *furthestkey(struct stats_key *have);