diff options
Diffstat (limited to '')
| -rw-r--r-- | g10/ChangeLog | 6 | ||||
| -rw-r--r-- | g10/tdbio.c | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index fbb2930f8..c8e650f80 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,9 @@ +2008-03-26 Werner Koch <[email protected]> + + * tdbio.c (lookup_hashtable): Make cmp args const. + (cmp_trec_fpr): Make FPR const. + (tdbio_search_trust_byfpr): Remove cast. + 2008-03-25 Werner Koch <[email protected]> * keyserver.c (parse_keyrec): Take care of char defaulting to diff --git a/g10/tdbio.c b/g10/tdbio.c index 2429f1a5d..93628499e 100644 --- a/g10/tdbio.c +++ b/g10/tdbio.c @@ -1008,8 +1008,8 @@ drop_from_hashtable( ulong table, byte *key, int keylen, ulong recnum ) */ static int lookup_hashtable( ulong table, const byte *key, size_t keylen, - int (*cmpfnc)(void*, const TRUSTREC *), void *cmpdata, - TRUSTREC *rec ) + int (*cmpfnc)(const void*, const TRUSTREC *), + const void *cmpdata, TRUSTREC *rec ) { int rc; ulong hashrec, item; @@ -1467,10 +1467,10 @@ tdbio_new_recnum() static int -cmp_trec_fpr ( void *fpr, const TRUSTREC *rec ) +cmp_trec_fpr ( const void *fpr, const TRUSTREC *rec ) { - return rec->rectype == RECTYPE_TRUST - && !memcmp( rec->r.trust.fingerprint, fpr, 20); + return (rec->rectype == RECTYPE_TRUST + && !memcmp (rec->r.trust.fingerprint, fpr, 20)); } @@ -1481,7 +1481,7 @@ tdbio_search_trust_byfpr( const byte *fingerprint, TRUSTREC *rec ) /* locate the trust record using the hash table */ rc = lookup_hashtable( get_trusthashrec(), fingerprint, 20, - cmp_trec_fpr, (void*)fingerprint, rec ); + cmp_trec_fpr, fingerprint, rec ); return rc; } |