[Pkg-gnupg-commit] [gnupg2] 38/116: Silence two -Wlogical-op warnings.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit 6170eb809033c9d144abf3b1f31f8b936878cdd4
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Jan 5 20:42:55 2017 +0100

    Silence two -Wlogical-op warnings.
    
    * common/tlv.c (parse_ber_header): Avoid compiler warning about a
    duplicate condition.
    * tools/gpgtar-create.c (pattern_valid_p): Likewise.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 common/tlv.c          | 4 ++--
 tools/gpgtar-create.c | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/common/tlv.c b/common/tlv.c
index 6813c58..0058b67 100644
--- a/common/tlv.c
+++ b/common/tlv.c
@@ -214,9 +214,9 @@ parse_ber_header (unsigned char const **buffer, size_t *size,
   else
     {
       unsigned long len = 0;
-      int count = c & 0x7f;
+      int count = (c & 0x7f);
 
-      if (count > sizeof (len) || count > sizeof (size_t))
+      if (count > (sizeof(len)<sizeof(size_t)?sizeof(len):sizeof(size_t)))
         return gpg_err_make (default_errsource, GPG_ERR_BAD_BER);
 
       for (; count; count--)
diff --git a/tools/gpgtar-create.c b/tools/gpgtar-create.c
index ef906a5..ffd239f 100644
--- a/tools/gpgtar-create.c
+++ b/tools/gpgtar-create.c
@@ -429,7 +429,11 @@ pattern_valid_p (const char *pattern)
     return 0;
   if (*pattern == '.' && pattern[1] == '.')
     return 0;
-  if (*pattern == '/' || *pattern == DIRSEP_C)
+  if (*pattern == '/'
+#ifdef HAVE_DOSISH_SYSTEM
+      || *pattern == '\\'
+#endif
+      )
     return 0; /* Absolute filenames are not supported.  */
 #ifdef HAVE_DRIVE_LETTERS
   if (((*pattern >= 'a' && *pattern <= 'z')

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git