mirrors/tcpdump
0
0
Fork 0
mirror of https://github.com/the-tcpdump-group/tcpdump.git synced 2024-11-23 18:14:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update the ND_TCHECK_LEN macro definitions

Browse Source 
Avoid warnings such as in the following case:

        if (...)
                ND_TCHECK_LEN(...);
        else

With gcc:
source.c:X:12: warning: suggest explicit braces to avoid ambiguous
  'else' [-Wdangling-else]
    X |         if (...)
      |            ^

With clang:
source.c:Y:2: warning: add explicit braces to avoid dangling else
  [-Wdangling-else]
        else
        ^

(cherry picked from commit 6fa624334b)
This commit is contained in:
Francois-Xavier Le Bail 2024-10-15 21:08:57 +02:00
parent e28a04703f
commit d477c4264a
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
netdissect.h
View File

@ -374,9 +374,15 @@ NORETURN void nd_trunc_longjmp(netdissect_options *ndo);
/* Bail out if "l" bytes from "p" were not captured */
#ifdef ND_LONGJMP_FROM_TCHECK
#define ND_TCHECK_LEN(p, l) if (!ND_TTEST_LEN(p, l)) nd_trunc_longjmp(ndo)
#define ND_TCHECK_LEN(p, l) \
do { \
if (!ND_TTEST_LEN(p, l)) nd_trunc_longjmp(ndo); \
} while (0)
#else
#define ND_TCHECK_LEN(p, l) if (!ND_TTEST_LEN(p, l)) goto trunc
#define ND_TCHECK_LEN(p, l) \
do { \
if (!ND_TTEST_LEN(p, l)) goto trunc; \
} while (0)
#endif
/* Bail out if "*(p)" was not captured */