Rename some printer functions to *_print

Moreover:
Fix spaces.

diff --git a/netdissect.h b/netdissect.h
index fad9330ab7a2bb6c0c7e78da22daa2adad0806ae..7aed8313c19636635e298c85cb1e4fbff88d44f8 100644 (file)
--- a/netdissect.h
+++ b/netdissect.h
@@ -492,7 +492,7 @@ extern void babel_print(netdissect_options *, const u_char *, u_int);
 extern void beep_print(netdissect_options *, const u_char *, u_int);
 extern void bfd_print(netdissect_options *, const u_char *, u_int, u_int);
 extern void bgp_print(netdissect_options *, const u_char *, u_int);
 extern void beep_print(netdissect_options *, const u_char *, u_int);
 extern void bfd_print(netdissect_options *, const u_char *, u_int, u_int);
 extern void bgp_print(netdissect_options *, const u_char *, u_int);

-extern char *bgp_vpn_rd_print (netdissect_options *, const u_char *);
+extern char *bgp_vpn_rd_print(netdissect_options *, const u_char *);

 extern void bootp_print(netdissect_options *, const u_char *, u_int);
 extern void calm_fast_print(netdissect_options *, const u_char *, u_int, const struct lladdr_info *);
 extern void carp_print(netdissect_options *, const u_char *, u_int, u_int);
 extern void bootp_print(netdissect_options *, const u_char *, u_int);
 extern void calm_fast_print(netdissect_options *, const u_char *, u_int, const struct lladdr_info *);
 extern void carp_print(netdissect_options *, const u_char *, u_int, u_int);


@@ -536,7 +536,7 @@ extern void igrp_print(netdissect_options *, const u_char *, u_int);
 extern void ip6_print(netdissect_options *, const u_char *, u_int);
 extern void ipN_print(netdissect_options *, const u_char *, u_int);
 extern void ip_print(netdissect_options *, const u_char *, u_int);
 extern void ip6_print(netdissect_options *, const u_char *, u_int);
 extern void ipN_print(netdissect_options *, const u_char *, u_int);
 extern void ip_print(netdissect_options *, const u_char *, u_int);

-extern void ip_print_inner(netdissect_options *, const u_char *, u_int, u_int nh, const u_char *);
+extern void ip_inner_print(netdissect_options *, const u_char *, u_int, u_int nh, const u_char *);

 extern void ipcomp_print(netdissect_options *, const u_char *);
 extern void ipx_netbios_print(netdissect_options *, const u_char *, u_int);
 extern void ipx_print(netdissect_options *, const u_char *, u_int);
 extern void ipcomp_print(netdissect_options *, const u_char *);
 extern void ipx_netbios_print(netdissect_options *, const u_char *, u_int);
 extern void ipx_print(netdissect_options *, const u_char *, u_int);


@@ -574,7 +574,7 @@ extern void netbeui_print(netdissect_options *, u_short, const u_char *, u_int);
 extern void nfsreply_print(netdissect_options *, const u_char *, u_int, const u_char *);
 extern void nfsreply_noaddr_print(netdissect_options *, const u_char *, u_int, const u_char *);
 extern void nfsreq_noaddr_print(netdissect_options *, const u_char *, u_int, const u_char *);
 extern void nfsreply_print(netdissect_options *, const u_char *, u_int, const u_char *);
 extern void nfsreply_noaddr_print(netdissect_options *, const u_char *, u_int, const u_char *);
 extern void nfsreq_noaddr_print(netdissect_options *, const u_char *, u_int, const u_char *);

-extern const u_char * ns_nprint (netdissect_options *, const u_char *, const u_char *);
+extern const u_char * ns_nprint(netdissect_options *, const u_char *, const u_char *);

 extern void domain_print(netdissect_options *, const u_char *, u_int, int);
 extern void nsh_print(netdissect_options *ndo, const u_char *bp, u_int len);
 extern void ntp_print(netdissect_options *, const u_char *, u_int);
 extern void domain_print(netdissect_options *, const u_char *, u_int, int);
 extern void nsh_print(netdissect_options *ndo, const u_char *bp, u_int len);
 extern void ntp_print(netdissect_options *, const u_char *, u_int);


@@ -583,8 +583,8 @@ extern void olsr_print(netdissect_options *, const u_char *, u_int, int);
 extern void openflow_print(netdissect_options *, const u_char *, const u_int);
 extern void ospf6_print(netdissect_options *, const u_char *, u_int);
 extern void ospf_print(netdissect_options *, const u_char *, u_int, const u_char *);
 extern void openflow_print(netdissect_options *, const u_char *, const u_int);
 extern void ospf6_print(netdissect_options *, const u_char *, u_int);
 extern void ospf_print(netdissect_options *, const u_char *, u_int, const u_char *);

-extern int ospf_print_grace_lsa(netdissect_options *, const u_char *, u_int);
-extern int ospf_print_te_lsa(netdissect_options *, const u_char *, u_int);
+extern int ospf_grace_lsa_print(netdissect_options *, const u_char *, u_int);
+extern int ospf_te_lsa_print(netdissect_options *, const u_char *, u_int);

 extern void otv_print(netdissect_options *, const u_char *, u_int);
 extern void pgm_print(netdissect_options *, const u_char *, u_int, const u_char *);
 extern void pim_print(netdissect_options *, const u_char *, u_int, const u_char *);
 extern void otv_print(netdissect_options *, const u_char *, u_int);
 extern void pgm_print(netdissect_options *, const u_char *, u_int, const u_char *);
 extern void pim_print(netdissect_options *, const u_char *, u_int, const u_char *);


@@ -609,7 +609,7 @@ extern void sctp_print(netdissect_options *, const u_char *, const u_char *, u_i
 extern void sflow_print(netdissect_options *, const u_char *, u_int);
 extern void sip_print(netdissect_options *, const u_char *, u_int);
 extern void slow_print(netdissect_options *, const u_char *, u_int);
 extern void sflow_print(netdissect_options *, const u_char *, u_int);
 extern void sip_print(netdissect_options *, const u_char *, u_int);
 extern void slow_print(netdissect_options *, const u_char *, u_int);

-extern void smb_print_data(netdissect_options *, const u_char *, u_int);
+extern void smb_data_print(netdissect_options *, const u_char *, u_int);

 extern void smb_tcp_print(netdissect_options *, const u_char *, u_int);
 extern void smtp_print(netdissect_options *, const u_char *, u_int);
 extern int snap_print(netdissect_options *, const u_char *, u_int, u_int, const struct lladdr_info *, const struct lladdr_info *, u_int);
 extern void smb_tcp_print(netdissect_options *, const u_char *, u_int);
 extern void smtp_print(netdissect_options *, const u_char *, u_int);
 extern int snap_print(netdissect_options *, const u_char *, u_int, u_int, const struct lladdr_info *, const struct lladdr_info *, u_int);

diff --git a/print-ip.c b/print-ip.c
index afa46df4344ce8d7191268eca3e9bed4b1aa6d3b..da4e2c3693a7848d145b651dc846981c7de1db5e 100644 (file)
--- a/print-ip.c
+++ b/print-ip.c
@@ -514,7 +514,7 @@ again:
 }
 
 void
 }
 
 void

-ip_print_inner(netdissect_options *ndo,
+ip_inner_print(netdissect_options *ndo,

               const u_char *bp,
               u_int length, u_int nh,
               const u_char *bp2)
               const u_char *bp,
               u_int length, u_int nh,
               const u_char *bp2)

diff --git a/print-isakmp.c b/print-isakmp.c
index af7e7b654f0f860802d318ee46c3048d44260173..de8bf2bd2e07ab35cad43f96a5dfec32b14160f9 100644 (file)
--- a/print-isakmp.c
+++ b/print-isakmp.c
@@ -3123,7 +3123,7 @@ isakmp_rfc3948_print(netdissect_options *ndo,
                length -= advance + padlen;
                nh = enh & 0xff;
 
                length -= advance + padlen;
                nh = enh & 0xff;
 

-               ip_print_inner(ndo, bp, length, nh, bp2);
+               ip_inner_print(ndo, bp, length, nh, bp2);

                return;
        }
 
                return;
        }
 

diff --git a/print-ospf.c b/print-ospf.c
index 62827ec751a57d269e57540eb3d3ac3196ae1b72..8e2bcfaeead6d8988b35ea1329db89ae2457c8d0 100644 (file)
--- a/print-ospf.c
+++ b/print-ospf.c
@@ -180,7 +180,7 @@ static const struct tok ospf_lls_eo_options[] = {
 };
 
 int
 };
 
 int

-ospf_print_grace_lsa(netdissect_options *ndo,
+ospf_grace_lsa_print(netdissect_options *ndo,

                      const u_char *tptr, u_int ls_length)
 {
     u_int tlv_type, tlv_length;
                      const u_char *tptr, u_int ls_length)
 {
     u_int tlv_type, tlv_length;


@@ -263,7 +263,7 @@ trunc:
 }
 
 int
 }
 
 int

-ospf_print_te_lsa(netdissect_options *ndo,
+ospf_te_lsa_print(netdissect_options *ndo,

                   const u_char *tptr, u_int ls_length)
 {
     u_int tlv_type, tlv_length, subtlv_type, subtlv_length;
                   const u_char *tptr, u_int ls_length)
 {
     u_int tlv_type, tlv_length, subtlv_type, subtlv_length;


@@ -852,14 +852,14 @@ ospf_print_lsa(netdissect_options *ndo,
                 break;
 
             case LS_OPAQUE_TYPE_GRACE:
                 break;
 
             case LS_OPAQUE_TYPE_GRACE:

-                if (ospf_print_grace_lsa(ndo, (const u_char *)(lsap->lsa_un.un_grace_tlv),
+                if (ospf_grace_lsa_print(ndo, (const u_char *)(lsap->lsa_un.un_grace_tlv),

                                          ls_length) == -1) {
                     return(ls_end);
                 }
                 break;
 
            case LS_OPAQUE_TYPE_TE:
                                          ls_length) == -1) {
                     return(ls_end);
                 }
                 break;
 
            case LS_OPAQUE_TYPE_TE:

-                if (ospf_print_te_lsa(ndo, (const u_char *)(lsap->lsa_un.un_te_lsa_tlv),
+                if (ospf_te_lsa_print(ndo, (const u_char *)(lsap->lsa_un.un_te_lsa_tlv),

                                       ls_length) == -1) {
                     return(ls_end);
                 }
                                       ls_length) == -1) {
                     return(ls_end);
                 }

diff --git a/print-ospf6.c b/print-ospf6.c
index 0ca3dbd999dfce054ae0a46f625e2173eb72f1c8..9164a008df224cd6997412cb5753c24b4b441de7 100644 (file)
--- a/print-ospf6.c
+++ b/print-ospf6.c
@@ -693,13 +693,13 @@ ospf6_print_lsa(netdissect_options *ndo,
                break;
 
         case LS_TYPE_GRACE | LS_SCOPE_LINKLOCAL:
                break;
 
         case LS_TYPE_GRACE | LS_SCOPE_LINKLOCAL:

-                if (ospf_print_grace_lsa(ndo, tptr, lsa_length) == -1) {
+                if (ospf_grace_lsa_print(ndo, tptr, lsa_length) == -1) {

                     return 1;
                 }
                 break;
 
         case LS_TYPE_INTRA_ATE | LS_SCOPE_LINKLOCAL:
                     return 1;
                 }
                 break;
 
         case LS_TYPE_INTRA_ATE | LS_SCOPE_LINKLOCAL:

-                if (ospf_print_te_lsa(ndo, tptr, lsa_length) == -1) {
+                if (ospf_te_lsa_print(ndo, tptr, lsa_length) == -1) {

                     return 1;
                 }
                 break;
                     return 1;
                 }
                 break;

diff --git a/print-smb.c b/print-smb.c
index ed721910cd9c7a490254965964f03559168d3e37..aa4732d6acd42b596b7a95507b49bbb015134d53 100644 (file)
--- a/print-smb.c
+++ b/print-smb.c
@@ -103,7 +103,7 @@ trans2_findfirst(netdissect_options *ndo,
     smb_fdata(ndo, param, fmt, param + pcnt, unicodestr);
     if (dcnt) {
        ND_PRINT("data:\n");
     smb_fdata(ndo, param, fmt, param + pcnt, unicodestr);
     if (dcnt) {
        ND_PRINT("data:\n");

-       smb_print_data(ndo, data, dcnt);
+       smb_data_print(ndo, data, dcnt);

     }
 }
 
     }
 }
 


@@ -138,7 +138,7 @@ trans2_qfsinfo(netdissect_options *ndo,
     }
     if (dcnt) {
        ND_PRINT("data:\n");
     }
     if (dcnt) {
        ND_PRINT("data:\n");

-       smb_print_data(ndo, data, dcnt);
+       smb_data_print(ndo, data, dcnt);

     }
     return;
 trunc:
     }
     return;
 trunc:


@@ -420,7 +420,7 @@ print_negprot(netdissect_options *ndo,
        smb_fdata(ndo, words + 1, f1, min(words + 1 + wct * 2, maxbuf),
            unicodestr);
     else
        smb_fdata(ndo, words + 1, f1, min(words + 1 + wct * 2, maxbuf),
            unicodestr);
     else

-       smb_print_data(ndo, words + 1, min(wct * 2, PTR_DIFF(maxbuf, words + 1)));
+       smb_data_print(ndo, words + 1, min(wct * 2, PTR_DIFF(maxbuf, words + 1)));

 
     ND_TCHECK_2(data);
     bcc = EXTRACT_LE_U_2(data);
 
     ND_TCHECK_2(data);
     bcc = EXTRACT_LE_U_2(data);


@@ -430,7 +430,7 @@ print_negprot(netdissect_options *ndo,
            smb_fdata(ndo, data + 2, f2, min(data + 2 + EXTRACT_LE_U_2(data),
                                              maxbuf), unicodestr);
        else
            smb_fdata(ndo, data + 2, f2, min(data + 2 + EXTRACT_LE_U_2(data),
                                              maxbuf), unicodestr);
        else

-           smb_print_data(ndo, data + 2,
+           smb_data_print(ndo, data + 2,

                            min(EXTRACT_LE_U_2(data), PTR_DIFF(maxbuf, data + 2)));
     }
     return;
                            min(EXTRACT_LE_U_2(data), PTR_DIFF(maxbuf, data + 2)));
     }
     return;


@@ -465,7 +465,7 @@ print_sesssetup(netdissect_options *ndo,
        smb_fdata(ndo, words + 1, f1, min(words + 1 + wct * 2, maxbuf),
            unicodestr);
     else
        smb_fdata(ndo, words + 1, f1, min(words + 1 + wct * 2, maxbuf),
            unicodestr);
     else

-       smb_print_data(ndo, words + 1, min(wct * 2, PTR_DIFF(maxbuf, words + 1)));
+       smb_data_print(ndo, words + 1, min(wct * 2, PTR_DIFF(maxbuf, words + 1)));

 
     ND_TCHECK_2(data);
     bcc = EXTRACT_LE_U_2(data);
 
     ND_TCHECK_2(data);
     bcc = EXTRACT_LE_U_2(data);


@@ -475,7 +475,7 @@ print_sesssetup(netdissect_options *ndo,
            smb_fdata(ndo, data + 2, f2, min(data + 2 + EXTRACT_LE_U_2(data),
                                              maxbuf), unicodestr);
        else
            smb_fdata(ndo, data + 2, f2, min(data + 2 + EXTRACT_LE_U_2(data),
                                              maxbuf), unicodestr);
        else

-           smb_print_data(ndo, data + 2,
+           smb_data_print(ndo, data + 2,

                            min(EXTRACT_LE_U_2(data), PTR_DIFF(maxbuf, data + 2)));
     }
     return;
                            min(EXTRACT_LE_U_2(data), PTR_DIFF(maxbuf, data + 2)));
     }
     return;


@@ -516,7 +516,7 @@ print_lockingandx(netdissect_options *ndo,
            smb_fdata(ndo, data + 2, f2, min(data + 2 + EXTRACT_LE_U_2(data),
                                              maxbuf), unicodestr);
        else
            smb_fdata(ndo, data + 2, f2, min(data + 2 + EXTRACT_LE_U_2(data),
                                              maxbuf), unicodestr);
        else

-           smb_print_data(ndo, data + 2,
+           smb_data_print(ndo, data + 2,

                            min(EXTRACT_LE_U_2(data), PTR_DIFF(maxbuf, data + 2)));
     }
     return;
                            min(EXTRACT_LE_U_2(data), PTR_DIFF(maxbuf, data + 2)));
     }
     return;


@@ -893,7 +893,7 @@ print_smb(netdissect_options *ndo,
            } else {
                if (bcc > 0) {
                    ND_PRINT("smb_buf[]=\n");
            } else {
                if (bcc > 0) {
                    ND_PRINT("smb_buf[]=\n");

-                   smb_print_data(ndo, data + 2, min(bcc, PTR_DIFF(maxbuf, data + 2)));
+                   smb_data_print(ndo, data + 2, min(bcc, PTR_DIFF(maxbuf, data + 2)));

                }
            }
        }
                }
            }
        }


@@ -1227,7 +1227,7 @@ nbt_udp137_print(netdissect_options *ndo,
                } else {
                    if (p >= maxbuf)
                        goto out;
                } else {
                    if (p >= maxbuf)
                        goto out;

-                   smb_print_data(ndo, p, min(rdlen, length - (p - data)));
+                   smb_data_print(ndo, p, min(rdlen, length - (p - data)));

                    p += rdlen;
                }
            }
                    p += rdlen;
                }
            }

diff --git a/smbutil.c b/smbutil.c
index c2249c451759ccce919b4257d62b8752c9fe3709..61086a49227e02e396c7225a72161c258b087509 100644 (file)
--- a/smbutil.c
+++ b/smbutil.c
@@ -275,7 +275,7 @@ name_type_str(int name_type)
 }
 
 void
 }
 
 void

-smb_print_data(netdissect_options *ndo, const u_char *buf, u_int len)
+smb_data_print(netdissect_options *ndo, const u_char *buf, u_int len)

 {
     u_int i = 0;
 
 {
     u_int i = 0;
 


@@ -889,7 +889,7 @@ smb_fdata(netdissect_options *ndo,
     if (!depth && buf < maxbuf) {
        size_t len = PTR_DIFF(maxbuf, buf);
        ND_PRINT("Data: (%lu bytes)\n", (unsigned long)len);
     if (!depth && buf < maxbuf) {
        size_t len = PTR_DIFF(maxbuf, buf);
        ND_PRINT("Data: (%lu bytes)\n", (unsigned long)len);

-       smb_print_data(ndo, buf, len);
+       smb_data_print(ndo, buf, len);

        return(buf + len);
     }
     return(buf);
        return(buf + len);
     }
     return(buf);