From: Jonathan McDowell <noodles@earth.li>
Date: Mon, 31 May 2004 23:48:06 +0000 (+0000)
Subject: cscvs to tla changeset 109
X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/commitdiff_plain/ce8be6edbed5c435a8f957781a26e6f9eac6fcec?ds=sidebyside

cscvs to tla changeset 109
Author: noodles
Date: 2003/10/11 21:52:18
Various cleanups with regards to types.
---

diff --git a/hash.c b/hash.c
index 03def74..3aa5d74 100644
--- a/hash.c
+++ b/hash.c
@@ -5,7 +5,7 @@
  *
  * Copyright 2000-2002 Project Purple
  *
- * $Id: hash.c,v 1.9 2003/10/04 10:21:40 noodles Exp $
+ * $Id: hash.c,v 1.10 2003/10/11 21:52:18 noodles Exp $
  */
 
 #include <stdio.h>
@@ -123,7 +123,7 @@ unsigned long hashelements(void)
 	return elements;
 }
 
-struct ll *gethashtableentry(int entry)
+struct ll *gethashtableentry(unsigned int entry)
 {
 	return hashtable[entry];
 }
diff --git a/hash.h b/hash.h
index 3044c61..f26ad05 100644
--- a/hash.h
+++ b/hash.h
@@ -5,7 +5,7 @@
  *
  * Copyright 2000-2002 Project Purple
  *
- * $Id: hash.h,v 1.4 2003/06/04 20:57:08 noodles Exp $
+ * $Id: hash.h,v 1.5 2003/10/11 21:52:18 noodles Exp $
  */
 
 #ifndef __HASH_H__
@@ -73,6 +73,6 @@ unsigned long hashelements(void);
  *	Gets a particular entry from the hash. Useful for doing something over
  *	all entries in the hash.
  */
-struct ll *gethashtableentry(int entry);
+struct ll *gethashtableentry(unsigned int entry);
 
 #endif /* __HASH_H__ */
diff --git a/keyindex.c b/keyindex.c
index 464a7ba..b81ec61 100644
--- a/keyindex.c
+++ b/keyindex.c
@@ -5,7 +5,7 @@
  *
  * Copyright 2002 Project Purple
  *
- * $Id: keyindex.c,v 1.12 2003/06/08 21:11:01 noodles Exp $
+ * $Id: keyindex.c,v 1.13 2003/10/11 21:52:18 noodles Exp $
  */
 
 #include <assert.h>
@@ -294,7 +294,7 @@ int mrkey_index(struct openpgp_publickey *keys)
 					keys->publickey->data[9];
 			break;
 		case 4:
-			get_fingerprint(keys->publickey, fp, &fplength);
+			(void) get_fingerprint(keys->publickey, fp, &fplength);
 
 			for (i = 0; i < fplength; i++) {
 				printf("%02X", fp[i]);
diff --git a/parsekey.c b/parsekey.c
index 83fca29..a498f4c 100644
--- a/parsekey.c
+++ b/parsekey.c
@@ -5,7 +5,7 @@
  *
  * Copyright 2002 Project Purple
  *
- * $Id: parsekey.c,v 1.16 2003/10/04 10:21:40 noodles Exp $
+ * $Id: parsekey.c,v 1.17 2003/10/11 21:52:18 noodles Exp $
  */
 
 #include <assert.h>
@@ -135,7 +135,7 @@ int parse_keys(struct openpgp_packet_list *packets,
  */
 int debug_packet(struct openpgp_packet *packet)
 {
-	printf("\tNew format: %d, Tag: %d, Length: %d\n",
+	printf("\tNew format: %d, Tag: %u, Length: %d\n",
 			packet->newformat,
 			packet->tag,
 			packet->length);
diff --git a/stats.c b/stats.c
index 108b8cc..e67ef2f 100644
--- a/stats.c
+++ b/stats.c
@@ -5,7 +5,7 @@
  *
  * Copyright 2000-2002 Project Purple
  *
- * $Id: stats.c,v 1.12 2003/06/08 21:11:01 noodles Exp $
+ * $Id: stats.c,v 1.13 2003/10/11 21:52:18 noodles Exp $
  */
 
 #include <stdio.h>
@@ -26,7 +26,7 @@
  */
 void initcolour(bool parent)
 {
-	unsigned long loop;
+	unsigned int loop;
 	struct ll *curkey;
 
 	/*
@@ -62,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;
-	long count = 0;
+	unsigned long count = 0;
 	
 	curdegree = 1;
 	keys = lladd(NULL, want);
@@ -135,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.
 	 */
-	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);