From: Francois-Xavier Le Bail Date: Sat, 13 Jun 2020 12:55:27 +0000 (+0200) Subject: Remove some trailing spaces/tabs X-Git-Tag: tcpdump-4.99-bp~343 X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/22fec8918773705c2f12e7f10886bb8e5034e607 Remove some trailing spaces/tabs Moreover: Remove some spaces before tabs. Remove extra blank line. --- diff --git a/.travis.yml b/.travis.yml index b5a23525..32094a75 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,7 +42,7 @@ compiler: # # https://docs.travis-ci.com/user/build-matrix/#fast-finishing # -# "If some rows in the build matrix are allowed to fail, the build +# "If some rows in the build matrix are allowed to fail, the build # won't be marked as finished until they have completed. # # To mark the build as finished as soon as possible, add fast_finish: diff --git a/print-babel.c b/print-babel.c index 6e748710..8b495cc1 100644 --- a/print-babel.c +++ b/print-babel.c @@ -50,7 +50,6 @@ #include "addrtoname.h" #include "extract.h" - static void babel_print_v2(netdissect_options *, const u_char *cp, u_int length); void @@ -386,7 +385,7 @@ babel_print_v2_tlvs(netdissect_options *ndo, u_char v4_prefix[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFF, 0xFF, 0, 0, 0, 0 }; u_char v6_prefix[16] = {0}; - + i = 0; while(i < tlvs_length) { const u_char *message; @@ -759,7 +758,7 @@ babel_print_v2_tlvs(netdissect_options *ndo, case MESSAGE_MAC: { if (!ndo->ndo_vflag) ND_PRINT(" mac"); - else { + else { ND_PRINT("\n\tMAC "); ND_PRINT("len %u", len); } @@ -847,8 +846,8 @@ babel_print_v2(netdissect_options *ndo, /* If there's a trailer, process the TLVs in the trailer */ if (length != 0) { - if(ndo->ndo_vflag) ND_PRINT("\n\t----"); - else ND_PRINT(" |"); + if(ndo->ndo_vflag) ND_PRINT("\n\t----"); + else ND_PRINT(" |"); ret = babel_print_v2_tlvs(ndo, cp, length, length); if (ret == -1) goto trunc; diff --git a/print-macsec.c b/print-macsec.c index 431ae42c..905e9f95 100644 --- a/print-macsec.c +++ b/print-macsec.c @@ -104,7 +104,7 @@ static void macsec_print_header(netdissect_options *ndo, if (GET_U_1(sectag->tci_an) & MACSEC_TCI_SC) ND_PRINT(", sci " SCI_FMT, GET_BE_U_8(sectag->secure_channel_id)); - + ND_PRINT(", "); } @@ -152,7 +152,7 @@ int macsec_print(netdissect_options *ndo, const u_char **bp, } else sectag_len = MACSEC_SECTAG_LEN_NOSCI; - if ((GET_U_1(sectag->short_length) & ~MACSEC_SL_MASK) != 0 || + if ((GET_U_1(sectag->short_length) & ~MACSEC_SL_MASK) != 0 || GET_U_1(sectag->tci_an) & MACSEC_TCI_VERSION) { nd_print_invalid(ndo); ndo->ndo_protocol = save_protocol; @@ -245,7 +245,7 @@ int macsec_print(netdissect_options *ndo, const u_char **bp, if (*caplenp > short_length) *caplenp = short_length; } - + ndo->ndo_protocol = save_protocol; return -1; }