diff options
author | Werner Koch <wk@gnupg.org> | 2008-10-20 15:53:23 +0200 |
---|---|---|
committer | Werner Koch <wk@gnupg.org> | 2008-10-20 15:53:23 +0200 |
commit | 0a5f7424660e404e5fd0361b9331d154acf01d6c (patch) | |
tree | b84fb5a994045e12eb326441d8c924094bd915cd /kbx | |
parent | Fix a bug in estream_snprintf. Found by a failed t-gettime under Windows. (diff) | |
download | gnupg2-0a5f7424660e404e5fd0361b9331d154acf01d6c.tar.xz gnupg2-0a5f7424660e404e5fd0361b9331d154acf01d6c.zip |
Marked all unused args on non-W32 platforms.
Diffstat (limited to 'kbx')
-rw-r--r-- | kbx/ChangeLog | 11 | ||||
-rw-r--r-- | kbx/kbxutil.c | 2 | ||||
-rw-r--r-- | kbx/keybox-blob.c | 3 | ||||
-rw-r--r-- | kbx/keybox-dump.c | 2 | ||||
-rw-r--r-- | kbx/keybox-search.c | 2 | ||||
-rw-r--r-- | kbx/keybox-update.c | 9 |
6 files changed, 26 insertions, 3 deletions
diff --git a/kbx/ChangeLog b/kbx/ChangeLog index c814d107e..269b8ddfa 100644 --- a/kbx/ChangeLog +++ b/kbx/ChangeLog @@ -1,3 +1,14 @@ +2008-10-20 Werner Koch <wk@g10code.com> + + * keybox-update.c (blob_filecopy): Remove unused arg n_packets. + (keybox_insert_cert): Adjust for that. + (keybox_update_cert): Mark unused args. + (keybox_set_flags): Ditto. + * keybox-blob.c (create_blob_trailer): Ditto. + * keybox-search.c (keybox_get_flags): Ditto. + * keybox-dump.c (_keybox_dump_find_dups): Ditto. + * kbxutil.c (my_gcry_logger): Ditto. + 2008-05-06 Werner Koch <wk@g10code.com> * keybox-file.c (_keybox_read_blob2): Return GPG_ERR_TOO_SHORT if diff --git a/kbx/kbxutil.c b/kbx/kbxutil.c index cadc06775..afc4b79e4 100644 --- a/kbx/kbxutil.c +++ b/kbx/kbxutil.c @@ -133,6 +133,8 @@ my_strusage( int level ) static void my_gcry_logger (void *dummy, int level, const char *fmt, va_list arg_ptr) { + (void)dummy; + /* Map the log levels. */ switch (level) { diff --git a/kbx/keybox-blob.c b/kbx/keybox-blob.c index 6f89a43f9..64e534f9f 100644 --- a/kbx/keybox-blob.c +++ b/kbx/keybox-blob.c @@ -637,7 +637,8 @@ create_blob_header (KEYBOXBLOB blob, int blobtype, int as_ephemeral) static int create_blob_trailer (KEYBOXBLOB blob) { - return 0; + (void)blob; + return 0; } diff --git a/kbx/keybox-dump.c b/kbx/keybox-dump.c index fe68bf1fc..b671089a0 100644 --- a/kbx/keybox-dump.c +++ b/kbx/keybox-dump.c @@ -579,6 +579,8 @@ _keybox_dump_find_dups (const char *filename, int print_them, FILE *outfp) struct dupitem_s *dupitems; size_t dupitems_size, dupitems_count, lastn, n; char fprbuf[3*20+1]; + + (void)print_them; memset (zerodigest, 0, sizeof zerodigest); diff --git a/kbx/keybox-search.c b/kbx/keybox-search.c index 153186b4f..927399d48 100644 --- a/kbx/keybox-search.c +++ b/kbx/keybox-search.c @@ -1015,6 +1015,8 @@ keybox_get_flags (KEYBOX_HANDLE hd, int what, int idx, unsigned int *value) size_t length; gpg_err_code_t ec; + (void)idx; /* Not yet used. */ + if (!hd) return gpg_error (GPG_ERR_INV_VALUE); if (!hd->found.blob) diff --git a/kbx/keybox-update.c b/kbx/keybox-update.c index 03009618b..c29e31666 100644 --- a/kbx/keybox-update.c +++ b/kbx/keybox-update.c @@ -209,7 +209,7 @@ rename_tmp_file (const char *bakfname, const char *tmpfname, */ static int blob_filecopy (int mode, const char *fname, KEYBOXBLOB blob, - int secret, off_t start_offset, unsigned int n_packets ) + int secret, off_t start_offset) { FILE *fp, *newfp; int rc=0; @@ -392,7 +392,7 @@ keybox_insert_cert (KEYBOX_HANDLE hd, ksba_cert_t cert, rc = _keybox_create_x509_blob (&blob, cert, sha1_digest, hd->ephemeral); if (!rc) { - rc = blob_filecopy (1, fname, blob, hd->secret, 0, 0 ); + rc = blob_filecopy (1, fname, blob, hd->secret, 0); _keybox_release_blob (blob); /* if (!rc && !hd->secret && kb_offtbl) */ /* { */ @@ -406,6 +406,9 @@ int keybox_update_cert (KEYBOX_HANDLE hd, ksba_cert_t cert, unsigned char *sha1_digest) { + (void)hd; + (void)cert; + (void)sha1_digest; return -1; } @@ -426,6 +429,8 @@ keybox_set_flags (KEYBOX_HANDLE hd, int what, int idx, unsigned int value) const unsigned char *buffer; size_t length; + (void)idx; /* Not yet used. */ + if (!hd) return gpg_error (GPG_ERR_INV_VALUE); if (!hd->found.blob) |