* 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@gnupg.org>
(cherry picked from commit
6170eb809033c9d144abf3b1f31f8b936878cdd4)
Gbp-Pq: Name 0024-Silence-two-Wlogical-op-warnings.patch
else
{
unsigned long len = 0;
else
{
unsigned long len = 0;
+ 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--)
return gpg_err_make (default_errsource, GPG_ERR_BAD_BER);
for (; count; count--)
return 0;
if (*pattern == '.' && pattern[1] == '.')
return 0;
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')
return 0; /* Absolute filenames are not supported. */
#ifdef HAVE_DRIVE_LETTERS
if (((*pattern >= 'a' && *pattern <= 'z')