Silence unused variable or parameter warnings.

--
This commit is contained in:
Werner Koch 2015-11-27 17:53:52 +01:00
parent 64e8708339
commit 022342e284
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
6 changed files with 23 additions and 10 deletions

View File

@ -717,6 +717,8 @@ setup_qualitybar (ctrl_t ctrl)
char *tmpstr, *tmpstr2; char *tmpstr, *tmpstr2;
const char *tooltip; const char *tooltip;
(void)ctrl;
/* TRANSLATORS: This string is displayed by Pinentry as the label /* TRANSLATORS: This string is displayed by Pinentry as the label
for the quality bar. */ for the quality bar. */
tmpstr = try_percent_escape (L_("Quality:"), "\t\r\n\f\v"); tmpstr = try_percent_escape (L_("Quality:"), "\t\r\n\f\v");

View File

@ -1178,7 +1178,9 @@ main (int argc, char **argv )
gnupg_fd_t fd_extra = GNUPG_INVALID_FD; gnupg_fd_t fd_extra = GNUPG_INVALID_FD;
gnupg_fd_t fd_browser = GNUPG_INVALID_FD; gnupg_fd_t fd_browser = GNUPG_INVALID_FD;
gnupg_fd_t fd_ssh = GNUPG_INVALID_FD; gnupg_fd_t fd_ssh = GNUPG_INVALID_FD;
#ifndef HAVE_W32_SYSTEM
pid_t pid; pid_t pid;
#endif
/* Remove the DISPLAY variable so that a pinentry does not /* Remove the DISPLAY variable so that a pinentry does not
default to a specific display. There is still a default default to a specific display. There is still a default
@ -1237,7 +1239,6 @@ main (int argc, char **argv )
#ifdef HAVE_W32_SYSTEM #ifdef HAVE_W32_SYSTEM
(void)csh_style; (void)csh_style;
(void)nodetach; (void)nodetach;
pid = getpid ();
#else /*!HAVE_W32_SYSTEM*/ #else /*!HAVE_W32_SYSTEM*/
pid = fork (); pid = fork ();
if (pid == (pid_t)-1) if (pid == (pid_t)-1)

View File

@ -267,6 +267,7 @@ direct_open (const char *fname, const char *mode, int mode700)
unsigned long da, cd, sm; unsigned long da, cd, sm;
HANDLE hfile; HANDLE hfile;
(void)mode700;
/* Note, that we do not handle all mode combinations */ /* Note, that we do not handle all mode combinations */
/* According to the ReactOS source it seems that open() of the /* According to the ReactOS source it seems that open() of the
@ -2271,8 +2272,6 @@ iobuf_set_limit (iobuf_t a, off_t nlimit)
off_t off_t
iobuf_get_filelength (iobuf_t a, int *overflow) iobuf_get_filelength (iobuf_t a, int *overflow)
{ {
struct stat st;
if (overflow) if (overflow)
*overflow = 0; *overflow = 0;
@ -2330,11 +2329,15 @@ iobuf_get_filelength (iobuf_t a, int *overflow)
} }
log_error ("GetFileSize for handle %p failed: %s\n", log_error ("GetFileSize for handle %p failed: %s\n",
fp, w32_strerror (0)); fp, w32_strerror (0));
#else #else /*!HAVE_W32_SYSTEM*/
if ( !fstat (FD2INT (fp), &st) ) {
return st.st_size; struct stat st;
log_error("fstat() failed: %s\n", strerror(errno) );
#endif if ( !fstat (FD2INT (fp), &st) )
return st.st_size;
log_error("fstat() failed: %s\n", strerror(errno) );
}
#endif /*!HAVE_W32_SYSTEM*/
} }
return 0; return 0;

View File

@ -38,7 +38,7 @@
#include <unistd.h> #include <unistd.h>
/* We can easiliy replace this code by the socket wrappers from libassuan. */ /* We can easiliy replace this code by the socket wrappers from libassuan. */
#warning Please do not use this module anymore #warning Remove this code; it is only used on w32 by symcryptrun.
#define DIRSEP_C '\\' #define DIRSEP_C '\\'

View File

@ -870,7 +870,7 @@ list_keyblock_pka (ctrl_t ctrl, kbnode_t keyblock)
char pkstrbuf[PUBKEY_STRING_SIZE]; char pkstrbuf[PUBKEY_STRING_SIZE];
char *hexfpr; char *hexfpr;
char *hexkeyblock = NULL; char *hexkeyblock = NULL;
unsigned int hexkeyblocklen; unsigned int hexkeyblocklen = 0; /* Init to avoid -Wmaybe-uninitialized. */
const char *s; const char *s;
/* Get the keyid from the keyblock. */ /* Get the keyid from the keyblock. */

View File

@ -992,9 +992,16 @@ tdb_get_validity_core (PKT_public_key *pk, PKT_user_id *uid,
TRUSTREC trec, vrec; TRUSTREC trec, vrec;
gpg_error_t err; gpg_error_t err;
ulong recno; ulong recno;
#ifdef USE_TOFU
unsigned int tofu_validity = TRUST_UNKNOWN; unsigned int tofu_validity = TRUST_UNKNOWN;
#endif
unsigned int validity = TRUST_UNKNOWN; unsigned int validity = TRUST_UNKNOWN;
#ifndef USE_TOFU
(void)sig;
(void)may_ask;
#endif
init_trustdb (); init_trustdb ();
/* If we have no trustdb (which also means it has not been created) /* If we have no trustdb (which also means it has not been created)