Ethernet: Rename a variable

From 'ep', often used as 'pointer to the end of current packet' to 'ehp'
as Ethernet header pointer.

diff --git a/print-ether.c b/print-ether.c
index e09f2ac9b64e9e798491c565f78d9d5d71e1b90b..0a331d188b8f10c344379b8bc0626a091be6ecd4 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -108,16 +108,16 @@ static void
 ether_hdr_print(netdissect_options *ndo,
                 const u_char *bp, u_int length)
 {
 ether_hdr_print(netdissect_options *ndo,
                 const u_char *bp, u_int length)
 {

-       const struct ether_header *ep;
+       const struct ether_header *ehp;

        uint16_t length_type;
 
        uint16_t length_type;
 

-       ep = (const struct ether_header *)bp;
+       ehp = (const struct ether_header *)bp;

 
        ND_PRINT("%s > %s",
 
        ND_PRINT("%s > %s",

-                    etheraddr_string(ndo, ep->ether_shost),
-                    etheraddr_string(ndo, ep->ether_dhost));
+                    etheraddr_string(ndo, ehp->ether_shost),
+                    etheraddr_string(ndo, ehp->ether_dhost));

 
 

-       length_type = EXTRACT_BE_U_2(ep->ether_length_type);
+       length_type = EXTRACT_BE_U_2(ehp->ether_length_type);

        if (!ndo->ndo_qflag) {
                if (length_type <= MAX_ETHERNET_LENGTH_VAL) {
                        ND_PRINT(", 802.3");
        if (!ndo->ndo_qflag) {
                if (length_type <= MAX_ETHERNET_LENGTH_VAL) {
                        ND_PRINT(", 802.3");


@@ -150,7 +150,7 @@ ether_print(netdissect_options *ndo,
             const u_char *p, u_int length, u_int caplen,
             void (*print_encap_header)(netdissect_options *ndo, const u_char *), const u_char *encap_header_arg)
 {
             const u_char *p, u_int length, u_int caplen,
             void (*print_encap_header)(netdissect_options *ndo, const u_char *), const u_char *encap_header_arg)
 {

-       const struct ether_header *ep;
+       const struct ether_header *ehp;

        u_int orig_length;
        u_short length_type;
        u_int hdrlen;
        u_int orig_length;
        u_short length_type;
        u_int hdrlen;


@@ -175,15 +175,15 @@ ether_print(netdissect_options *ndo,
 
        length -= ETHER_HDRLEN;
        caplen -= ETHER_HDRLEN;
 
        length -= ETHER_HDRLEN;
        caplen -= ETHER_HDRLEN;

-       ep = (const struct ether_header *)p;
+       ehp = (const struct ether_header *)p;

        p += ETHER_HDRLEN;
        hdrlen = ETHER_HDRLEN;
 
        p += ETHER_HDRLEN;
        hdrlen = ETHER_HDRLEN;
 

-       src.addr = ep->ether_shost;
+       src.addr = ehp->ether_shost;

        src.addr_string = etheraddr_string;
        src.addr_string = etheraddr_string;

-       dst.addr = ep->ether_dhost;
+       dst.addr = ehp->ether_dhost;

        dst.addr_string = etheraddr_string;
        dst.addr_string = etheraddr_string;

-       length_type = EXTRACT_BE_U_2(ep->ether_length_type);
+       length_type = EXTRACT_BE_U_2(ehp->ether_length_type);

 
 recurse:
        /*
 
 recurse:
        /*


@@ -254,7 +254,7 @@ recurse:
                        if (!ndo->ndo_eflag) {
                                if (print_encap_header != NULL)
                                        (*print_encap_header)(ndo, encap_header_arg);
                        if (!ndo->ndo_eflag) {
                                if (print_encap_header != NULL)
                                        (*print_encap_header)(ndo, encap_header_arg);

-                               ether_hdr_print(ndo, (const u_char *)ep, orig_length);
+                               ether_hdr_print(ndo, (const u_char *)ehp, orig_length);

                        }
 
                        if (!ndo->ndo_suppress_default_print)
                        }
 
                        if (!ndo->ndo_suppress_default_print)