From 816bee1fa0d833ac72ea4e7d52465e6e1da2645d Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 10 Aug 2011 14:11:30 +0200 Subject: Fixed set but unused variable bugs --- agent/ChangeLog | 8 ++++++++ agent/command-ssh.c | 2 -- agent/genkey.c | 4 ++-- agent/gpg-agent.c | 3 +-- 4 files changed, 11 insertions(+), 6 deletions(-) (limited to 'agent') diff --git a/agent/ChangeLog b/agent/ChangeLog index b4a333a71..ec2dca219 100644 --- a/agent/ChangeLog +++ b/agent/ChangeLog @@ -1,3 +1,11 @@ +2011-08-10 Werner Koch + + * genkey.c (check_passphrase_pattern): Use gpg_strerror instead of + strerror. + * command-ssh.c (ssh_receive_mpint_list): Remove unused var + ELEMS_PUBLIC_N. + * gpg-agent.c (main): Remove unused var MAY_COREDUMP. + 2011-08-09 Ben Kibbey * command.c (option_handler): Have option s2k-count match the diff --git a/agent/command-ssh.c b/agent/command-ssh.c index ae193ec94..7b4d47924 100644 --- a/agent/command-ssh.c +++ b/agent/command-ssh.c @@ -933,7 +933,6 @@ static gpg_error_t ssh_receive_mpint_list (estream_t stream, int secret, ssh_key_type_spec_t key_spec, gcry_mpi_t **mpi_list) { - unsigned int elems_public_n; const char *elems_public; unsigned int elems_n; const char *elems; @@ -952,7 +951,6 @@ ssh_receive_mpint_list (estream_t stream, int secret, elems_n = strlen (elems); elems_public = key_spec.elems_key_public; - elems_public_n = strlen (elems_public); mpis = xtrycalloc (elems_n + 1, sizeof *mpis ); if (!mpis) diff --git a/agent/genkey.c b/agent/genkey.c index e01a7bcb6..09f1c72aa 100644 --- a/agent/genkey.c +++ b/agent/genkey.c @@ -106,7 +106,7 @@ check_passphrase_pattern (ctrl_t ctrl, const char *pw) if (!infp) { err = gpg_error_from_syserror (); - log_error (_("error creating temporary file: %s\n"), strerror (errno)); + log_error (_("error creating temporary file: %s\n"), gpg_strerror (err)); return 1; /* Error - assume password should not be used. */ } @@ -114,7 +114,7 @@ check_passphrase_pattern (ctrl_t ctrl, const char *pw) { err = gpg_error_from_syserror (); log_error (_("error writing to temporary file: %s\n"), - strerror (errno)); + gpg_strerror (err)); fclose (infp); return 1; /* Error - assume password should not be used. */ } diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index a5486647e..061687550 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -568,7 +568,6 @@ main (int argc, char **argv ) { ARGPARSE_ARGS pargs; int orig_argc; - int may_coredump; char **orig_argv; FILE *configfp = NULL; char *configname = NULL; @@ -642,7 +641,7 @@ main (int argc, char **argv ) setup_libgcrypt_logging (); gcry_control (GCRYCTL_USE_SECURE_RNDPOOL); - may_coredump = disable_core_dumps (); + disable_core_dumps (); /* Set default options. */ parse_rereadable_options (NULL, 0); /* Reset them to default values. */ -- cgit v1.2.3