X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/a8b85fe447aaf5520ba259ab9eeb86a7f3446763..8b4052ad6015aa9f54c9c824f28655f230d09d8d:/stats.c

diff --git a/stats.c b/stats.c
index 6a61879..7b516c6 100644
--- a/stats.c
+++ b/stats.c
@@ -4,8 +4,6 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2000-2002 Project Purple
- *
- * $Id: stats.c,v 1.11 2003/06/04 22:32:56 noodles Exp $
  */
 
 #include <stdio.h>
@@ -26,7 +24,7 @@
  */
 void initcolour(bool parent)
 {
-	unsigned long loop;
+	unsigned int loop;
 	struct ll *curkey;
 
 	/*
@@ -62,7 +60,7 @@ unsigned long findpath(struct stats_key *have, struct stats_key *want)
 	struct ll *sigs = NULL;
 	struct ll *nextkeys = NULL;
 	long curdegree = 0;
-	long count = 0;
+	unsigned long count = 0;
 	
 	curdegree = 1;
 	keys = lladd(NULL, want);
@@ -77,6 +75,7 @@ unsigned long findpath(struct stats_key *have, struct stats_key *want)
 			 * it and add its sigs to the list we want to look at.
 			 */
 			if (!((struct stats_key *)sigs->object)->disabled &&
+			    !((struct stats_key *)sigs->object)->revoked &&
 			    ((struct stats_key *)sigs->object)->colour == 0) {
 				count++;
 				((struct stats_key *)sigs->object)->colour =
@@ -134,8 +133,8 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count)
 	/*
 	 * Make sure the keys we have and want are in the cache.
 	 */
-	cached_getkeysigs(fullhave);
-	cached_getkeysigs(fullwant);
+	(void) cached_getkeysigs(fullhave);
+	(void) cached_getkeysigs(fullwant);
 
 	if ((keyinfoa = findinhash(fullhave)) == NULL) {
 		printf("Couldn't find key 0x%llX.\n", have);