projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cscvs to tla changeset 128
[onak.git]
/
stats.c
diff --git
a/stats.c
b/stats.c
index 61b527826c95f3b3fbb47fffea06b434d66aab91..e67ef2f5b73e4e520e628e51034222e5267a988a 100644
(file)
--- a/
stats.c
+++ b/
stats.c
@@
-4,6
+4,8
@@
* Jonathan McDowell <noodles@earth.li>
*
* Copyright 2000-2002 Project Purple
* Jonathan McDowell <noodles@earth.li>
*
* Copyright 2000-2002 Project Purple
+ *
+ * $Id: stats.c,v 1.13 2003/10/11 21:52:18 noodles Exp $
*/
#include <stdio.h>
*/
#include <stdio.h>
@@
-24,7
+26,7
@@
*/
void initcolour(bool parent)
{
*/
void initcolour(bool parent)
{
- unsigned
long
loop;
+ unsigned
int
loop;
struct ll *curkey;
/*
struct ll *curkey;
/*
@@
-60,7
+62,7
@@
unsigned long findpath(struct stats_key *have, struct stats_key *want)
struct ll *sigs = NULL;
struct ll *nextkeys = NULL;
long curdegree = 0;
struct ll *sigs = NULL;
struct ll *nextkeys = NULL;
long curdegree = 0;
- long count = 0;
+
unsigned
long count = 0;
curdegree = 1;
keys = lladd(NULL, want);
curdegree = 1;
keys = lladd(NULL, want);
@@
-75,6
+77,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 &&
* 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 =
((struct stats_key *)sigs->object)->colour == 0) {
count++;
((struct stats_key *)sigs->object)->colour =
@@
-132,8
+135,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.
*/
/*
* 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);
if ((keyinfoa = findinhash(fullhave)) == NULL) {
printf("Couldn't find key 0x%llX.\n", have);
@@
-160,11
+163,17
@@
void dofindpath(uint64_t have, uint64_t want, bool html, int count)
hashelements(),
html ? "<BR>" : "");
if (keyinfoa->colour == 0) {
hashelements(),
html ? "<BR>" : "");
if (keyinfoa->colour == 0) {
- printf("Can't find a link from 0x%08llX to 0x%08llX"
- "%s\n",
+ if (pathnum == 0) {
+ printf("Can't find a link from 0x%08llX to "
+ "0x%08llX%s\n",
have,
want,
html ? "<BR>" : "");
have,
want,
html ? "<BR>" : "");
+ } else {
+ printf("Can't find any further paths%s\n",
+ html ? "<BR>" : "");
+ }
+ pathnum = count;
} else {
printf("%d steps from 0x%08llX to 0x%08llX%s\n",
keyinfoa->colour, have & 0xFFFFFFFF,
} else {
printf("%d steps from 0x%08llX to 0x%08llX%s\n",
keyinfoa->colour, have & 0xFFFFFFFF,
@@
-222,13
+231,6
@@
void dofindpath(uint64_t have, uint64_t want, bool html, int count)
curkey = findinhash(curkey->parent);
}
putchar('\n');
curkey = findinhash(curkey->parent);
}
putchar('\n');
- if (html) {
- printf("<BR><A HREF=\"gpgwww?from=0x%08llX&"
- "to=0x%08llX\">"
- "Find reverse path</A>\n",
- want,
- have);
- }
}
pathnum++;
}
}
pathnum++;
}