1 From: Werner Koch <wk@gnupg.org>
2 Date: Thu, 5 Jan 2017 20:42:55 +0100
3 Subject: Silence two -Wlogical-op warnings.
5 * common/tlv.c (parse_ber_header): Avoid compiler warning about a
7 * tools/gpgtar-create.c (pattern_valid_p): Likewise.
9 Signed-off-by: Werner Koch <wk@gnupg.org>
10 (cherry picked from commit 6170eb809033c9d144abf3b1f31f8b936878cdd4)
13 tools/gpgtar-create.c | 6 +++++-
14 2 files changed, 7 insertions(+), 3 deletions(-)
16 diff --git a/common/tlv.c b/common/tlv.c
17 index 6813c585a..0058b67ca 100644
20 @@ -214,9 +214,9 @@ parse_ber_header (unsigned char const **buffer, size_t *size,
23 unsigned long len = 0;
24 - int count = c & 0x7f;
25 + int count = (c & 0x7f);
27 - if (count > sizeof (len) || count > sizeof (size_t))
28 + if (count > (sizeof(len)<sizeof(size_t)?sizeof(len):sizeof(size_t)))
29 return gpg_err_make (default_errsource, GPG_ERR_BAD_BER);
31 for (; count; count--)
32 diff --git a/tools/gpgtar-create.c b/tools/gpgtar-create.c
33 index ef906a5dd..ffd239f42 100644
34 --- a/tools/gpgtar-create.c
35 +++ b/tools/gpgtar-create.c
36 @@ -429,7 +429,11 @@ pattern_valid_p (const char *pattern)
38 if (*pattern == '.' && pattern[1] == '.')
40 - if (*pattern == '/' || *pattern == DIRSEP_C)
42 +#ifdef HAVE_DOSISH_SYSTEM
46 return 0; /* Absolute filenames are not supported. */
47 #ifdef HAVE_DRIVE_LETTERS
48 if (((*pattern >= 'a' && *pattern <= 'z')