diff options
| author | Werner Koch <wk@gnupg.org> | 2016-10-07 07:54:38 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2016-10-07 07:54:38 +0200 |
| commit | 5d43d28aa3c44c3a27fde823f467b0c4be1a58c2 (patch) | |
| tree | ac9b72878c427c77de2058c3ffbf230aaf7a910d | |
| parent | agent, dirmngr, scd: Fix init_common_subsystems. (diff) | |
| download | gnupg2-5d43d28aa3c44c3a27fde823f467b0c4be1a58c2.tar.xz gnupg2-5d43d28aa3c44c3a27fde823f467b0c4be1a58c2.zip | |
gpg: Put extra parens around bit tests.
* g10/options.h (DBG_MPI): New.
* g10/gpg.c (set_debug): Use macro or extra parens for binary operator.
* g10/parse-packet.c (set_packet_list_mode): Use dbg macro.
Signed-off-by: Werner Koch <wk@gnupg.org>
| -rw-r--r-- | doc/HACKING | 2 | ||||
| -rw-r--r-- | g10/gpg.c | 10 | ||||
| -rw-r--r-- | g10/options.h | 3 | ||||
| -rw-r--r-- | g10/parse-packet.c | 2 |
4 files changed, 10 insertions, 7 deletions
diff --git a/doc/HACKING b/doc/HACKING index bb04fdf6b..e7174793e 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -174,6 +174,8 @@ Note that such a comment will be removed if the git commit option indicate a problem with the code. - Never init static or file local variables to 0 to make sure they end up in BSS. + - But extra parenthesis around terms with binary operators to make + it clear that the binary operator was indeed intended. - Use --enable-maintainer-mode with configure so that all suitable warnings are enabled. @@ -1190,15 +1190,15 @@ set_debug (const char *level) g10_exit (2); } - if (opt.debug & DBG_MEMORY_VALUE ) + if ((opt.debug & DBG_MEMORY_VALUE)) memory_debug_mode = 1; - if (opt.debug & DBG_MEMSTAT_VALUE ) + if ((opt.debug & DBG_MEMSTAT_VALUE)) memory_stat_debug_mode = 1; - if (opt.debug & DBG_MPI_VALUE) + if (DBG_MPI) gcry_control (GCRYCTL_SET_DEBUG_FLAGS, 2); - if (opt.debug & DBG_CRYPTO_VALUE ) + if (DBG_CRYPTO) gcry_control (GCRYCTL_SET_DEBUG_FLAGS, 1); - if (opt.debug & DBG_IOBUF_VALUE ) + if ((opt.debug & DBG_IOBUF_VALUE)) iobuf_debug_mode = 1; gcry_control (GCRYCTL_SET_VERBOSITY, (int)opt.verbose); diff --git a/g10/options.h b/g10/options.h index 544be60ab..43dfd997f 100644 --- a/g10/options.h +++ b/g10/options.h @@ -305,6 +305,7 @@ struct { /* Tests for the debugging flags. */ #define DBG_PACKET (opt.debug & DBG_PACKET_VALUE) +#define DBG_MPI (opt.debug & DBG_MPI_VALUE) #define DBG_CRYPTO (opt.debug & DBG_CRYPTO_VALUE) #define DBG_FILTER (opt.debug & DBG_FILTER_VALUE) #define DBG_CACHE (opt.debug & DBG_CACHE_VALUE) @@ -317,7 +318,7 @@ struct { #define DBG_LOOKUP (opt.debug & DBG_LOOKUP_VALUE) #define DBG_EXTPROG (opt.debug & DBG_EXTPROG_VALUE) -/* FIXME: We need to check whey we did not put this into opt. */ +/* FIXME: We need to check why we did not put this into opt. */ #define DBG_MEMORY memory_debug_mode #define DBG_MEMSTAT memory_stat_debug_mode diff --git a/g10/parse-packet.c b/g10/parse-packet.c index 86c2be4ad..bda3e1420 100644 --- a/g10/parse-packet.c +++ b/g10/parse-packet.c @@ -220,7 +220,7 @@ set_packet_list_mode (int mode) else listfp = es_stderr; - if (opt.debug & DBG_MPI_VALUE) + if (DBG_MPI) mpi_print_mode = 1; } return old; |