refine some declarations in header files

Remove duplicate declarations and move some other declarations to
addrtoname.h where they belong.

diff --git a/addrtoname.h b/addrtoname.h
index ff03a4ace61bfd525fabe6330ff80ff6cd397ce7..533a7864851f750339b63390c47e47218cc0e418 100644 (file)
--- a/addrtoname.h
+++ b/addrtoname.h
@@ -36,6 +36,9 @@ extern const char *le64addr_string(const u_char *);
 extern const char *etherproto_string(u_short);
 extern const char *tcpport_string(u_short);
 extern const char *udpport_string(u_short);
+extern const char *isonsap_string(const u_char *, register u_int);
+extern const char *protoid_string(const u_char *);
+extern const char *ipxsap_string(u_short);
 extern const char *getname(const u_char *);
 #ifdef INET6
 extern const char *getname6(const u_char *);

diff --git a/interface.h b/interface.h
index 25fe79ee7d7cdbe31044341916f2d2e9de234e7b..3d0c2597c6ef7cb99081581e1f6d62df830ab5fb 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -144,9 +144,6 @@ extern void warning(const char *, ...)
 extern char *read_infile(char *);
 extern char *copy_argv(char **);
 
-extern const char *isonsap_string(const u_char *, register u_int);
-extern const char *protoid_string(const u_char *);
-extern const char *ipxsap_string(u_short);
 extern const char *dnname_string(u_short);
 extern const char *dnnum_string(u_short);
 

diff --git a/netdissect.h b/netdissect.h
index 09b28ff5ae7f1b85e1852329ce04deaebaa15c89..c385facd4d8faea250ce85264c4972cd63b0b0c1 100644 (file)
--- a/netdissect.h
+++ b/netdissect.h
@@ -310,8 +310,6 @@ extern int unaligned_memcmp(const void *, const void *, size_t);
        (((n) != 1) ? "s" : "")
 
 #if 0
-extern const char *isonsap_string(netdissect_options *, const u_char *);
-extern const char *protoid_string(netdissect_options *, const u_char *);
 extern const char *dnname_string(netdissect_options *, u_short);
 extern const char *dnnum_string(netdissect_options *, u_short);
 #endif
@@ -530,14 +528,6 @@ extern void rsvp_print(netdissect_options *, const u_char *, u_int);
 #if 0
 extern void ascii_print(netdissect_options *,u_int);
 extern void default_print(netdissect_options *,const u_char *, u_int);
-
-extern const char *linkaddr_string(netdissect_options *ndo,
-                                  const u_char *ep, const unsigned int len);
-extern void nfsreply_print(netdissect_options *,const u_char *,
-                          u_int, const u_char *);
-extern void nfsreq_print(netdissect_options *,const u_char *,
-                        u_int, const u_char *);
-
 extern void timed_print(netdissect_options *,const u_char *, u_int);
 extern char *smb_errstr(netdissect_options *,int, int);
 extern const char *nt_errstr(netdissect_options *, u_int32_t);