Use more HTTPS in URLs

[tcpdump] / print-ascii.c

diff --git a/print-ascii.c b/print-ascii.c
index 8460f84baf2ca8bd0f98130b06342ed8096e4285..56efc84af18c22873d946ae8e5162c0b9d6be3c3 100644 (file)
--- a/print-ascii.c
+++ b/print-ascii.c
@@ -65,7 +65,7 @@ ascii_print(netdissect_options *ndo,
        u_char s;
 
        ndo->ndo_protocol = "ascii";
-       caplength = (ndo->ndo_snapend > cp) ? ndo->ndo_snapend - cp : 0;
+       caplength = (ndo->ndo_snapend > cp) ? ND_BYTES_AVAILABLE_AFTER(cp) : 0;
        if (length > caplength)
                length = caplength;
        ND_PRINT("\n");
@@ -106,7 +106,7 @@ hex_and_ascii_print_with_offset(netdissect_options *ndo, const char *ident,
        char hexstuff[HEXDUMP_SHORTS_PER_LINE*HEXDUMP_HEXSTUFF_PER_SHORT+1], *hsp;
        char asciistuff[ASCII_LINELENGTH+1], *asp;
 
-       caplength = (ndo->ndo_snapend > cp) ? ndo->ndo_snapend - cp : 0;
+       caplength = (ndo->ndo_snapend > cp) ? ND_BYTES_AVAILABLE_AFTER(cp) : 0;
        if (length > caplength)
                length = caplength;
        nshorts = length / sizeof(u_short);
@@ -117,7 +117,7 @@ hex_and_ascii_print_with_offset(netdissect_options *ndo, const char *ident,
                cp++;
                s2 = GET_U_1(cp);
                cp++;
-               (void)nd_snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
+               (void)snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
                    " %02x%02x", s1, s2);
                hsp += HEXDUMP_HEXSTUFF_PER_SHORT;
                *(asp++) = (char)(ND_ISGRAPH(s1) ? s1 : '.');
@@ -136,7 +136,7 @@ hex_and_ascii_print_with_offset(netdissect_options *ndo, const char *ident,
        if (length & 1) {
                s1 = GET_U_1(cp);
                cp++;
-               (void)nd_snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
+               (void)snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
                    " %02x", s1);
                hsp += 3;
                *(asp++) = (char)(ND_ISGRAPH(s1) ? s1 : '.');
@@ -169,7 +169,7 @@ hex_print_with_offset(netdissect_options *ndo,
        u_int i, s;
        u_int nshorts;
 
-       caplength = (ndo->ndo_snapend > cp) ? ndo->ndo_snapend - cp : 0;
+       caplength = (ndo->ndo_snapend > cp) ? ND_BYTES_AVAILABLE_AFTER(cp) : 0;
        if (length > caplength)
                length = caplength;
        nshorts = length / sizeof(u_short);