aboutsummaryrefslogtreecommitdiffstats
path: root/g10/import.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2008-10-20 13:53:23 +0000
committerWerner Koch <[email protected]>2008-10-20 13:53:23 +0000
commit0a5f7424660e404e5fd0361b9331d154acf01d6c (patch)
treeb84fb5a994045e12eb326441d8c924094bd915cd /g10/import.c
parentFix a bug in estream_snprintf. Found by a failed t-gettime under Windows. (diff)
downloadgnupg-0a5f7424660e404e5fd0361b9331d154acf01d6c.tar.gz
gnupg-0a5f7424660e404e5fd0361b9331d154acf01d6c.zip
Marked all unused args on non-W32 platforms.
Diffstat (limited to '')
-rw-r--r--g10/import.c31
1 files changed, 25 insertions, 6 deletions
diff --git a/g10/import.c b/g10/import.c
index 3614285c9..88eb24e57 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -1238,6 +1238,8 @@ import_revoke_cert( const char *fname, KBNODE node, struct stats_s *stats )
u32 keyid[2];
int rc = 0;
+ (void)fname;
+
assert( !node->next );
assert( node->pkt->pkttype == PKT_SIGNATURE );
assert( node->pkt->pkt.signature->sig_class == 0x20 );
@@ -1365,6 +1367,9 @@ chk_self_sigs( const char *fname, KBNODE keyblock,
u32 bsdate=0,rsdate=0;
KBNODE bsnode=NULL,rsnode=NULL;
+ (void)fname;
+ (void)pk;
+
for( n=keyblock; (n = find_next_kbnode(n, 0)); ) {
if(n->pkt->pkttype==PKT_PUBLIC_SUBKEY)
{
@@ -1537,6 +1542,8 @@ delete_inv_parts( const char *fname, KBNODE keyblock,
KBNODE node;
int nvalid=0, uid_seen=0, subkey_seen=0;
+ (void)fname;
+
for(node=keyblock->next; node; node = node->next ) {
if( node->pkt->pkttype == PKT_USER_ID ) {
uid_seen = 1;
@@ -2047,11 +2054,14 @@ merge_blocks( const char *fname, KBNODE keyblock_orig, KBNODE keyblock,
* append the userid starting with NODE and all signatures to KEYBLOCK.
*/
static int
-append_uid( KBNODE keyblock, KBNODE node, int *n_sigs,
- const char *fname, u32 *keyid )
+append_uid (KBNODE keyblock, KBNODE node, int *n_sigs,
+ const char *fname, u32 *keyid )
{
KBNODE n, n_where=NULL;
+ (void)fname;
+ (void)keyid;
+
assert(node->pkt->pkttype == PKT_USER_ID );
/* find the position */
@@ -2099,6 +2109,9 @@ merge_sigs( KBNODE dst, KBNODE src, int *n_sigs,
KBNODE n, n2;
int found=0;
+ (void)fname;
+ (void)keyid;
+
assert(dst->pkt->pkttype == PKT_USER_ID );
assert(src->pkt->pkttype == PKT_USER_ID );
@@ -2134,12 +2147,15 @@ merge_sigs( KBNODE dst, KBNODE src, int *n_sigs,
* Merge the sigs from SRC onto DST. SRC and DST are both a PKT_xxx_SUBKEY.
*/
static int
-merge_keysigs( KBNODE dst, KBNODE src, int *n_sigs,
- const char *fname, u32 *keyid )
+merge_keysigs (KBNODE dst, KBNODE src, int *n_sigs,
+ const char *fname, u32 *keyid)
{
KBNODE n, n2;
int found=0;
+ (void)fname;
+ (void)keyid;
+
assert( dst->pkt->pkttype == PKT_PUBLIC_SUBKEY
|| dst->pkt->pkttype == PKT_SECRET_SUBKEY );
@@ -2187,11 +2203,14 @@ merge_keysigs( KBNODE dst, KBNODE src, int *n_sigs,
* Mark all new and copied packets by setting flag bit 0.
*/
static int
-append_key( KBNODE keyblock, KBNODE node, int *n_sigs,
- const char *fname, u32 *keyid )
+append_key (KBNODE keyblock, KBNODE node, int *n_sigs,
+ const char *fname, u32 *keyid)
{
KBNODE n;
+ (void)fname;
+ (void)keyid;
+
assert( node->pkt->pkttype == PKT_PUBLIC_SUBKEY
|| node->pkt->pkttype == PKT_SECRET_SUBKEY );