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 03def747c2fb5d77707316a3eb797af267d811fe..3aa5d749b3bca9691370ecb8d16a3a8ab0afcdfc 100644 (file)
--- a/hash.c
+++ b/hash.c
@@ -5,7 +5,7 @@
  *
  * Copyright 2000-2002 Project Purple
  *
  *
  * 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>
  */
 
 #include <stdio.h>


@@ -123,7 +123,7 @@ unsigned long hashelements(void)
        return elements;
 }
 
        return elements;
 }
 

-struct ll *gethashtableentry(int entry)
+struct ll *gethashtableentry(unsigned int entry)

 {
        return hashtable[entry];
 }
 {
        return hashtable[entry];
 }

diff --git a/hash.h b/hash.h
index 3044c615bb38c27a42ba056009cb240002afa888..f26ad05cd06964edaa937df74d657fd2c9596a47 100644 (file)
--- a/hash.h
+++ b/hash.h
@@ -5,7 +5,7 @@
  *
  * Copyright 2000-2002 Project Purple
  *
  *
  * 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__
  */
 
 #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.
  */
  *     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__ */
 
 #endif /* __HASH_H__ */

diff --git a/keyindex.c b/keyindex.c
index 464a7baaecd76d1eacbbb7726d2264851b265229..b81ec61e68e793ab11da013452c192b2ccb37c1f 100644 (file)
--- a/keyindex.c
+++ b/keyindex.c
@@ -5,7 +5,7 @@
  *
  * Copyright 2002 Project Purple
  *
  *
  * 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>
  */
 
 #include <assert.h>


@@ -294,7 +294,7 @@ int mrkey_index(struct openpgp_publickey *keys)
                                        keys->publickey->data[9];
                        break;
                case 4:
                                        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]);
 
                        for (i = 0; i < fplength; i++) {
                                printf("%02X", fp[i]);

diff --git a/parsekey.c b/parsekey.c
index 83fca29f9ce19902756c34fb59895c95b6542ecd..a498f4c0e606d15a6f1a636739a68a9de35bf2b6 100644 (file)
--- a/parsekey.c
+++ b/parsekey.c
@@ -5,7 +5,7 @@
  *
  * Copyright 2002 Project Purple
  *
  *
  * 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>
  */
 
 #include <assert.h>


@@ -135,7 +135,7 @@ int parse_keys(struct openpgp_packet_list *packets,
  */
 int debug_packet(struct openpgp_packet *packet)
 {
  */
 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);
                        packet->newformat,
                        packet->tag,
                        packet->length);

diff --git a/stats.c b/stats.c
index 108b8cc9a778b774a20a0e452df61f65d0a9b55b..e67ef2f5b73e4e520e628e51034222e5267a988a 100644 (file)
--- a/stats.c
+++ b/stats.c
@@ -5,7 +5,7 @@
  *
  * Copyright 2000-2002 Project Purple
  *
  *
  * 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>
  */
 
 #include <stdio.h>


@@ -26,7 +26,7 @@
  */
 void initcolour(bool parent)
 {
  */
 void initcolour(bool parent)
 {

-       unsigned long loop;
+       unsigned int loop;

        struct ll *curkey;
 
        /*
        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;
        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);


@@ -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.
         */
        /*
         * 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);