X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/1921fa44cfae203ae40e853ee9ecedb206fa9413..refs/heads/switch-to-debhelper:/stats.c?ds=inline

diff --git a/stats.c b/stats.c
index bf85da6..bcc4f91 100644
--- a/stats.c
+++ b/stats.c
@@ -1,9 +1,20 @@
 /*
  * stats.c - various routines to do stats on the key graph
  *
- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2000-2004,2007-2009 Jonathan McDowell <noodles@earth.li>
  *
- * Copyright 2000-2002 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include <stdio.h>
@@ -139,11 +150,11 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count)
 	(void) config.dbbackend->cached_getkeysigs(fullwant);
 
 	if ((keyinfoa = findinhash(fullhave)) == NULL) {
-		printf("Couldn't find key 0x%" PRIx64 ".\n", have);
+		printf("Couldn't find key 0x%016" PRIX64 ".\n", have);
 		return;
 	}
 	if ((keyinfob = findinhash(fullwant)) == NULL) {
-		printf("Couldn't find key 0x%" PRIx64 ".\n", want);
+		printf("Couldn't find key 0x%016" PRIX64 ".\n", want);
 		return;
 	}
 
@@ -164,8 +175,8 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count)
 			html ? "<BR>" : "");
 		if (keyinfoa->colour == 0) {
 			if (pathnum == 0) {
-				printf("Can't find a link from 0x%08" PRIx64
-				" to 0x%08" PRIx64 "%s\n",
+				printf("Can't find a link from 0x%08" PRIX64
+				" to 0x%08" PRIX64 "%s\n",
 				have,
 				want,
 				html ? "<BR>" : "");
@@ -175,7 +186,7 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count)
 			}
 			pathnum = count;
 		} else {
-			printf("%d steps from 0x%08" PRIx64 " to 0x%08" PRIx64
+			printf("%d steps from 0x%08" PRIX64 " to 0x%08" PRIX64
 				"%s\n",
 				keyinfoa->colour, have & 0xFFFFFFFF,
 				want & 0xFFFFFFFF,
@@ -186,7 +197,7 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count)
 						curkey->keyid);
 				if (html && uid == NULL) {
 					printf("<a href=\"lookup?op=get&search="
-						"0x%08" PRIx64 "\">0x%08" PRIx64
+						"0x%08" PRIX64 "\">0x%08" PRIX64
 						"</a> (["
 						"User id not found])%s<BR>\n",
 						curkey->keyid & 0xFFFFFFFF,
@@ -195,10 +206,10 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count)
 							"" : " signs");
 				} else if (html && uid != NULL) {
 					printf("<a href=\"lookup?op=get&search="
-						"0x%08" PRIx64 "\">0x%08"
-						PRIx64 "</a>"
+						"0x%08" PRIX64 "\">0x%08"
+						PRIX64 "</a>"
 						" (<a href=\"lookup?op=vindex&"
-						"search=0x%08" PRIx64 
+						"search=0x%08" PRIX64 
 						"\">%s</a>)%s"
 						"<BR>\n",
 						curkey->keyid & 0xFFFFFFFF,
@@ -208,7 +219,7 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count)
 						(curkey->keyid == fullwant) ?
 						"" : " signs");
 				} else {
-					printf("0x%08" PRIx64 " (%s)%s\n",
+					printf("0x%08" PRIX64 " (%s)%s\n",
 						curkey->keyid & 0xFFFFFFFF,
 						(uid == NULL) ?
 							"[User id not found]" :
@@ -232,7 +243,7 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count)
 			}
 			curkey = keyinfoa;
 			while (curkey != NULL && curkey->keyid != 0) {
-				printf("0x%08" PRIx64 " ",
+				printf("0x%08" PRIX64 " ",
 						curkey->keyid & 0xFFFFFFFF);
 				curkey = findinhash(curkey->parent);
 			}