From: Denis Ovsienko <infrastation@yandex.ru>
Date: Thu, 3 Apr 2014 08:57:57 +0000 (+0400)
Subject: refine some declarations in header files
X-Git-Tag: tcpdump-4.6.0~110
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/eaef83c9eaaef71d14301d67f62984fc8360a6eb?hp=0d28726d0a74b097d0c23b5ad3fc64b38849441a

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 ff03a4ac..533a7864 100644
--- 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 25fe79ee..3d0c2597 100644
--- 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 09b28ff5..c385facd 100644
--- 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);