diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/armor.c | 3 | ||||
| -rw-r--r-- | g10/cipher.c | 1 | ||||
| -rw-r--r-- | g10/getkey.c | 1 | ||||
| -rw-r--r-- | g10/parse-packet.c | 2 | ||||
| -rw-r--r-- | g10/trustdb.c | 2 | ||||
| -rw-r--r-- | g10/trustdb.h | 2 |
6 files changed, 5 insertions, 6 deletions
diff --git a/g10/armor.c b/g10/armor.c index 1d58c4146..ab49cc680 100644 --- a/g10/armor.c +++ b/g10/armor.c @@ -29,6 +29,7 @@ #include "iobuf.h" #include "memory.h" #include "util.h" +#include "iobuf.h" #include "filter.h" #include "packet.h" #include "options.h" @@ -373,8 +374,6 @@ check_input( armor_filter_context_t *afx, IOBUF a ) { int rc = 0; int i; - size_t n; - unsigned emplines; byte *line; unsigned len; unsigned maxlen; diff --git a/g10/cipher.c b/g10/cipher.c index c654db011..0d6e54ff2 100644 --- a/g10/cipher.c +++ b/g10/cipher.c @@ -32,6 +32,7 @@ #include "filter.h" #include "packet.h" #include "options.h" +#include "main.h" #define MIN_PARTIAL_SIZE 512 diff --git a/g10/getkey.c b/g10/getkey.c index aa2a8ce34..0a8e4b2bd 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -225,7 +225,6 @@ getkey_disable_caches() #if MAX_PK_CACHE_ENTRIES { pk_cache_entry_t ce, ce2; - u32 keyid[2]; for( ce = pk_cache; ce; ce = ce2 ) { ce2 = ce->next; diff --git a/g10/parse-packet.c b/g10/parse-packet.c index 3acce404b..53d8c7bfb 100644 --- a/g10/parse-packet.c +++ b/g10/parse-packet.c @@ -922,7 +922,7 @@ parse_sig_subpkt( const byte *buffer, sigsubpkttype_t reqtype, size_t *ret_n ) buffer += n; buflen -=n; } if( reqtype == SIGSUBPKT_TEST_CRITICAL ) - return buffer; /* as value true to indicate that there is no + return buffer; /* as value true to indicate that there is no */ /* critical bit we don't understand */ return NULL; /* end of packets; not found */ diff --git a/g10/trustdb.c b/g10/trustdb.c index 759720cd7..674240a7b 100644 --- a/g10/trustdb.c +++ b/g10/trustdb.c @@ -1749,7 +1749,7 @@ enum_cert_paths( void **context, ulong *lid, /**************** * Print the current path */ -int +void enum_cert_paths_print( void **context, FILE *fp, int refresh, ulong selected_lid ) { diff --git a/g10/trustdb.h b/g10/trustdb.h index 52caadb8f..3dd6b6203 100644 --- a/g10/trustdb.h +++ b/g10/trustdb.h @@ -53,7 +53,7 @@ int check_trust( PKT_public_key *pk, unsigned *r_trustlevel ); int query_trust_info( PKT_public_key *pk ); int enum_cert_paths( void **context, ulong *lid, unsigned *ownertrust, unsigned *validity ); -int enum_cert_paths_print( void **context, FILE *fp, +void enum_cert_paths_print( void **context, FILE *fp, int refresh, ulong selected_lid ); unsigned get_ownertrust( ulong lid ); int get_ownertrust_info( ulong lid ); |