From 0e960d940a3b52406bb72af2750b6b6d29e39067 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Tue, 20 Apr 2010 01:11:35 +0000 Subject: common/ 2010-04-20 Marcus Brinkmann * logging.c (do_log_ignore_arg): New helper function. (log_string): Use it to remove ugly volatile hack that causes gcc warning. (log_flush): Likewise. * sysutils.c (gnupg_unsetenv) [!HAVE_W32CE_SYSTEM]: Return something. (gnupg_setenv) [!HAVE_W32CE_SYSTEM]: Likewise. * pka.c (get_pka_info): Solve strict aliasing rule violation. * t-exechelp.c (test_close_all_fds): Use dummy variables to silence gcc warning. kbx/ 2010-04-20 Marcus Brinkmann * keybox-update.c [!HAVE_DOSISH_SYSTEM]: Include ../common/sysutils.h even then to silence gcc warning about missing declaration of gnupg_remove. tools/ 2010-04-20 Marcus Brinkmann * gpgconf-comp.c (option_check_validity): Use dummy variables to silence gcc warning. --- tools/ChangeLog | 5 +++++ tools/gpgconf-comp.c | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/ChangeLog b/tools/ChangeLog index b3e846a53..76b42763a 100644 --- a/tools/ChangeLog +++ b/tools/ChangeLog @@ -1,3 +1,8 @@ +2010-04-20 Marcus Brinkmann + + * gpgconf-comp.c (option_check_validity): Use dummy variables to + silence gcc warning. + 2010-04-14 Werner Koch * Makefile.am (bin_PROGRAMS) [W32CE]: Exclude gpgkey2ssh. diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c index 4fe84cf27..8f9278d28 100644 --- a/tools/gpgconf-comp.c +++ b/tools/gpgconf-comp.c @@ -2241,8 +2241,11 @@ option_check_validity (gc_option_t *option, unsigned long flags, } else if (gc_arg_type[option->arg_type].fallback == GC_ARG_TYPE_INT32) { + long res; + gpg_err_set_errno (0); - (void) strtol (arg, &arg, 0); + res = strtol (arg, &arg, 0); + (void) res; if (errno) gc_error (1, errno, "invalid argument for option %s", @@ -2254,8 +2257,11 @@ option_check_validity (gc_option_t *option, unsigned long flags, } else if (gc_arg_type[option->arg_type].fallback == GC_ARG_TYPE_INT32) { + unsigned long res; + gpg_err_set_errno (0); - (void) strtoul (arg, &arg, 0); + res = strtoul (arg, &arg, 0); + (void) res; if (errno) gc_error (1, errno, "invalid argument for option %s", -- cgit v1.2.3